diff options
Diffstat (limited to 'gdb/testsuite/gdb.trace')
49 files changed, 391 insertions, 393 deletions
diff --git a/gdb/testsuite/gdb.trace/actions-changed.exp b/gdb/testsuite/gdb.trace/actions-changed.exp index 556dab5..ef5acba 100644 --- a/gdb/testsuite/gdb.trace/actions-changed.exp +++ b/gdb/testsuite/gdb.trace/actions-changed.exp @@ -161,11 +161,11 @@ proc test_actions_changed { } { clean_restart $testfile -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp index 9bb38e1..89db2a6 100644 --- a/gdb/testsuite/gdb.trace/actions.exp +++ b/gdb/testsuite/gdb.trace/actions.exp @@ -37,7 +37,7 @@ if {$baseline == -1} { return } -set testline1 [expr $baseline + 7] +set testline1 [expr {$baseline + 7}] # # test actions command @@ -165,8 +165,8 @@ gdb_test_multiple "info tracepoints" "5.5c: verify NO actions for first tracepoi # 5.6 actions for invalid tracepoint number -gdb_test "actions [expr $trcpt2 + $trcpt3]" \ - "No tracepoint number [expr $trcpt2 + $trcpt3]." \ +gdb_test "actions [expr {$trcpt2 + $trcpt3}]" \ + "No tracepoint number [expr {$trcpt2 + $trcpt3}]." \ "5.6: actions for invalid tracepoint number" # 5.7 invalid action (other than 'collect', 'while-stepping' or 'end') @@ -245,7 +245,7 @@ if {[gdb_test "" "Breakpoint .*" "run to main"] != 0} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp index 3380cdf..cc40853 100644 --- a/gdb/testsuite/gdb.trace/ax.exp +++ b/gdb/testsuite/gdb.trace/ax.exp @@ -30,7 +30,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ return -1 } -clean_restart $binfile +clean_restart $testfile runto_main gdb_test "maint agent 12" ".*const8 12.*pop.*end.*" diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp index 57073bd..7707edb 100644 --- a/gdb/testsuite/gdb.trace/backtrace.exp +++ b/gdb/testsuite/gdb.trace/backtrace.exp @@ -23,12 +23,12 @@ set expfile $testfile.exp require gdb_trace_common_supports_arch -if [prepare_for_testing "failed to prepare" $executable $srcfile \ - [list debug nowarnings nopie]] { +if {[prepare_for_testing "failed to prepare" $executable $srcfile \ + [list debug nowarnings nopie]]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } @@ -155,13 +155,13 @@ gdb_test_no_output "tstop" "" proc gdb_backtrace_tdp_1 { msg } { global gdb_prompt - + # We are in a trace frame at which we didn't collect anything # except $PC. Therefore we expect to be able to identify stack # frame #0, but that's about all. In particular we do not expect # to be able to display the function's arguments or locals, and we # do not expect to be able to identify the caller of this function. - + gdb_test "backtrace" \ "#0\[\t \]+gdb_recursion_test.*depth=.*" \ "$msg" diff --git a/gdb/testsuite/gdb.trace/basic-libipa.exp b/gdb/testsuite/gdb.trace/basic-libipa.exp index e7612ac..27be96b 100644 --- a/gdb/testsuite/gdb.trace/basic-libipa.exp +++ b/gdb/testsuite/gdb.trace/basic-libipa.exp @@ -42,7 +42,7 @@ save_vars { env(ASAN_OPTIONS) } { # LD_PRELOAD. append_environment_default ASAN_OPTIONS verify_asan_link_order 0 - clean_restart $binfile + clean_restart $testfile } if {![runto_main]} { diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp index 67ac476..12b862c 100644 --- a/gdb/testsuite/gdb.trace/change-loc.exp +++ b/gdb/testsuite/gdb.trace/change-loc.exp @@ -44,7 +44,7 @@ clean_restart $executable gdb_load_shlib $lib_sl1 gdb_load_shlib $lib_sl2 -if ![runto_main] { +if {![runto_main]} { return -1 } @@ -64,7 +64,7 @@ proc tracepoint_change_loc_1 { trace_type } { global gdb_prompt clean_restart ${testfile} - if ![runto_main] { + if {![runto_main]} { return -1 } gdb_test_no_output "delete break 1" @@ -88,7 +88,7 @@ proc tracepoint_change_loc_1 { trace_type } { set test "set tracepoint on set_tracepoint" gdb_test_multiple "${trace_type} set_tracepoint" $test { -re "Target returns error code .* too far .*$gdb_prompt $" { - if [string equal $trace_type "ftrace"] { + if {[string equal $trace_type "ftrace"]} { # The target was unable to install the fast tracepoint # (e.g., jump pad too far from tracepoint). pass "$test (too far)" @@ -113,7 +113,7 @@ proc tracepoint_change_loc_1 { trace_type } { set test "continue to marker 2" gdb_test_multiple "continue" $test { -re "Target returns error code .* too far .*$gdb_prompt $" { - if [string equal $trace_type "ftrace"] { + if {[string equal $trace_type "ftrace"]} { # Expected if the target was unable to install the # fast tracepoint (e.g., jump pad too far from # tracepoint). @@ -230,7 +230,7 @@ proc tracepoint_change_loc_2 { trace_type } { pass "tstart" } -re "Target returns error code .* too far .*$gdb_prompt $" { - if [string equal $trace_type "ftrace"] { + if {[string equal $trace_type "ftrace"]} { # The target was unable to install the fast tracepoint # (e.g., jump pad too far from tracepoint). pass "$test (too far)" @@ -291,12 +291,12 @@ proc tracepoint_install_in_trace_disabled { trace_type } { global gdb_prompt # This test only makes sense with remote targets. - if ![gdb_protocol_is_remote] { + if {![gdb_protocol_is_remote]} { return } clean_restart ${testfile} - if ![runto_main] { + if {![runto_main]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp index 3354c0f..73802a9 100644 --- a/gdb/testsuite/gdb.trace/circ.exp +++ b/gdb/testsuite/gdb.trace/circ.exp @@ -37,7 +37,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning # # Set a tracepoint on given func. The tracepoint is set at entry -# address and not 'after prologue' address because we use +# address and not 'after prologue' address because we use # 'tfind pc func' to find the corresponding trace frame afterwards, # and that looks for entry address. proc set_a_tracepoint { func } { diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp index f0946ee..a60b720 100644 --- a/gdb/testsuite/gdb.trace/collection.exp +++ b/gdb/testsuite/gdb.trace/collection.exp @@ -23,7 +23,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning return -1 } -# Tests: +# Tests: # 1) $args # 2) function args by name # 3) $locs @@ -701,7 +701,7 @@ proc gdb_trace_collection_test {} { gdb_collect_registers_test "\$$fpreg, \$$spreg, \$$pcreg" gdb_collect_globals_test gdb_collect_global_in_pieces_test - + # # Expression tests: # @@ -747,7 +747,7 @@ proc gdb_trace_collection_test {} { # x[(y, z)] (tests comma expression) (ditto) # cast expr # stack data - + gdb_collect_expression_test globals_test_func \ "globalstruct.memberi" "82" "a.b" gdb_collect_expression_test globals_test_func \ diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp index d05fe64..61f5ef6 100644 --- a/gdb/testsuite/gdb.trace/deltrace.exp +++ b/gdb/testsuite/gdb.trace/deltrace.exp @@ -37,7 +37,7 @@ if {$baseline == -1} { fail "could not find gdb_recursion_test function" return } -set testline1 [expr $baseline + 4] +set testline1 [expr {$baseline + 4}] # # test "delete tracepoints" command @@ -185,11 +185,11 @@ gdb_test_multiple "delete tracepoint $trcpt1 $trcpt2 $trcpt3" \ gdb_test "info tracepoints" \ "No tracepoints." \ - "3.3c: verify delete three tracepoints" + "3.3c: verify delete three tracepoints" # 3.4 delete invalid tracepoint number -gdb_test "delete tracepoint [expr $trcpt2 + $trcpt3]" \ - "No breakpoint number [expr $trcpt2 + $trcpt3]." \ +gdb_test "delete tracepoint [expr {$trcpt2 + $trcpt3}]" \ + "No breakpoint number [expr {$trcpt2 + $trcpt3}]." \ "3.4: delete invalid tracepoint number" # 3.5 delete tracepoint number zero diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp index 5a4e882..9a09a66 100644 --- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp +++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp @@ -27,16 +27,16 @@ if { [info proc gdb_reconnect] == "" } { return -1 } -if [prepare_for_testing "failed to prepare" $executable $srcfile \ - {debug nowarnings}] { +if {[prepare_for_testing "failed to prepare" $executable $srcfile \ + {debug nowarnings}]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } @@ -51,7 +51,7 @@ proc disconnected_tracing { } { # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -113,7 +113,7 @@ proc disconnected_tfind { } { # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp index f6bcf66..6c22708 100644 --- a/gdb/testsuite/gdb.trace/entry-values.exp +++ b/gdb/testsuite/gdb.trace/entry-values.exp @@ -29,7 +29,7 @@ if {[gdb_compile [list ${binfile}1.o] \ return -1 } -clean_restart ${binfile}1 +clean_restart ${testfile}1 set returned_from_foo "" @@ -90,61 +90,63 @@ Dwarf::assemble $asm_file { set bar_length [lindex $bar_result 1] cu {} { - compile_unit {{language @DW_LANG_C}} { + compile_unit { + DW_AT_language @DW_LANG_C + } { int_label: base_type { - {name int} - {encoding @DW_ATE_signed} - {byte_size 4 DW_FORM_sdata} + DW_AT_name int + DW_AT_encoding @DW_ATE_signed + DW_AT_byte_size 4 DW_FORM_sdata } foo_label: subprogram { - {decl_file 0 udata} - {MACRO_AT_func { foo }} + DW_AT_decl_file 0 udata + MACRO_AT_func { foo } } { formal_parameter { - {type :$int_label} - {name i} - {location {DW_OP_reg0} SPECIAL_expr} + DW_AT_type :$int_label + DW_AT_name i + DW_AT_location {DW_OP_reg0} SPECIAL_expr } formal_parameter { - {type :$int_label} - {name j} - {location {DW_OP_reg1} SPECIAL_expr} + DW_AT_type :$int_label + DW_AT_name j + DW_AT_location {DW_OP_reg1} SPECIAL_expr } } subprogram { - {name bar} - {decl_file 0 udata} - {low_pc $bar_start addr} - {high_pc "$bar_start + $bar_length" addr} - {GNU_all_call_sites 1 sdata} + DW_AT_name bar + DW_AT_decl_file 0 udata + DW_AT_low_pc $bar_start addr + DW_AT_high_pc "$bar_start + $bar_length" addr + DW_AT_GNU_all_call_sites 1 sdata } { formal_parameter { - {type :$int_label} - {name i} + DW_AT_type :$int_label + DW_AT_name i } GNU_call_site { - {low_pc "$bar_start + $returned_from_foo" addr} - {abstract_origin :$foo_label} + DW_AT_low_pc "$bar_start + $returned_from_foo" addr + DW_AT_abstract_origin :$foo_label } { # Faked entry values are reference to variables 'global1' # and 'global2' and faked locations are register 0 and # register 1. GNU_call_site_parameter { - {location {DW_OP_reg0} SPECIAL_expr} - {GNU_call_site_value { - addr global1 - deref_size 4 - } SPECIAL_expr} + DW_AT_location {DW_OP_reg0} SPECIAL_expr + DW_AT_GNU_call_site_value { + DW_OP_addr global1 + DW_OP_deref_size 4 + } SPECIAL_expr } GNU_call_site_parameter { - {location {DW_OP_reg1} SPECIAL_expr} - {GNU_call_site_value { - addr global2 - deref_size 4 - } SPECIAL_expr} + DW_AT_location {DW_OP_reg1} SPECIAL_expr + DW_AT_GNU_call_site_value { + DW_OP_addr global2 + DW_OP_deref_size 4 + } SPECIAL_expr } } } @@ -163,7 +165,7 @@ if {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \ clean_restart ${testfile} -if ![runto_main] { +if {![runto_main]} { return -1 } @@ -193,15 +195,15 @@ gdb_test_sequence "bt" "bt, 2" { # Restart GDB and trace. -clean_restart $binfile +clean_restart $testfile load_lib "trace-support.exp" -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp index 36a7566..42e8711 100644 --- a/gdb/testsuite/gdb.trace/ftrace-lock.exp +++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp @@ -22,7 +22,7 @@ require gdb_trace_common_supports_arch standard_testfile # make check RUNTESTFLAGS='gdb.trace/ftrace-lock.exp NUM_THREADS=2' -if ![info exists NUM_THREADS] { +if {![info exists NUM_THREADS]} { set NUM_THREADS 2 } @@ -32,16 +32,16 @@ set options [list debug pthreads [gdb_target_symbol_prefix_flags] \ additional_flags=-DNUM_THREADS=$NUM_THREADS] with_test_prefix "runtime trace support check" { - if { [prepare_for_testing "prepare for testing" ${binfile}-check \ + if { [prepare_for_testing "prepare for testing" ${testfile}-check \ $srcfile $options] } { return } - if ![runto_main] { + if {![runto_main]} { return -1 } - if ![gdb_target_supports_trace] { + if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } @@ -55,11 +55,11 @@ set remote_libipa [gdb_load_shlib $libipa] lappend options shlib=$libipa if { [prepare_for_testing "prepare for testing with libipa" \ - $binfile $srcfile $options] } { + $testfile $srcfile $options] } { return } -if ![runto_main] { +if {![runto_main]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp index ac6e473..3192bdd 100644 --- a/gdb/testsuite/gdb.trace/ftrace.exp +++ b/gdb/testsuite/gdb.trace/ftrace.exp @@ -25,16 +25,16 @@ set additional_flags [gdb_target_symbol_prefix_flags] require gdb_trace_common_supports_arch -if [prepare_for_testing "failed to prepare" $executable $srcfile \ - [list debug $additional_flags]] { +if {[prepare_for_testing "failed to prepare" $executable $srcfile \ + [list debug $additional_flags]]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } @@ -54,7 +54,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ } clean_restart ${executable} -if ![runto_main] { +if {![runto_main]} { return 0 } @@ -130,7 +130,7 @@ proc test_fast_tracepoints {} { set minaddr [exec sh -c "cat /proc/sys/vm/mmap_min_addr"] - if { [expr $minaddr > 64512] } { + if {$minaddr > 64512} { warning "mmap_min_addr > 64512, fast tracepoint will fail" warning "do \"sudo sysctl -w vm.mmap_min_addr=32768\" to adjust" } @@ -190,7 +190,7 @@ proc test_fast_tracepoints {} { # fast tracepoints RSP feature, and confirm fast tracepoints # can no longer be downloaded. set test "fast tracepoint could not be downloaded with the feature disabled" - if [gdb_protocol_is_remote] { + if {[gdb_protocol_is_remote]} { gdb_test "set remote fast-tracepoints-packet off" gdb_test_multiple "tstart" $test { diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp index 7ba4ed3..47121ca 100644 --- a/gdb/testsuite/gdb.trace/infotrace.exp +++ b/gdb/testsuite/gdb.trace/infotrace.exp @@ -66,8 +66,8 @@ gdb_test "info tracepoint $asm_test_num" \ "2.2b: info tracepoint $asm_test_num (gdb_asm_test)" # 2.3 info tracepoint (invalid tracepoint number) -gdb_test "info tracepoint [expr $c_test_num + $asm_test_num]" \ - "No tracepoint matching '[expr $c_test_num + $asm_test_num]'." \ +gdb_test "info tracepoint [expr {$c_test_num + $asm_test_num}]" \ + "No tracepoint matching '[expr {$c_test_num + $asm_test_num}]'." \ "2.3: info tracepoint (invalid tracepoint number)" # 2.4 info tracepoints (list of numbers) diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp index dd0d785..1aaf27c 100644 --- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp +++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp @@ -23,11 +23,11 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] } return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" return -1 } @@ -37,7 +37,7 @@ gdb_exit load_lib mi-support.exp set MIFLAGS "-i=mi" -mi_clean_restart $binfile +mi_clean_restart $testfile mi_runto_main mi_gdb_test "-break-insert end" \ diff --git a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp index dde6d8b..34013fb 100644 --- a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp +++ b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp @@ -21,11 +21,11 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug nopi return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" return -1 } @@ -35,7 +35,7 @@ gdb_exit load_lib mi-support.exp set MIFLAGS "-i=mi" -mi_clean_restart $binfile +mi_clean_restart $testfile mi_runto_main mi_gdb_test "-break-insert marker" \ @@ -129,16 +129,16 @@ proc test_trace_unavailable { data_source } { set pcnum -1 set gpr0num -1 - if [is_amd64_regs_target] { + if {[is_amd64_regs_target]} { set pcnum 16 set gpr0num 0 - } elseif [is_x86_like_target] { + } elseif {[is_x86_like_target]} { set pcnum 8 set gpr0num 0 - } elseif [is_aarch64_target] { + } elseif {[is_aarch64_target]} { set pcnum 32 set gpr0num 0 - } elseif [istarget "powerpc*-*-*"] { + } elseif {[istarget "powerpc*-*-*"]} { set pcnum 64 set gpr0num 0 } elseif { [istarget "s390*-*-*"] } { diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp index 05c10ed..029869b 100644 --- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp @@ -45,11 +45,10 @@ remote_file target delete $tfile_basic proc test_tfind_tfile { } { with_test_prefix "tfile" { - global binfile global decimal global tfile_basic - mi_clean_restart $binfile + mi_clean_restart $::testfile mi_gdb_test "-target-select tfile ${tfile_basic}" \ ".*=breakpoint-created,bkpt=\{number=\"${decimal}\",type=\"tracepoint\",disp=\"keep\",enabled=\"y\",.*,func=\"write_basic_trace_file\".*\\^connected" \ @@ -79,7 +78,7 @@ proc test_tfind_tfile { } { # If tracefile is generated successfully, copy tracefile to host and # run tests. -if [generate_tracefile $binfile] { +if {[generate_tracefile $binfile]} { if {!$purely_local} { # Copy tracefile from target to host. remote_download host [remote_upload target tfile-basic.tf] \ @@ -92,8 +91,8 @@ if [generate_tracefile $binfile] { # Change to a different test case in order to run it on target, and get # several traceframes. standard_testfile status-stop.c -append testfile -1 -append binfile -1 +append testfile "-1" +append binfile "-1" set executable $testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ @@ -106,11 +105,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ clean_restart $executable -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" return -1 } @@ -120,9 +119,8 @@ gdb_exit proc test_tfind_remote { } { with_test_prefix "remote" { global decimal - global binfile - mi_clean_restart $binfile + mi_clean_restart $::testfile mi_runto_main mi_gdb_test "-break-insert end" "\\^done.*" "break end" diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp index 90654c0..da62563 100644 --- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp @@ -89,9 +89,7 @@ proc test_reconnect { } { } } - global binfile - - if {[mi_clean_restart $binfile]} { + if {[mi_clean_restart $::testfile]} { return } @@ -155,11 +153,10 @@ proc test_pending_resolved { } { with_test_prefix "pending resolved" { global decimal hex global executable - global binfile global lib_sl1 lib_sl2 global mi_gdb_prompt - if {[mi_clean_restart $binfile]} { + if {[mi_clean_restart $::testfile]} { return } mi_load_shlibs $lib_sl1 $lib_sl2 @@ -231,11 +228,11 @@ clean_restart $executable gdb_load_shlib $lib_sl1 gdb_load_shlib $lib_sl2 -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp index f90d9a4..c69ae89 100644 --- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp @@ -36,7 +36,7 @@ proc test_create_delete_modify_tsv { } { global srcdir subdir global mi_gdb_prompt - if [mi_gdb_start] { + if {[mi_gdb_start]} { return } mi_gdb_load ${binfile} @@ -67,17 +67,17 @@ proc test_create_delete_modify_tsv { } { # Test target supports tracepoints or not. clean_restart $testfile - if ![runto_main] { + if {![runto_main]} { return -1 } - if ![gdb_target_supports_trace] { + if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" return -1 } gdb_exit - if {[mi_clean_restart $binfile]} { + if {[mi_clean_restart $::testfile]} { return } @@ -145,7 +145,7 @@ proc test_upload_tsv { } { return 0 } - clean_restart $testfile + clean_restart $::testfile if {![runto_main]} { return 0 } @@ -175,8 +175,7 @@ proc test_upload_tsv { } { } } - global binfile - if {[mi_clean_restart $binfile]} { + if {[mi_clean_restart $::testfile]} { return } @@ -202,12 +201,12 @@ proc test_upload_tsv { } { } } - if $tsv1_created { + if {$tsv1_created} { pass "tsv1 created" } else { fail "tsv1 created" } - if $tsv2_created { + if {$tsv2_created} { pass "tsv2 created" } else { fail "tsv2 created" @@ -223,11 +222,11 @@ proc test_upload_tsv { } { clean_restart $testfile -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/no-attach-trace.exp b/gdb/testsuite/gdb.trace/no-attach-trace.exp index e1decfc..5f7795d 100644 --- a/gdb/testsuite/gdb.trace/no-attach-trace.exp +++ b/gdb/testsuite/gdb.trace/no-attach-trace.exp @@ -42,7 +42,7 @@ gdb_test "trace main" \ gdb_test "tstart" "Target returns error code.*\." with_test_prefix "after tstart" { - if ![runto_main] { + if {![runto_main]} { return -1 } } diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp index cf9fcc4..52a34b9 100644 --- a/gdb/testsuite/gdb.trace/packetlen.exp +++ b/gdb/testsuite/gdb.trace/packetlen.exp @@ -25,7 +25,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ return -1 } -clean_restart $binfile +clean_restart $testfile gdb_test "tstop" ".*" "" gdb_test "tfind none" ".*" "" runto_main diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp index 0a67df1..2c7698a 100644 --- a/gdb/testsuite/gdb.trace/passc-dyn.exp +++ b/gdb/testsuite/gdb.trace/passc-dyn.exp @@ -25,7 +25,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ return -1 } -clean_restart $binfile +clean_restart $testfile runto_main if {![gdb_target_supports_trace]} { @@ -52,16 +52,16 @@ if {$baseline == -1} { # define relative source line numbers: # all subsequent line numbers are relative to this first one (baseline) -set testline2 [expr $baseline + 4] -set testline3 [expr $baseline + 5] -set testline4 [expr $baseline + 6] +set testline2 [expr {$baseline + 4}] +set testline3 [expr {$baseline + 5}] +set testline4 [expr {$baseline + 6}] # # test passcount command semantics (live test) # ## Set three tracepoints with three different passcounts. -## Verify that the experiment stops after the one with the +## Verify that the experiment stops after the one with the ## lowest passcount is hit. gdb_delete_tracepoints @@ -125,7 +125,7 @@ with_test_prefix "trace_frame 4" { } ## We should now be at the last frame, because this frame's passcount -## should have caused collection to stop. If we do a tfind now, +## should have caused collection to stop. If we do a tfind now, ## it should fail. gdb_test "tfind" "failed to find.*" "4.5: dynamic passcount test" diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp index f1b4e9e..37d5c09 100644 --- a/gdb/testsuite/gdb.trace/passcount.exp +++ b/gdb/testsuite/gdb.trace/passcount.exp @@ -36,7 +36,7 @@ if {$baseline == -1} { return } -set testline1 [expr $baseline + 3] +set testline1 [expr {$baseline + 3}] # # test "passcount" command @@ -212,8 +212,8 @@ gdb_test "info tracepoints" \ # 4.8 set passcount for invalid tracepoint -gdb_test "passcount 1 [expr $trcpt2 + $trcpt3]" \ - "No tracepoint number [expr $trcpt2 + $trcpt3]." \ +gdb_test "passcount 1 [expr {$trcpt2 + $trcpt3}]" \ + "No tracepoint number [expr {$trcpt2 + $trcpt3}]." \ "4.8: invalid tracepoint number in passcount" # 4.9 help passcount diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp index 39e3abb..fdf321b 100644 --- a/gdb/testsuite/gdb.trace/pending.exp +++ b/gdb/testsuite/gdb.trace/pending.exp @@ -46,11 +46,11 @@ clean_restart $executable gdb_load_shlib $lib_sl1 gdb_load_shlib $lib_sl2 -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" return -1 } @@ -138,7 +138,7 @@ proc pending_tracepoint_works { trace_type } { pass $test } -re "Target returns error code .* too far .*$gdb_prompt $" { - if [string equal $trace_type "ftrace"] { + if {[string equal $trace_type "ftrace"]} { # The target was unable to install the fast tracepoint # (e.g., jump pad too far from tracepoint). pass "$test (too far)" @@ -179,7 +179,7 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \ # Start with a fresh gdb. clean_restart $executable - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -206,7 +206,7 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \ set test "continue to marker 2" gdb_test_multiple "continue" $test { -re "Target returns error code .* too far .*$gdb_prompt $" { - if [string equal $trace_type "ftrace"] { + if {[string equal $trace_type "ftrace"]} { # Expected if the target was unable to install the # fast tracepoint (e.g., jump pad too far from # tracepoint). @@ -247,7 +247,7 @@ proc pending_tracepoint_installed_during_trace { trace_type } \ # Start with a fresh gdb. clean_restart $executable - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -278,7 +278,7 @@ proc pending_tracepoint_installed_during_trace { trace_type } \ set test "continue to marker 2" gdb_test_multiple "continue" $test { -re "Target returns error code .* too far .*$gdb_prompt $" { - if [string equal $trace_type "ftrace"] { + if {[string equal $trace_type "ftrace"]} { # Expected if the target was unable to install the # fast tracepoint (e.g., jump pad too far from # tracepoint). @@ -320,7 +320,7 @@ proc pending_tracepoint_disconnect_during_trace { trace_type } \ # Start with a fresh gdb. clean_restart $executable - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -367,7 +367,7 @@ proc pending_tracepoint_disconnect_after_resolved { trace_type } \ # Start with a fresh gdb. clean_restart $executable - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -419,7 +419,7 @@ proc pending_tracepoint_with_action_resolved { trace_type } \ # Start with a fresh gdb. clean_restart $executable - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -449,7 +449,7 @@ proc pending_tracepoint_with_action_resolved { trace_type } \ set test "continue to marker 2" gdb_test_multiple "continue" $test { -re "Target returns error code .* too far .*$gdb_prompt $" { - if [string equal $trace_type "ftrace"] { + if {[string equal $trace_type "ftrace"]} { # Expected if the target was unable to install the # fast tracepoint (e.g., jump pad too far from # tracepoint). diff --git a/gdb/testsuite/gdb.trace/pr16508.exp b/gdb/testsuite/gdb.trace/pr16508.exp index 2284ab2..37405ff 100644 --- a/gdb/testsuite/gdb.trace/pr16508.exp +++ b/gdb/testsuite/gdb.trace/pr16508.exp @@ -17,16 +17,16 @@ load_lib "trace-support.exp" standard_testfile read-memory.c set executable $testfile -if [prepare_for_testing "failed to prepare for trace tests" \ - $executable $srcfile [list debug]] { +if {[prepare_for_testing "failed to prepare for trace tests" \ + $executable $srcfile [list debug]]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp index 78170ac..cf3ade6 100644 --- a/gdb/testsuite/gdb.trace/qtro.exp +++ b/gdb/testsuite/gdb.trace/qtro.exp @@ -30,13 +30,13 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]} return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } # Check whether the target supports tracepoints. -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp index 396ed02..915f0a2 100644 --- a/gdb/testsuite/gdb.trace/range-stepping.exp +++ b/gdb/testsuite/gdb.trace/range-stepping.exp @@ -19,21 +19,21 @@ load_lib "range-stepping-support.exp" standard_testfile set executable $testfile -if [prepare_for_testing "failed to prepare" $executable $srcfile \ - {debug nowarnings}] { +if {[prepare_for_testing "failed to prepare" $executable $srcfile \ + {debug nowarnings}]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } -if ![gdb_range_stepping_enabled] { +if {![gdb_range_stepping_enabled]} { unsupported "range stepping not supported by the target" return -1 } @@ -79,7 +79,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ clean_restart ${executable} -if ![runto_main] { +if {![runto_main]} { return 0 } diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp index 558c0ea..b369b40 100644 --- a/gdb/testsuite/gdb.trace/read-memory.exp +++ b/gdb/testsuite/gdb.trace/read-memory.exp @@ -21,11 +21,11 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]} return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } @@ -37,7 +37,7 @@ proc set_tracepoint_and_collect { } { # Start with a fresh gdb. clean_restart ${testfile} - if ![runto_main] { + if {![runto_main]} { return -1 } gdb_breakpoint "end" qualified diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp index 45857a1..0b964d6 100644 --- a/gdb/testsuite/gdb.trace/report.exp +++ b/gdb/testsuite/gdb.trace/report.exp @@ -24,7 +24,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -clean_restart $binfile +clean_restart $testfile runto_main if {![gdb_target_supports_trace]} { @@ -100,7 +100,7 @@ all tests in this module will fail." untested "couldn't match pattern" set return_me 1 all tests in this module will fail." - } + } } if {$return_me == 1} { @@ -288,27 +288,27 @@ proc use_collected_data { data_source } { exp_continue } -re "^\[^\r\n\]* line $testline1 .tracepoint .$tdp1\\)\r\n" { - set linecount1 [expr $linecount1 + 1] + set linecount1 [expr {$linecount1 + 1}] exp_continue } -re "^\[^\r\n\]* line $testline2 .tracepoint .$tdp2\\)\r\n" { - set linecount2 [expr $linecount2 + 1] + set linecount2 [expr {$linecount2 + 1}] exp_continue } -re "^\[^\r\n\]* line $testline3 .tracepoint .$tdp3\\)\r\n" { - set linecount3 [expr $linecount3 + 1] + set linecount3 [expr {$linecount3 + 1}] exp_continue } -re "^\[^\r\n\]* line $testline4 .tracepoint .$tdp4\\)\r\n" { - set linecount4 [expr $linecount4 + 1] + set linecount4 [expr {$linecount4 + 1}] exp_continue } -re "^\[^\r\n\]* line $testline5 .tracepoint .$tdp5\\)\r\n" { - set linecount5 [expr $linecount5 + 1] + set linecount5 [expr {$linecount5 + 1}] exp_continue } -re "^\[^\r\n\]* line $testline6 .tracepoint .$tdp6\\)\r\n" { - set linecount6 [expr $linecount6 + 1] + set linecount6 [expr {$linecount6 + 1}] exp_continue } -re "^No trace frame found\r\n$gdb_prompt $" { @@ -328,7 +328,7 @@ proc use_collected_data { data_source } { gdb_test_multiple "while \$trace_frame != -1\n printf \"tracepoint #\%d, FP 0x\%08x, SP 0x\%08x, PC 0x%08x\\n\", \$tracepoint, \$fp, \$sp, \$pc\n tfind tracepoint\n end" "12.2: trace report #2" { -re "tracepoint #$tdp2, FP $hex, SP $hex, PC $hex" { - set linecount2 [expr $linecount2 + 1] + set linecount2 [expr {$linecount2 + 1}] exp_continue } -re ".*$gdb_prompt $" { @@ -348,7 +348,7 @@ proc use_collected_data { data_source } { gdb_test_multiple "while \$trace_frame != -1\n printf \"TDP #\%d, frame \%d: depth = \%d, q1 = \%d\\n\", \$tracepoint, \$trace_frame, depth, q1\n tfind tracepoint\n end" "12.3: trace report #3" { -re "TDP #$tdp3, frame $decimal: depth = $decimal, q1 = $decimal" { - set linecount3 [expr $linecount3 + 1] + set linecount3 [expr {$linecount3 + 1}] exp_continue } -re ".*$gdb_prompt $" { @@ -368,7 +368,7 @@ proc use_collected_data { data_source } { gdb_test_multiple "while \$trace_frame != -1\n printf \"TDP #\%d, frame %d: char_test = \%d, long_test = \%d\\n\", \$tracepoint, \$trace_frame, gdb_char_test, gdb_long_test\n tfind tracepoint\n end" "12.4: trace report #4" { -re "TDP #$tdp6, frame $decimal: char_test = $arg1, long_test = $arg3" { - set linecount6 [expr $linecount6 + 1] + set linecount6 [expr {$linecount6 + 1}] exp_continue } -re ".*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp index b018dc6..31d9768 100644 --- a/gdb/testsuite/gdb.trace/save-trace.exp +++ b/gdb/testsuite/gdb.trace/save-trace.exp @@ -37,12 +37,12 @@ if {$baseline == -1} { return } -set testline1 [expr $baseline + 4] -set testline2 [expr $baseline + 5] -set testline3 [expr $baseline + 6] -set testline4 [expr $baseline + 7] -set testline5 [expr $baseline + 8] -set testline6 [expr $baseline + 9] +set testline1 [expr {$baseline + 4}] +set testline2 [expr {$baseline + 5}] +set testline3 [expr {$baseline + 6}] +set testline4 [expr {$baseline + 7}] +set testline5 [expr {$baseline + 8}] +set testline6 [expr {$baseline + 9}] # # test save-trace command @@ -53,7 +53,7 @@ set testline6 [expr $baseline + 9] gdb_delete_tracepoints foreach x { 1 2 3 4 5 6 } { - set testline [expr \$testline$x] + set testline [subst \$testline$x] set trcpt [gdb_gettpnum $testline] set trcpt$x $trcpt gdb_test "passcount $x" \ diff --git a/gdb/testsuite/gdb.trace/signal.exp b/gdb/testsuite/gdb.trace/signal.exp index 9c63770..31cd9cd 100644 --- a/gdb/testsuite/gdb.trace/signal.exp +++ b/gdb/testsuite/gdb.trace/signal.exp @@ -36,11 +36,11 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } @@ -62,7 +62,7 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } { # Start with a fresh gdb. clean_restart ${testfile} -if ![runto_main] { +if {![runto_main]} { return -1 } @@ -153,7 +153,7 @@ with_test_prefix "iterations equals to counter" { # Record the hit times of each tracepoint in this array. array set tracepoint_hits { } -for { set i $tpnum } { $i < [expr $tpnum + 2] } { incr i } { +for { set i $tpnum } { $i < $tpnum + 2 } { incr i } { set tracepoint_hits($i) 0 } @@ -162,7 +162,7 @@ while { 1 } { set idx 0 gdb_test_multiple $test $test { -re "Found trace frame $decimal, tracepoint ($decimal).*\r\n$gdb_prompt $" { - set idx [expr $expect_out(1,string)] + set idx [expr {$expect_out(1,string)}] incr tracepoint_hits($idx) } -re "Target failed to find requested trace frame\..*\r\n$gdb_prompt $" { @@ -176,7 +176,7 @@ while { 1 } { # Step 3, check the number of collections on each tracepoint. -for { set i $tpnum } { $i < [expr $tpnum + 2] } { incr i } { +for { set i $tpnum } { $i < $tpnum + 2 } { incr i } { if { $tracepoint_hits($i) == $iterations } { pass "tracepoint $i hit $iterations times" diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp index 1762d30..a390dd9 100644 --- a/gdb/testsuite/gdb.trace/status-stop.exp +++ b/gdb/testsuite/gdb.trace/status-stop.exp @@ -19,16 +19,16 @@ set executable $testfile set expfile $testfile.exp -if [prepare_for_testing "failed to prepare" $executable $srcfile \ - {debug nowarnings}] { +if {[prepare_for_testing "failed to prepare" $executable $srcfile \ + {debug nowarnings}]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } @@ -42,7 +42,7 @@ proc test_tstart_tstop_tstart { } { # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -70,7 +70,7 @@ proc test_tstart_tstart { } { # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -96,7 +96,7 @@ proc test_buffer_full_tstart { } { # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp index 90923c1..96ef4de 100644 --- a/gdb/testsuite/gdb.trace/strace.exp +++ b/gdb/testsuite/gdb.trace/strace.exp @@ -45,7 +45,7 @@ proc strace_remove_socket { action } { # Restart with a fresh gdb. clean_restart $executable gdb_load_shlib $libipa - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -130,7 +130,7 @@ proc strace_info_marker { } { # Restart with a fresh gdb. clean_restart $executable gdb_load_shlib $libipa - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -166,7 +166,7 @@ proc strace_probe_marker { } { # Restart with a fresh gdb. clean_restart $executable gdb_load_shlib $libipa - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -205,7 +205,7 @@ proc strace_trace_on_same_addr { type } { # Restart with a fresh gdb. clean_restart $executable gdb_load_shlib $libipa - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -241,7 +241,7 @@ proc strace_trace_on_same_addr { type } { pass $test } -re ".*\r\n$gdb_prompt $" { - if [string equal $type "ftrace"] { + if {[string equal $type "ftrace"]} { # The instruction may be not long enough to set a fast # tracepoint. Skip the rest of this test. return -1 @@ -256,7 +256,7 @@ proc strace_trace_on_same_addr { type } { pass $test } -re ".*\r\n$gdb_prompt $" { - if [string equal $type "ftrace"] { + if {[string equal $type "ftrace"]} { # The instruction may be not long enough to set a fast # tracepoint. Skip the rest of this test. return -1 @@ -268,7 +268,7 @@ proc strace_trace_on_same_addr { type } { gdb_breakpoint "end" qualified - if [string equal $type "break"] { + if {[string equal $type "break"]} { gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" \ "continue to bar" gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" \ @@ -308,7 +308,7 @@ proc strace_trace_on_diff_addr { } { # Restart with a fresh gdb. clean_restart $executable gdb_load_shlib $libipa - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -367,7 +367,7 @@ if { [istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"] } { clean_restart $executable gdb_load_shlib $libipa -if ![runto_main] { +if {![runto_main]} { return -1 } if {![gdb_target_supports_trace]} { diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp index 020f4d4..4d156f7 100644 --- a/gdb/testsuite/gdb.trace/tfile.exp +++ b/gdb/testsuite/gdb.trace/tfile.exp @@ -61,7 +61,7 @@ if {!$purely_local} { remote_download host [remote_upload target tfile-error.tf] tfile-error.tf } -clean_restart $binfile +clean_restart $testfile # Program has presumably exited, now target a trace file it created. @@ -121,7 +121,7 @@ gdb_test "info registers" "The program has no registers now\." \ # Now start afresh, using only a trace file. -clean_restart $binfile +clean_restart $testfile gdb_test "target tfile $tfile_error" "Created tracepoint.*" \ "target tfile [file tail $tfile_error]" diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp index ae73206..53e97be 100644 --- a/gdb/testsuite/gdb.trace/tfind.exp +++ b/gdb/testsuite/gdb.trace/tfind.exp @@ -27,7 +27,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \ return -1 } -clean_restart $binfile +clean_restart $testfile # 6.2 test help tstart gdb_test "help tstart" \ @@ -75,11 +75,11 @@ if {$baseline == -1} { return } -set testline1 [expr $baseline + 1] -set testline2 [expr $baseline + 5] -set testline3 [expr $baseline + 6] -set testline4 [expr $baseline + 7] -set testline5 [expr $baseline + 8] +set testline1 [expr {$baseline + 1}] +set testline2 [expr {$baseline + 5}] +set testline3 [expr {$baseline + 6}] +set testline4 [expr {$baseline + 7}] +set testline5 [expr {$baseline + 8}] # # test tfind command @@ -351,7 +351,7 @@ gdb_test "tfind line NoSuChFiLe.c:$baseline" \ "No source file named.*" \ "8.27: tfind line in bad source file" -# 8.32 tfind invalid subcommand (tfind foo) +# 8.32 tfind invalid subcommand (tfind foo) ## check error gdb_test "tfind NoSuChOpTiOn 21" \ "No symbol.*|\[Ww\]arning.*|\[Ee\]rror.*" \ diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp index 659267f..a2a79d8 100644 --- a/gdb/testsuite/gdb.trace/trace-break.exp +++ b/gdb/testsuite/gdb.trace/trace-break.exp @@ -23,16 +23,16 @@ set additional_flags [gdb_target_symbol_prefix_flags] require gdb_trace_common_supports_arch -if [prepare_for_testing "failed to prepare" $executable $srcfile \ - [list debug $additional_flags]] { +if {[prepare_for_testing "failed to prepare" $executable $srcfile \ + [list debug $additional_flags]]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } @@ -47,7 +47,7 @@ proc break_trace_same_addr_1 { trace_type option } \ # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -81,7 +81,7 @@ proc break_trace_same_addr_2 { trace_type1 trace_type2 option } \ # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -119,7 +119,7 @@ proc break_trace_same_addr_3 { trace_type option } \ # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -156,7 +156,7 @@ proc break_trace_same_addr_4 { trace_type option } \ # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -199,7 +199,7 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \ # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -222,7 +222,7 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \ gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ "continue to marker" - if [string equal $trace3_at_first_loc "1"] { + if {[string equal $trace3_at_first_loc "1"]} { gdb_test "${trace3} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \ "${trace3} set_point 2" } else { @@ -272,7 +272,7 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \ # Start with a fresh gdb. clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -300,7 +300,7 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \ gdb_test_no_output "tstop" - if [string equal $enable1 "enable"] { + if {[string equal $enable1 "enable"]} { gdb_test "tfind tracepoint 4" "Found trace frame \[0-9\], tracepoint .*" \ "tfind test frame of tracepoint 4" gdb_test "tdump" \ @@ -313,7 +313,7 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \ "tfind test frame of tracepoint 4" } - if [string equal $enable2 "enable"] { + if {[string equal $enable2 "enable"]} { gdb_test "tfind tracepoint 5" "Found trace frame \[0-9\], tracepoint .*" \ "tfind test frame of tracepoint 5" gdb_test "tdump" \ @@ -359,7 +359,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ } clean_restart ${executable} -if ![runto_main] { +if {![runto_main]} { return 0 } diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp index 7fe814e..153439f 100644 --- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp +++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp @@ -17,16 +17,16 @@ load_lib "trace-support.exp" standard_testfile -if [prepare_for_testing "failed to prepare" $testfile $srcfile \ - {debug nowarnings}] { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug nowarnings}]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp index 8251345..0463656 100644 --- a/gdb/testsuite/gdb.trace/trace-condition.exp +++ b/gdb/testsuite/gdb.trace/trace-condition.exp @@ -25,16 +25,16 @@ set additional_flags [gdb_target_symbol_prefix_flags] require gdb_trace_common_supports_arch -if [prepare_for_testing "failed to prepare" $executable $srcfile \ - [list debug $additional_flags]] { +if {[prepare_for_testing "failed to prepare" $executable $srcfile \ + [list debug $additional_flags]]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } @@ -55,7 +55,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ clean_restart ${executable} -if ![runto_main] { +if {![runto_main]} { return 0 } @@ -69,7 +69,7 @@ proc test_tracepoints { trace_command condition num_frames { kfail_proc 0 } } { clean_restart ${executable} - if ![runto_main] { + if {![runto_main]} { return 0 } diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsuite/gdb.trace/trace-enable-disable.exp index c009cff..92d664b 100644 --- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp +++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp @@ -32,11 +32,11 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" clean_restart ${testfile} -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } @@ -64,7 +64,7 @@ proc test_tracepoint_enable_disable { tracepoint_cmd } { set expected 0 - if ![runto_main] { + if {![runto_main]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp index 0c6e4e5..ec6eaed 100644 --- a/gdb/testsuite/gdb.trace/trace-mt.exp +++ b/gdb/testsuite/gdb.trace/trace-mt.exp @@ -22,32 +22,32 @@ set additional_flags [gdb_target_symbol_prefix_flags] require gdb_trace_common_supports_arch with_test_prefix "runtime trace support check" { - if { [prepare_for_testing "prepare for testing" ${binfile} $srcfile \ + if { [prepare_for_testing "prepare for testing" $testfile $srcfile \ [list debug pthreads $additional_flags]] } { return } - if ![runto_main] { + if {![runto_main]} { return -1 } - if ![gdb_target_supports_trace] { + if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } } -proc step_over_tracepoint { binfile trace_type } \ +proc step_over_tracepoint { testfile trace_type } \ {with_test_prefix "step over $trace_type" \ { global hex # Start with a fresh gdb. - clean_restart $binfile + clean_restart $testfile # Make sure inferior is running in all-stop mode. gdb_test_no_output "set non-stop 0" - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -63,14 +63,14 @@ proc step_over_tracepoint { binfile trace_type } \ # Set breakpoint and tracepoint at the same address. -proc break_trace_same_addr { binfile trace_type option } \ +proc break_trace_same_addr { testfile trace_type option } \ {with_test_prefix "$trace_type $option" \ { global hex # Start with a fresh gdb. - clean_restart $binfile - if ![runto_main] { + clean_restart $testfile + if {![runto_main]} { return -1 } @@ -96,10 +96,10 @@ proc break_trace_same_addr { binfile trace_type option } \ }} foreach break_always_inserted { "on" "off" } { - break_trace_same_addr $binfile "trace" ${break_always_inserted} + break_trace_same_addr $testfile "trace" ${break_always_inserted} } -step_over_tracepoint $binfile "trace" +step_over_tracepoint $testfile "trace" require allow_shlib_tests @@ -108,13 +108,13 @@ set libipa [get_in_proc_agent] set remote_libipa [gdb_load_shlib $libipa] # Compile test case again with IPA. -set binfile_ipa ${binfile}-ipa -if { [prepare_for_testing "prepare for testing" $binfile_ipa $srcfile \ +set testfile_ipa $testfile-ipa +if { [prepare_for_testing "prepare for testing" $testfile_ipa $srcfile \ [list debug pthreads $additional_flags shlib=$libipa]] } { return } -if ![runto_main] { +if {![runto_main]} { return 0 } @@ -122,8 +122,8 @@ if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } untested "could not find IPA lib loaded" } else { foreach break_always_inserted { "on" "off" } { - break_trace_same_addr $binfile_ipa "ftrace" ${break_always_inserted} + break_trace_same_addr $testfile_ipa "ftrace" ${break_always_inserted} } - step_over_tracepoint $binfile_ipa "ftrace" + step_over_tracepoint $testfile_ipa "ftrace" } diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp index 6e67de1..275772b 100644 --- a/gdb/testsuite/gdb.trace/tracecmd.exp +++ b/gdb/testsuite/gdb.trace/tracecmd.exp @@ -36,8 +36,8 @@ if {$baseline == -1} { return } -set testline1 [expr $baseline + 1] -set testline2 [expr $baseline + 3] +set testline1 [expr {$baseline + 1}] +set testline2 [expr {$baseline + 3}] # # test "help tracepoints" @@ -45,7 +45,7 @@ set testline2 [expr $baseline + 3] set helpcnt 0 test_class_help "tracepoints" { - "Tracing of program execution without stopping the program\.[\r\n\]+" + "Tracing of program execution without stopping the program\.[\r\n\]+" } {} "1.0: help tracepoints" # diff --git a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp index f61115e..5f9159c 100644 --- a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp +++ b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp @@ -23,11 +23,11 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp index 25862bf..2578c9e 100644 --- a/gdb/testsuite/gdb.trace/tspeed.exp +++ b/gdb/testsuite/gdb.trace/tspeed.exp @@ -17,8 +17,8 @@ load_lib "trace-support.exp" require allow_shlib_tests -# Do not run if gdbsever debug is enabled - the output file is many Gb. -if [gdbserver_debug_enabled] { +# Do not run if gdbserver debug is enabled - the output file is many Gb. +if {[gdbserver_debug_enabled]} { return 0 } @@ -33,11 +33,11 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" clean_restart ${testfile} -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp index f5547aa..2b4aa5a 100644 --- a/gdb/testsuite/gdb.trace/tstatus.exp +++ b/gdb/testsuite/gdb.trace/tstatus.exp @@ -20,16 +20,16 @@ set expfile tstatus.exp require gdb_trace_common_supports_arch -if [prepare_for_testing "failed to prepare" $executable $srcfile \ - [list debug]] { +if {[prepare_for_testing "failed to prepare" $executable $srcfile \ + [list debug]]} { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp index 96c7c35..3fe6867 100644 --- a/gdb/testsuite/gdb.trace/tsv.exp +++ b/gdb/testsuite/gdb.trace/tsv.exp @@ -23,7 +23,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ return -1 } -clean_restart $binfile +clean_restart $testfile # PR gdb/21352: Command tsave does not support -r argument gdb_test "tsave -r" "Argument required \\\(file in which to save trace data\\\)\." \ @@ -193,7 +193,7 @@ gdb_test_multiple "target ctf ${tracefile}.ctf" "" { } # Restart. -clean_restart ${binfile} +clean_restart $testfile if {![runto_main]} { return @@ -201,7 +201,7 @@ if {![runto_main]} { # If there are predefined TSVs, test these predefined TSVs are correctly # uploaded. -if [target_info exists gdb,predefined_tsv] { +if {[target_info exists gdb,predefined_tsv]} { set tsv [target_info gdb,predefined_tsv] # Test predefined TSVs are uploaded. diff --git a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp index 98207f0..e62a539 100644 --- a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp +++ b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp @@ -32,165 +32,167 @@ Dwarf::assemble $asm_file { declare_labels uchar_label struct_s_label foo_label struct_t_label bar_label cu {} { - compile_unit {{language @DW_LANG_C}} { + compile_unit { + DW_AT_language @DW_LANG_C + } { uchar_label: DW_TAG_base_type { - {name "unsigned char"} - {byte_size 1 DW_FORM_sdata} - {encoding @DW_ATE_unsigned_char} + DW_AT_name "unsigned char" + DW_AT_byte_size 1 DW_FORM_sdata + DW_AT_encoding @DW_ATE_unsigned_char } struct_s_label: DW_TAG_structure_type { - {name s} - {byte_size 3 DW_FORM_sdata} - {decl_file 0 DW_FORM_udata} - {decl_line 1 DW_FORM_udata} + DW_AT_name s + DW_AT_byte_size 3 DW_FORM_sdata + DW_AT_decl_file 0 DW_FORM_udata + DW_AT_decl_line 1 DW_FORM_udata } { DW_TAG_member { - {name a} - {type :$uchar_label} - {data_member_location { + DW_AT_name a + DW_AT_type :$uchar_label + DW_AT_data_member_location { DW_OP_plus_uconst 0 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name b} - {type :$uchar_label} - {data_member_location { + DW_AT_name b + DW_AT_type :$uchar_label + DW_AT_data_member_location { DW_OP_plus_uconst 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name c} - {type :$uchar_label} - {data_member_location { + DW_AT_name c + DW_AT_type :$uchar_label + DW_AT_data_member_location { DW_OP_plus_uconst 2 - } SPECIAL_expr} + } SPECIAL_expr } } struct_t_label: DW_TAG_structure_type { - {name t} - {byte_size 3 DW_FORM_sdata} - {decl_file 0 DW_FORM_udata} - {decl_line 1 DW_FORM_udata} + DW_AT_name t + DW_AT_byte_size 3 DW_FORM_sdata + DW_AT_decl_file 0 DW_FORM_udata + DW_AT_decl_line 1 DW_FORM_udata } { DW_TAG_member { - {name a} - {type :$uchar_label} - {data_member_location { + DW_AT_name a + DW_AT_type :$uchar_label + DW_AT_data_member_location { DW_OP_plus_uconst 0 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name b} - {type :$uchar_label} - {byte_size 1 DW_FORM_sdata} - {bit_size 1 DW_FORM_sdata} - {bit_offset 7 DW_FORM_sdata} - {data_member_location { + DW_AT_name b + DW_AT_type :$uchar_label + DW_AT_byte_size 1 DW_FORM_sdata + DW_AT_bit_size 1 DW_FORM_sdata + DW_AT_bit_offset 7 DW_FORM_sdata + DW_AT_data_member_location { DW_OP_plus_uconst 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name c} - {type :$uchar_label} - {byte_size 1 DW_FORM_sdata} - {bit_size 1 DW_FORM_sdata} - {bit_offset 6 DW_FORM_sdata} - {data_member_location { + DW_AT_name c + DW_AT_type :$uchar_label + DW_AT_byte_size 1 DW_FORM_sdata + DW_AT_bit_size 1 DW_FORM_sdata + DW_AT_bit_offset 6 DW_FORM_sdata + DW_AT_data_member_location { DW_OP_plus_uconst 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name d} - {type :$uchar_label} - {byte_size 1 DW_FORM_sdata} - {bit_size 1 DW_FORM_sdata} - {bit_offset 5 DW_FORM_sdata} - {data_member_location { + DW_AT_name d + DW_AT_type :$uchar_label + DW_AT_byte_size 1 DW_FORM_sdata + DW_AT_bit_size 1 DW_FORM_sdata + DW_AT_bit_offset 5 DW_FORM_sdata + DW_AT_data_member_location { DW_OP_plus_uconst 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name e} - {type :$uchar_label} - {byte_size 1 DW_FORM_sdata} - {bit_size 1 DW_FORM_sdata} - {bit_offset 4 DW_FORM_sdata} - {data_member_location { + DW_AT_name e + DW_AT_type :$uchar_label + DW_AT_byte_size 1 DW_FORM_sdata + DW_AT_bit_size 1 DW_FORM_sdata + DW_AT_bit_offset 4 DW_FORM_sdata + DW_AT_data_member_location { DW_OP_plus_uconst 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name f} - {type :$uchar_label} - {byte_size 1 DW_FORM_sdata} - {bit_size 1 DW_FORM_sdata} - {bit_offset 3 DW_FORM_sdata} - {data_member_location { + DW_AT_name f + DW_AT_type :$uchar_label + DW_AT_byte_size 1 DW_FORM_sdata + DW_AT_bit_size 1 DW_FORM_sdata + DW_AT_bit_offset 3 DW_FORM_sdata + DW_AT_data_member_location { DW_OP_plus_uconst 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name g} - {type :$uchar_label} - {byte_size 1 DW_FORM_sdata} - {bit_size 1 DW_FORM_sdata} - {bit_offset 2 DW_FORM_sdata} - {data_member_location { + DW_AT_name g + DW_AT_type :$uchar_label + DW_AT_byte_size 1 DW_FORM_sdata + DW_AT_bit_size 1 DW_FORM_sdata + DW_AT_bit_offset 2 DW_FORM_sdata + DW_AT_data_member_location { DW_OP_plus_uconst 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name h} - {type :$uchar_label} - {byte_size 1 DW_FORM_sdata} - {bit_size 1 DW_FORM_sdata} - {bit_offset 1 DW_FORM_sdata} - {data_member_location { + DW_AT_name h + DW_AT_type :$uchar_label + DW_AT_byte_size 1 DW_FORM_sdata + DW_AT_bit_size 1 DW_FORM_sdata + DW_AT_bit_offset 1 DW_FORM_sdata + DW_AT_data_member_location { DW_OP_plus_uconst 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name i} - {type :$uchar_label} - {byte_size 1 DW_FORM_sdata} - {bit_size 1 DW_FORM_sdata} - {bit_offset 0 DW_FORM_sdata} - {data_member_location { + DW_AT_name i + DW_AT_type :$uchar_label + DW_AT_byte_size 1 DW_FORM_sdata + DW_AT_bit_size 1 DW_FORM_sdata + DW_AT_bit_offset 0 DW_FORM_sdata + DW_AT_data_member_location { DW_OP_plus_uconst 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_member { - {name j} - {type :$uchar_label} - {data_member_location { + DW_AT_name j + DW_AT_type :$uchar_label + DW_AT_data_member_location { DW_OP_plus_uconst 2 - } SPECIAL_expr} + } SPECIAL_expr } } DW_TAG_subprogram { - {name foo} - {decl_file 0 udata} - {low_pc foo_start_lbl addr} - {high_pc foo_end_lbl addr} + DW_AT_name foo + DW_AT_decl_file 0 udata + DW_AT_low_pc foo_start_lbl addr + DW_AT_high_pc foo_end_lbl addr } { DW_TAG_formal_parameter { - {type :$struct_s_label} - {name x} - {location { + DW_AT_type :$struct_s_label + DW_AT_name x + DW_AT_location { DW_OP_lit0 DW_OP_stack_value DW_OP_piece 2 DW_OP_reg0 DW_OP_piece 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_formal_parameter { - {type :$struct_s_label} - {name y} - {location { + DW_AT_type :$struct_s_label + DW_AT_name y + DW_AT_location { DW_OP_lit0 DW_OP_stack_value DW_OP_piece 1 @@ -199,32 +201,32 @@ Dwarf::assemble $asm_file { DW_OP_lit0 DW_OP_stack_value DW_OP_piece 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_formal_parameter { - {type :$struct_s_label} - {name z} - {location { + DW_AT_type :$struct_s_label + DW_AT_name z + DW_AT_location { DW_OP_reg0 DW_OP_piece 1 DW_OP_lit0 DW_OP_stack_value DW_OP_piece 2 - } SPECIAL_expr} + } SPECIAL_expr } } DW_TAG_subprogram { - {name bar} - {decl_file 0 udata} - {low_pc bar_start_lbl addr} - {high_pc bar_end_lbl addr} + DW_AT_name bar + DW_AT_decl_file 0 udata + DW_AT_low_pc bar_start_lbl addr + DW_AT_high_pc bar_end_lbl addr } { DW_TAG_formal_parameter { - {type :$struct_t_label} - {name x} - {location { + DW_AT_type :$struct_t_label + DW_AT_name x + DW_AT_location { DW_OP_lit0 DW_OP_stack_value DW_OP_piece 1 @@ -236,12 +238,12 @@ Dwarf::assemble $asm_file { DW_OP_lit0 DW_OP_stack_value DW_OP_piece 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_formal_parameter { - {type :$struct_t_label} - {name y} - {location { + DW_AT_type :$struct_t_label + DW_AT_name y + DW_AT_location { DW_OP_lit0 DW_OP_stack_value DW_OP_piece 1 @@ -256,12 +258,12 @@ Dwarf::assemble $asm_file { DW_OP_lit0 DW_OP_stack_value DW_OP_piece 1 - } SPECIAL_expr} + } SPECIAL_expr } DW_TAG_formal_parameter { - {type :$struct_t_label} - {name z} - {location { + DW_AT_type :$struct_t_label + DW_AT_name z + DW_AT_location { DW_OP_lit0 DW_OP_stack_value DW_OP_piece 1 @@ -273,7 +275,7 @@ Dwarf::assemble $asm_file { DW_OP_lit0 DW_OP_stack_value DW_OP_piece 1 - } SPECIAL_expr} + } SPECIAL_expr } } @@ -292,11 +294,11 @@ if { [gdb_compile [list ${binfile}1.o ${binfile}2.o] ${binfile} \ clean_restart ${testfile} -if ![runto_main] { +if {![runto_main]} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp index 51532c9..9d4955f 100644 --- a/gdb/testsuite/gdb.trace/unavailable.exp +++ b/gdb/testsuite/gdb.trace/unavailable.exp @@ -302,12 +302,12 @@ proc gdb_unavailable_registers_test_1 { } { # Test reading uncollected pseudo-registers. The set of which # depends on target. - if [is_amd64_regs_target] { + if {[is_amd64_regs_target]} { # Check the raw register first. test_register_unavailable "\$rax" test_register_unavailable "\$eax" test_register_unavailable "\$ax" - } elseif [is_x86_like_target] { + } elseif {[is_x86_like_target]} { # Check the raw register first. test_register_unavailable "\$eax" test_register_unavailable "\$ax" diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp index 53a8e54..3940ff6 100644 --- a/gdb/testsuite/gdb.trace/while-dyn.exp +++ b/gdb/testsuite/gdb.trace/while-dyn.exp @@ -26,7 +26,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ return -1 } -clean_restart $binfile +clean_restart $testfile runto_main if {![gdb_target_supports_trace]} { diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp index 0dbff18..5a082a3 100644 --- a/gdb/testsuite/gdb.trace/while-stepping.exp +++ b/gdb/testsuite/gdb.trace/while-stepping.exp @@ -105,7 +105,7 @@ if {[gdb_test "" "Breakpoint .*" "run to main"] != 0} { return -1 } -if ![gdb_target_supports_trace] { +if {![gdb_target_supports_trace]} { unsupported "target does not support trace" return -1 } |