diff options
Diffstat (limited to 'gdb/testsuite/gdb.base')
43 files changed, 249 insertions, 249 deletions
diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp index d4aed6757e6..5ba93937e1e 100644 --- a/gdb/testsuite/gdb.base/args.exp +++ b/gdb/testsuite/gdb.base/args.exp @@ -20,7 +20,7 @@ global GDBFLAGS # Skip test if target does not support argument passing. if [target_info exists noargs] { - return; + return } set testfile "args" diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp index 2d5f326142c..0640a63ed44 100644 --- a/gdb/testsuite/gdb.base/attach-pie-misread.exp +++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp @@ -128,7 +128,7 @@ if {$first_offset == 0} { set test "start inferior" gdb_exit -set res [remote_spawn host $binfile]; +set res [remote_spawn host $binfile] if { $res < 0 || $res == "" } { perror "Spawning $binfile failed." fail $test diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp index ccf494ea6c3..b1d066208f4 100644 --- a/gdb/testsuite/gdb.base/auxv.exp +++ b/gdb/testsuite/gdb.base/auxv.exp @@ -61,7 +61,7 @@ if {$core_works} { } if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } set print_core_line [gdb_get_line_number "ABORT;"] gdb_test "tbreak $print_core_line" diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp index 6c4a93f8918..5cc01440532 100644 --- a/gdb/testsuite/gdb.base/bigcore.exp +++ b/gdb/testsuite/gdb.base/bigcore.exp @@ -66,7 +66,7 @@ gdb_test_no_output "set print sevenbit-strings" gdb_test_no_output "set width 0" if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } set print_core_line [gdb_get_line_number "Dump core"] gdb_test "tbreak $print_core_line" diff --git a/gdb/testsuite/gdb.base/bitfields.exp b/gdb/testsuite/gdb.base/bitfields.exp index 82f7b1010bf..a5b85eaec6c 100644 --- a/gdb/testsuite/gdb.base/bitfields.exp +++ b/gdb/testsuite/gdb.base/bitfields.exp @@ -37,48 +37,48 @@ proc bitfield_uniqueness {} { global srcfile if { ! [runto break1] } { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "print flags" ".*uc = 1 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #1"] { - gdb_suppress_tests; + gdb_suppress_tests } # Note that we check for s1 as either 1 or -1, so that failure to # treat it correctly as a signed 1bit field (values 0 or -1) while # printing its value does not cause a spurious failure. We do the # signedness preservation test later. if [gdb_test "print flags" ".*uc = 0 .*, s1 = (1|-1), u1 = 0, s2 = 0, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (s1)"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #2"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 1, s2 = 0, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (u1)"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #3"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 1, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (s2)"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #4"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 1, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (u2)"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #5"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 0, s3 = 1, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (s3)"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #6"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 0, s3 = 0, u3 = 1, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (u3)"] { gdb_suppress_tests @@ -102,7 +102,7 @@ proc bitfield_uniqueness {} { gdb_suppress_tests } # Hmmmm? - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } @@ -138,7 +138,7 @@ proc bitfield_containment {} { if [gdb_test "print/x flags" "= {uc = 0x0, s1 = 0x(1|f*), u1 = 0x0, s2 = 0x(3|f*), u2 = 0x0, s3 = 0x(7|f*), u3 = 0x0, s9 = 0x(1ff|f*), u9 = 0x0, sc = 0xff}" "bitfield containment #2"] { gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # Test unsigned bitfields for unsignedness and range. @@ -160,7 +160,7 @@ proc bitfield_unsignedness {} { if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 1, s2 = 0, u2 = 3, s3 = 0, u3 = 7, s9 = 0, u9 = 511, sc = 0.*" "unsigned bitfield ranges"] { gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -205,8 +205,8 @@ proc bitfield_signedness {} { gdb_suppress_tests } default { - fail "determining signed-ness of bitfields" ; - gdb_suppress_tests; + fail "determining signed-ness of bitfields" + gdb_suppress_tests } } @@ -222,7 +222,7 @@ proc bitfield_signedness {} { gdb_suppress_tests } # Hmmmm??? - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # Test bitfields at non-zero offsets in a struct. diff --git a/gdb/testsuite/gdb.base/bitfields2.exp b/gdb/testsuite/gdb.base/bitfields2.exp index 47dc2a798fd..843da17a18b 100644 --- a/gdb/testsuite/gdb.base/bitfields2.exp +++ b/gdb/testsuite/gdb.base/bitfields2.exp @@ -78,29 +78,29 @@ proc bitfield_uniqueness {} { start_test break1 if [gdb_test "print flags" ".*u1 = 0, u2 = 0, u3 = 0, s1 = 1, s2 = 0, s3 = 0.*" "bitfield uniqueness; flags.s1 = 1"] { - gdb_suppress_tests; + gdb_suppress_tests } continue_test break1 "#1" if [gdb_test "print flags" ".*u1 = 1, u2 = 0, u3 = 0, s1 = 0, s2 = 0, s3 = 0.*" "bitfield uniqueness; flags.u1 = 1"] { - gdb_suppress_tests; + gdb_suppress_tests } continue_test break1 "#2" if [gdb_test "print flags" ".*u1 = 0, u2 = 0, u3 = 0, s1 = 0, s2 = 1, s3 = 0.*" "bitfield uniqueness; flags.s2 = 1"] { - gdb_suppress_tests; + gdb_suppress_tests } continue_test break1 "#3" if [gdb_test "print flags" ".*u1 = 0, u2 = 1, u3 = 0, s1 = 0, s2 = 0, s3 = 0.*" "bitfield uniqueness; flags.u2 = 1"] { - gdb_suppress_tests; + gdb_suppress_tests } continue_test break1 "#4" if [gdb_test "print flags" ".*u1 = 0, u2 = 0, u3 = 0, s1 = 0, s2 = 0, s3 = 1.*" "bitfield uniqueness; flags.s3 = 1"] { - gdb_suppress_tests; + gdb_suppress_tests } continue_test break1 "#5" if [gdb_test "print flags" ".*u1 = 0, u2 = 0, u3 = 1, s1 = 0, s2 = 0, s3 = 0.*" "bitfield uniqueness; flags.u3 = 1"] { gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } @@ -129,7 +129,7 @@ proc bitfield_containment {} { if [gdb_test "print/x flags" "= {u1 = 0x0, u2 = 0x1ffffffff, u3 = 0x0, s1 = 0x(7fff|f*), s2 = 0x0, s3 = 0xf*}" "bitfield containment; flags.u2, flags.s1, flags.s2 to all 1s"] { gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # Test unsigned bitfields for unsignedness and range. @@ -147,7 +147,7 @@ proc bitfield_unsignedness {} { if [gdb_test "print flags" ".*u1 = 32767, u2 = 8589934591, u3 = 65535, s1 = 0, s2 = 0, s3 = 0.*" "maximum unsigned bitfield values"] { gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -210,7 +210,7 @@ proc bitfield_signedness {} { unsupported $test } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } @@ -276,7 +276,7 @@ proc bitfield_set {} { unsupported $test } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } gdb_start diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp index 3da3bc0de46..8707e3bb779 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -308,7 +308,7 @@ proc test_attach {file displacement {relink_args ""}} { set test "sleep function started" set command "${file} sleep" - set res [remote_spawn host $command]; + set res [remote_spawn host $command] if { $res < 0 || $res == "" } { perror "Spawning $command failed." fail $test @@ -628,7 +628,7 @@ foreach ldprelink {NO YES} { set dir ${exec}.d set relink_args [build_executable_own_libs ${test}.exp [file tail $exec] $srcfile $opts $interp $dir] if {$relink_args == ""} { - continue; + continue } if {$binsepdebug == "SEP"} { diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index 41371aac100..d5ce29b6e33 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -776,8 +776,8 @@ proc test_next_with_recursion {} { gdb_expect { -re "Break.* factorial .value=6. .*$gdb_prompt $" {} -re ".*$gdb_prompt $" { - fail "run to factorial(6)"; - gdb_suppress_tests; + fail "run to factorial(6)" + gdb_suppress_tests } timeout { fail "run to factorial(6) (timeout)" ; gdb_suppress_tests } } @@ -838,7 +838,7 @@ proc test_next_with_recursion {} { if [target_info exists gdb,noresults] { gdb_suppress_tests } gdb_continue_to_end "recursive next test" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } test_next_with_recursion diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp index 7f6afd81c5b..e62021b756f 100644 --- a/gdb/testsuite/gdb.base/call-sc.exp +++ b/gdb/testsuite/gdb.base/call-sc.exp @@ -80,7 +80,7 @@ proc start_scalars_test { type } { # Advance to main if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } # Get the debug format diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp index f2a742b4067..6e1ebab9e77 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -63,7 +63,7 @@ proc do_function_calls {} { global gdb_prompt # We need to up this because this can be really slow on some boards. - set timeout 60; + set timeout 60 # If any of these calls segv we don't want to affect subsequent tests. # E.g., we want to ensure register values are restored. @@ -329,7 +329,7 @@ proc rerun_and_prepare {} { # the language be set to the default. if { ![runto_main] } { - gdb_suppress_tests; + gdb_suppress_tests } # However, turn off overload-resolution for aCC. Having it on causes @@ -338,7 +338,7 @@ proc rerun_and_prepare {} { gdb_test_no_output "set overload-resolution 0" } else { if { ![runto_main] } { - gdb_suppress_tests; + gdb_suppress_tests } gdb_test_no_output "set language c" } diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 8ad5d5c9219..39ad3f3575a 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -74,7 +74,7 @@ proc progvar_simple_if_test {} { gdb_test "if value == 5\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \ "\\\$\[0-9\]* = 0xfeedface" \ "progvar_simple_if_test #2" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } proc progvar_simple_while_test {} { @@ -94,7 +94,7 @@ proc progvar_simple_while_test {} { gdb_test "while value > 0\np/x 0xfeedface\nset value -= 1\nend" \ "\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \ "progvar_simple_while_test #1" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } proc progvar_complex_if_while_test {} { @@ -115,7 +115,7 @@ proc progvar_complex_if_while_test {} { gdb_test "while value > 0\nset value -= 1\nif \(value % 2\) == 1\np/x 0xdeadbeef\nelse\np/x 0xfeedface\nend\nend" \ "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \ "progvar_complex_if_while_test #1" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } proc if_while_breakpoint_command_test {} { @@ -150,7 +150,7 @@ proc if_while_breakpoint_command_test {} { gdb_test "info break" \ "while.*set.*if.*p/x.*else.*p/x.*end.*" \ "info break in if_while_breakpoint_command_test" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # Test that we can run the inferior from breakpoint commands. @@ -191,7 +191,7 @@ proc infrun_breakpoint_command_test {} { "Continuing.*.*.*Breakpoint \[0-9\]*, factorial \\(value=5\\).*at.*\[0-9\]*\[ \]*if \\(value > 1\\) \{.*\[0-9\]*\[ \]*value \\*= factorial \\(value - 1\\);.*" \ "continue in infrun_breakpoint_command_test" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } proc breakpoint_command_test {} { @@ -213,7 +213,7 @@ proc breakpoint_command_test {} { "Breakpoint \[0-9\]*, factorial.*Now the value is 5" \ "continue in breakpoint_command_test" gdb_test "print value" " = 5" "print value in breakpoint_command_test" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # Test a simple user defined command (with arguments) @@ -379,7 +379,7 @@ proc test_command_prompt_position {} { timeout { fail "(timeout) 3 commands in test_command_prompt_position" } } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp index d5996baa423..054ed3e01ce 100644 --- a/gdb/testsuite/gdb.base/corefile.exp +++ b/gdb/testsuite/gdb.base/corefile.exp @@ -84,14 +84,14 @@ expect { # See previous comments above, they are still applicable. # -close; +close if $verbose>1 then { send_user "Spawning $GDB $INTERNAL_GDBFLAGS $GDBFLAGS $binfile -core=$corefile\n" } -eval "spawn $GDB $INTERNAL_GDBFLAGS $GDBFLAGS $binfile -core=$corefile"; +eval "spawn $GDB $INTERNAL_GDBFLAGS $GDBFLAGS $binfile -core=$corefile" expect { -re "Core was generated by .*coremaker.*\r\n\#0 .*\(\).*\r\n$gdb_prompt $" { pass "args: execfile -core=[file tail $corefile]" @@ -108,7 +108,7 @@ expect { set timeout $oldtimeout verbose "Timeout is now $timeout seconds" 2 -close; +close # Now restart normally. @@ -122,7 +122,7 @@ gdb_test_multiple "core-file $corefile" "core-file command" { -re ".* program is being debugged already.*y or n. $" { # gdb_load may connect us to a gdbserver. send_gdb "y\n" - exp_continue; + exp_continue } -re "Core was generated by .*coremaker.*\r\n\#0 .*\(\).*\r\n$gdb_prompt $" { pass "core-file command" @@ -228,7 +228,7 @@ gdb_exit if ![is_remote target] { set test "attach: spawn sleep" - set res [remote_spawn host "$binfile sleep"]; + set res [remote_spawn host "$binfile sleep"] if { $res < 0 || $res == "" } { fail $test return diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index 48cf9b3f403..31bda5d6cd1 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -181,7 +181,7 @@ proc gdb_file_cmd {arg} { set last_loaded_file $arg if [is_remote host] { - set arg [remote_download host $arg]; + set arg [remote_download host $arg] if { $arg == "" } { error "download failed" return -1 diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp index 73d08f0e363..ec155da5f63 100644 --- a/gdb/testsuite/gdb.base/ending-run.exp +++ b/gdb/testsuite/gdb.base/ending-run.exp @@ -209,7 +209,7 @@ set program_not_exited 0 set program_in_exit 0 if {!$use_gdb_stub && (! [target_info exists use_cygmon] || ! [target_info use_cygmon])} { - global program_exited; + global program_exited if {[eval expr $program_exited == 0]} { gdb_test_multiple "n" "step to end of run" { -re "$inferior_exited_re normally.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp index d2e23c92319..8ef42a45f62 100644 --- a/gdb/testsuite/gdb.base/exprs.exp +++ b/gdb/testsuite/gdb.base/exprs.exp @@ -49,17 +49,17 @@ proc test_expr { args } { if { [llength $args] % 2 } { warning "an even # of arguments should be passed to test_expr" } - set last_ent [expr [llength $args] - 1]; - set testname [lindex $args $last_ent]; + set last_ent [expr [llength $args] - 1] + set testname [lindex $args $last_ent] if [gdb_test [lindex $args 0] ".*" "$testname (setup)"] { - gdb_suppress_tests; + gdb_suppress_tests } for {set x 1} {$x < $last_ent} {set x [expr $x + 2]} { if [gdb_test [lindex $args $x] [lindex $args [expr $x + 1]] "$testname ([lindex $args $x])"] { - gdb_suppress_tests; + gdb_suppress_tests } } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # # test expressions with "char" types diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp index 45f2c4ff12e..2b89d14b417 100644 --- a/gdb/testsuite/gdb.base/funcargs.exp +++ b/gdb/testsuite/gdb.base/funcargs.exp @@ -73,24 +73,24 @@ proc integral_args {} { # Continue; should stop at call0b and print actual arguments. if [gdb_test "cont" ".* call0b \\(s=1, i=2, l=3, c=97 'a'\\) .*" "continue to call0b"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call0c and print actual arguments. if [gdb_test "cont" ".* call0c \\(i=2, l=3, c=97 'a', s=1\\) .*" "continue to call0c"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call0d and print actual arguments. if [gdb_test "cont" ".* call0d \\(l=3, c=97 'a', s=1, i=2\\) .*" "continue to call0d";] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call0e and print actual arguments. if [gdb_test "cont" ".* call0e \\(c1=97 'a', l=3, c2=97 'a', i=2, c3=97 'a', s=1, c4=97 'a', c5=97 'a'\\) .*" "continue to call0e" ] { - gdb_suppress_tests; + gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -104,11 +104,11 @@ proc unsigned_integral_args {} { delete_breakpoints - gdb_breakpoint call1a; - gdb_breakpoint call1b; - gdb_breakpoint call1c; - gdb_breakpoint call1d; - gdb_breakpoint call1e; + gdb_breakpoint call1a + gdb_breakpoint call1b + gdb_breakpoint call1c + gdb_breakpoint call1d + gdb_breakpoint call1e # Run; should stop at call1a and print actual arguments. if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" } @@ -130,24 +130,24 @@ proc unsigned_integral_args {} { # Continue; should stop at call1b and print actual arguments. if [gdb_test "cont" ".* call1b \\(us=6, ui=7, ul=8, uc=98 'b'\\) .*" "continue to call1b"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call1c and print actual arguments. if [gdb_test "cont" ".* call1c \\(ui=7, ul=8, uc=98 'b', us=6\\) .*" "continue to call1c"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call1d and print actual arguments. if [gdb_test "cont" ".* call1d \\(ul=8, uc=98 'b', us=6, ui=7\\) .*" "continue to call1d"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call1e and print actual arguments. if [gdb_test "cont" ".* call1e \\(uc1=98 'b', ul=8, uc2=98 'b', ui=7, uc3=98 'b', us=6, uc4=98 'b', uc5=98 'b'\\) .*" "continue to call1e"] { - gdb_suppress_tests; + gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -195,37 +195,37 @@ proc float_and_integral_args {} { if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix*" } # Continue; should stop at call2b and print actual arguments. if [gdb_test "cont" ".* call2b \\(f1=4, s=1, d1=5, i=2, f2=4, l=3, d2=5, c=97 'a'\\) .*" "continue to call2b"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call2c and print actual arguments. if [gdb_test "cont" ".* call2c \\(s=1, d1=5, i=2, f2=4, l=3, d2=5, c=97 'a', f1=4\\) .*" "continue to call2c"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call2d and print actual arguments. if [gdb_test "cont" ".* call2d \\(d1=5, i=2, f2=4, l=3, d2=5, c=97 'a', f1=4, s=1\\) .*" "continue to call2d"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call2e and print actual arguments. if [gdb_test "cont" ".* call2e \\(i=2, f2=4, l=3, d2=5, c=97 'a', f1=4, s=1, d1=5\\) .*" "continue to call2e"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call2f and print actual arguments. if [gdb_test "cont" ".* call2f \\(f2=4, l=3, d2=5, c=97 'a', f1=4, s=1, d1=5, i=2\\) .*" "continue to call2f"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call2g and print actual arguments. if [gdb_test "cont" ".* call2g \\(l=3, d2=5, c=97 'a', f1=4, s=1, d1=5, i=2, f2=4\\) .*" "continue to call2g"] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call2h and print actual arguments. if [gdb_test "cont" ".* call2h \\(d2=5, c=97 'a', f1=4, s=1, d1=5, i=2, f2=4, l=3\\) .*" "continue to call2h"] { - gdb_suppress_tests; + gdb_suppress_tests } # monitor only allows 8 breakpoints; w89k board allows 10, so @@ -235,9 +235,9 @@ proc float_and_integral_args {} { # Continue; should stop at call2i and print actual arguments. if [gdb_test "cont" ".* call2i \\(c1=97 'a', f1=4, c2=97 'a', c3=97 'a', d1=5, c4=97 'a', c5=97 'a', c6=97 'a', f2=4, s=1, c7=97 'a', d2=5\\) .*" "continue to call2i"] { - gdb_suppress_tests; + gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } @@ -344,7 +344,7 @@ proc pointer_args {} { # Continue; should stop at call3b and print actual arguments. # Try dereferencing the arguments. if [gdb_test "cont" ".* call3b \\(ucp=$hex <uc> \"b.*\", usp=$hex <us>, uip=$hex <ui>, ulp=$hex <ul>\\) .*" "continue to call3b"] { - gdb_suppress_tests; + gdb_suppress_tests } gdb_test "print *ucp" ".* = 98 'b'" @@ -355,14 +355,14 @@ proc pointer_args {} { # Continue; should stop at call3c and print actual arguments. # Try dereferencing the arguments. if [gdb_test "cont" ".* call3c \\(fp=$hex <f>, dp=$hex <d>\\) .*" "continue to call3c"] { - gdb_suppress_tests; + gdb_suppress_tests } gdb_test "print *fp" ".* = 4" gdb_test "print *dp" ".* = 5" # pass "locate actual args, pointer types" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -418,7 +418,7 @@ proc structs_by_reference {} { } pass "locate actual args, structs/unions passed by reference" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -486,7 +486,7 @@ proc structs_by_value {} { fail "print un (unknown case)" } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -546,7 +546,7 @@ proc discard_and_shuffle {} { "\[\r\n\]#1 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#2 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call6c and print actual arguments. @@ -560,7 +560,7 @@ proc discard_and_shuffle {} { "\[\r\n\]#2 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#3 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call6d and print actual arguments. # Print backtrace. @@ -574,7 +574,7 @@ proc discard_and_shuffle {} { "\[\r\n\]#3 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#4 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call6e and print actual arguments. @@ -590,7 +590,7 @@ proc discard_and_shuffle {} { "\[\r\n\]#4 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#5 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call6f and print actual arguments. @@ -607,7 +607,7 @@ proc discard_and_shuffle {} { "\[\r\n\]#5 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#6 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call6g and print actual arguments. @@ -625,7 +625,7 @@ proc discard_and_shuffle {} { "\[\r\n\]#6 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#7 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call6h and print actual arguments. @@ -644,7 +644,7 @@ proc discard_and_shuffle {} { "\[\r\n\]#7 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#8 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } # monitor only allows 8 breakpoints; w89k board allows 10, so @@ -671,7 +671,7 @@ proc discard_and_shuffle {} { "\[\r\n\]#8 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#9 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call6j and print actual arguments. @@ -692,7 +692,7 @@ proc discard_and_shuffle {} { "\[\r\n\]#9 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#10 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } # Continue; should stop at call6k and print actual arguments. @@ -713,9 +713,9 @@ proc discard_and_shuffle {} { "\[\r\n\]#10 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) " "\[\r\n\]#11 .* main \\(.*\\) at " } ] { - gdb_suppress_tests; + gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } @@ -921,7 +921,7 @@ proc shuffle_round_robin {} { "\[\r\n\]#10 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) " "\[\r\n\]#11 .* main \\(.*\\) at " } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -961,7 +961,7 @@ proc recursive_structs_by_value {} { } else { fail "recursive passing of structs by value (sparclet)" } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -997,7 +997,7 @@ proc localvars_after_alloca { } { gdb_test "print l" " = 3" "print l in localvars_after_alloca" gdb_test "backtrace 8" "#0.*localvars_after_alloca \\(c=97 'a', s=1, i=2, l=3\\).*#1.*main.*" "backtrace after alloca" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } proc call_after_alloca { } { @@ -1020,7 +1020,7 @@ proc call_after_alloca { } { if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" } gdb_test "backtrace 8" "#0.*call_after_alloca_subr \\(c=97 'a', s=1, i=2, l=3, uc=98 'b', us=11, ui=12, ul=13\\).*#1.*call_after_alloca \\(c=97 'a', s=1, i=2, l=3\\).*#2.*main.*" "backtrace from call_after_alloca_subr" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -1082,18 +1082,18 @@ proc localvars_in_indirect_call { } { } -re ".*$gdb_prompt $" { fail "finish from indirectly called function" - gdb_suppress_tests; + gdb_suppress_tests } default { fail "finish from indirectly called function" - gdb_suppress_tests; + gdb_suppress_tests } } if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" } gdb_test "step" "call0a \\(c=97 'a', s=1, i=2, l=3\\).*" \ "stepping into indirectly called function" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -1156,7 +1156,7 @@ proc test_stepping_over_trampolines { } { gdb_suppress_tests } } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # Start with a fresh gdb. diff --git a/gdb/testsuite/gdb.base/hbreak2.exp b/gdb/testsuite/gdb.base/hbreak2.exp index b70973772fe..4cddf38ba4c 100644 --- a/gdb/testsuite/gdb.base/hbreak2.exp +++ b/gdb/testsuite/gdb.base/hbreak2.exp @@ -518,7 +518,7 @@ proc test_next_with_recursion {} { if [target_info exists gdb,noresults] { gdb_suppress_tests } gdb_continue_to_end "recursive next test" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } test_next_with_recursion diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp index 509e3ec22a5..f955c37a5c8 100644 --- a/gdb/testsuite/gdb.base/huge.exp +++ b/gdb/testsuite/gdb.base/huge.exp @@ -20,7 +20,7 @@ # (could be very time-consuming on remote targets with slow connection). # if [target_info exists gdb,skip_huge_test] { - return; + return } set testfile "huge" diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp index 96ca198efa0..11aafd95e2e 100644 --- a/gdb/testsuite/gdb.base/list.exp +++ b/gdb/testsuite/gdb.base/list.exp @@ -57,18 +57,18 @@ set last_line_re "${last_line}\[ \t\]+} /\\* last line \\*/" # Return 1 if success, 0 if fail. # -set set_listsize_count 0; +set set_listsize_count 0 proc set_listsize { arg } { global gdb_prompt - global set_listsize_count; + global set_listsize_count - incr set_listsize_count; + incr set_listsize_count if [gdb_test_no_output "set listsize $arg" "setting listsize to $arg #$set_listsize_count"] { return 0 } if { $arg == 0 } { - set arg "unlimited"; + set arg "unlimited" } if [gdb_test "show listsize" "Number of source lines.* is ${arg}.*" "show listsize $arg #$set_listsize_count"] { @@ -198,7 +198,7 @@ proc test_list_filename_and_number {} { timeout { fail "list list1.c:12 (timeout)" ; gdb_suppress_tests } } pass "list filename:number ($testcnt tests)" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # @@ -258,7 +258,7 @@ proc test_list_forward {} { } pass "successive list commands to page forward ($testcnt tests)" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # Test that repeating the list linenum command doesn't print the same @@ -301,7 +301,7 @@ proc test_repeat_list_command {} { } pass "repeat list commands to page forward using 'return' ($testcnt tests)" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } proc test_list_backwards {} { @@ -338,7 +338,7 @@ proc test_list_backwards {} { } pass "$testcnt successive \"list -\" commands to page backwards" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # diff --git a/gdb/testsuite/gdb.base/memattr.exp b/gdb/testsuite/gdb.base/memattr.exp index db9c6966438..69f2ad42895 100644 --- a/gdb/testsuite/gdb.base/memattr.exp +++ b/gdb/testsuite/gdb.base/memattr.exp @@ -458,7 +458,7 @@ proc delete_memory {} { gdb_test_multiple "delete mem" "delete mem" { -re "Delete all memory regions.*y or n.*$" { - send_gdb "y\n"; + send_gdb "y\n" exp_continue } -re "$gdb_prompt $" { } diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp index 9febabf5c7c..d2943784f6c 100644 --- a/gdb/testsuite/gdb.base/overlays.exp +++ b/gdb/testsuite/gdb.base/overlays.exp @@ -23,11 +23,11 @@ set data_overlays 1 if [istarget "d10v-*-*"] then { - set linker_script "${srcdir}/${subdir}/d10v.ld"; + set linker_script "${srcdir}/${subdir}/d10v.ld" } elseif [istarget "m32r-*-*"] then { - set linker_script "${srcdir}/${subdir}/m32r.ld"; + set linker_script "${srcdir}/${subdir}/m32r.ld" } elseif [istarget "spu-*-*"] then { - set linker_script "${srcdir}/${subdir}/spu.ld"; + set linker_script "${srcdir}/${subdir}/spu.ld" set data_overlays 0 } else { verbose "Skipping overlay test -- not implemented for this target." @@ -85,7 +85,7 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests; + gdb_suppress_tests } # couple of convenience variables diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp index e9e6146a59e..316461a5dfe 100644 --- a/gdb/testsuite/gdb.base/printcmds.exp +++ b/gdb/testsuite/gdb.base/printcmds.exp @@ -426,45 +426,45 @@ proc test_print_repeats_10 {} { for { set x 1 } { $x <= 16 } { incr x } { gdb_test_no_output "set print elements $x" for { set e 1 } { $e <= 16 } {incr e } { - set v [expr $e - 1]; + set v [expr $e - 1] set command "p &ctable2\[${v}*16\]" if { $x < $e } { - set aval $x; + set aval $x } else { - set aval $e; + set aval $e } - set xval [expr $x - $e]; + set xval [expr $x - $e] if { $xval < 0 } { - set xval 0; + set xval 0 } if { $aval > 10 } { - set a "'a' <repeats $aval times>"; + set a "'a' <repeats $aval times>" if { $xval > 0 } { - set a "${a}, \\\""; + set a "${a}, \\\"" } } else { - set a "\\\"[string range "aaaaaaaaaaaaaaaa" 1 $aval]"; + set a "\\\"[string range "aaaaaaaaaaaaaaaa" 1 $aval]" if { $xval > 10 } { - set a "$a\\\", "; + set a "$a\\\", " } } - set xstr ""; + set xstr "" if { $xval > 10 } { - set xstr "'X' <repeats $xval times>"; + set xstr "'X' <repeats $xval times>" } else { if { $xval > 0 } { - set xstr "[string range "XXXXXXXXXXXXXXXX" 1 $xval]\\\""; + set xstr "[string range "XXXXXXXXXXXXXXXX" 1 $xval]\\\"" } else { if { $aval <= 10 } { - set xstr "\\\""; + set xstr "\\\"" } } } if { $aval < 16 } { set xstr "${xstr}\[.\]\[.\]\[.\]" } - set string " = \[(\]unsigned char \[*\]\[)\] <ctable2(\\+$decimal)?> ${a}${xstr}"; - gdb_test "$command" "$string" "$command with print elements set to $x"; + set string " = \[(\]unsigned char \[*\]\[)\] <ctable2(\\+$decimal)?> ${a}${xstr}" + gdb_test "$command" "$string" "$command with print elements set to $x" } } } @@ -659,7 +659,7 @@ proc test_print_string_constants {} { # We need to up this because this can be really slow on some boards. # (Test may involve inferior malloc() calls). - set timeout 60; + set timeout 60 gdb_test "p \"a string\"" " = \"a string\"" gdb_test "p \"embedded \\000 null\"" " = \"embedded \\\\000 null\"" @@ -683,7 +683,7 @@ proc test_print_array_constants {} { # We need to up this because this can be really slow on some boards. # (Test may involve inferior malloc() calls). - set timeout 60; + set timeout 60 gdb_test "print {'a','b','c'}" " = \"abc\"" gdb_test_escape_braces "print {0,1,2}" " = {0, 1, 2}" diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp index c66a8ed6269..da635bf3b48 100644 --- a/gdb/testsuite/gdb.base/recurse.exp +++ b/gdb/testsuite/gdb.base/recurse.exp @@ -49,7 +49,7 @@ proc recurse_tests {} { if [gdb_test "continue" \ "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 0.*New value = 10.*" \ "continue to first instance watchpoint, first time"] then { - gdb_suppress_tests; + gdb_suppress_tests } # Continue inward for a few iterations @@ -75,7 +75,7 @@ proc recurse_tests {} { if [gdb_test "continue" \ "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 0.*New value = 5.*"\ "continue to second instance watchpoint, first time"] then { - gdb_suppress_tests; + gdb_suppress_tests } # Continue inward for a few iterations @@ -92,14 +92,14 @@ proc recurse_tests {} { if [gdb_test "continue" \ "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 5.*New value = 120.*return.*" \ "continue to second instance watchpoint, second time"] then { - gdb_suppress_tests; + gdb_suppress_tests } # Continue again. We should have a watchpoint go out of scope now if [gdb_test "continue" \ "Continuing.*\[Ww\]atchpoint.*deleted.*recurse \\(a=6\\) .*" \ "second instance watchpoint deleted when leaving scope"] then { - gdb_suppress_tests; + gdb_suppress_tests } # Continue until second set of b (first instance). @@ -138,10 +138,10 @@ proc recurse_tests {} { if [gdb_test "continue" \ "Continuing.*\[Ww\]atchpoint.*deleted.*\(main \\(\\) \|21.*\}\).*" \ "first instance watchpoint deleted when leaving scope"] then { - gdb_suppress_tests; + gdb_suppress_tests } } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # Preserve the old timeout, and set a new one that should be diff --git a/gdb/testsuite/gdb.base/remotetimeout.exp b/gdb/testsuite/gdb.base/remotetimeout.exp index bc8df9d1f23..56bdfd67c46 100644 --- a/gdb/testsuite/gdb.base/remotetimeout.exp +++ b/gdb/testsuite/gdb.base/remotetimeout.exp @@ -23,7 +23,7 @@ global GDBFLAGS # Skip test if target does not support argument passing. if [target_info exists noargs] { - return; + return } # diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp index fb5f78321ec..b0a2fc60a66 100644 --- a/gdb/testsuite/gdb.base/reread.exp +++ b/gdb/testsuite/gdb.base/reread.exp @@ -65,11 +65,11 @@ gdb_run_cmd gdb_expect { -re ".*Breakpoint.* foo .* at .*$srcfile1:14.*$gdb_prompt $" { - pass "run to foo()"; + pass "run to foo()" } -re ".*$gdb_prompt $" { - fail "run to foo()"; - gdb_suppress_tests; + fail "run to foo()" + gdb_suppress_tests } timeout { fail "run to foo() (timeout)" ; gdb_suppress_tests } } @@ -88,20 +88,20 @@ gdb_touch_execfile ${binfile} # Should see "Breakpoint 1, foo () at reread2.c:9" if [is_remote target] { - unsupported "run to foo() second time "; + unsupported "run to foo() second time " } else { gdb_run_cmd gdb_expect { # -re ".*re-reading symbols.*Breakpoint.* foo .* at .*$srcfile2:9.*$gdb_prompt $" {} -re ".*Breakpoint.* foo .* at .*:9.*$gdb_prompt $" { - pass "run to foo() second time "; + pass "run to foo() second time " } -re ".*$gdb_prompt $" { - fail "run to foo() second time"; - gdb_suppress_tests; + fail "run to foo() second time" + gdb_suppress_tests } timeout { - fail "run to foo() second time (timeout)" ; + fail "run to foo() second time (timeout)" gdb_suppress_tests } } @@ -131,11 +131,11 @@ if [is_remote target] { gdb_run_cmd gdb_expect { -re ".*Breakpoint.* foo .* at .*$srcfile1:14.*$gdb_prompt $" { - pass "second pass: run to foo()"; + pass "second pass: run to foo()" } -re ".*$gdb_prompt $" { - fail "second pass: run to foo()"; - gdb_suppress_tests; + fail "second pass: run to foo()" + gdb_suppress_tests } timeout { fail "second pass: run to foo() (timeout)" @@ -155,14 +155,14 @@ if [is_remote target] { gdb_run_cmd gdb_expect { -re ".*Breakpoint.* foo .* at .*:9.*$gdb_prompt $" { - pass "second pass: run to foo() second time "; + pass "second pass: run to foo() second time " } -re ".*$gdb_prompt $" { - fail "second pass: run to foo() second time"; - gdb_suppress_tests; + fail "second pass: run to foo() second time" + gdb_suppress_tests } timeout { - fail "second pass: run to foo() second time (timeout)" ; + fail "second pass: run to foo() second time (timeout)" gdb_suppress_tests } } diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp index 24af4c5b798..1548d0a6b20 100644 --- a/gdb/testsuite/gdb.base/savedregs.exp +++ b/gdb/testsuite/gdb.base/savedregs.exp @@ -46,7 +46,7 @@ gdb_load ${binfile} # Advance to main if { ![runto_main] } { - gdb_suppress_tests; + gdb_suppress_tests } proc process_saved_regs { current inner outer } { diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp index 0eba5e80a8c..fbcc31b5064 100644 --- a/gdb/testsuite/gdb.base/scope.exp +++ b/gdb/testsuite/gdb.base/scope.exp @@ -63,24 +63,24 @@ proc test_at_main {} { # Print scope0.c::filelocal, which is 1 if [gdb_test "print filelocal" "\\\$$decimal = 1" "print filelocal" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if [gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at main" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope0.c::filelocal_bss, which is 101 if [gdb_test "print filelocal_bss" "\\\$$decimal = 101" "print filelocal_bss" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if [gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_main" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss"] { - gdb_suppress_tests ; + gdb_suppress_tests } @@ -89,13 +89,13 @@ proc test_at_main {} { # No clue why the rs6000 fails this test. if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print filelocal_ro" "\\\$$decimal = 201" "print filelocal_ro in test_at_main" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro"] { - gdb_suppress_tests ; + gdb_suppress_tests } @@ -103,7 +103,7 @@ proc test_at_main {} { if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } @@ -111,7 +111,7 @@ proc test_at_main {} { if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss"] { - gdb_suppress_tests ; + gdb_suppress_tests } @@ -120,48 +120,48 @@ proc test_at_main {} { if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if {$hp_cc_compiler} then { setup_xfail "hppa2.0w-*-*" 11747CLLbs} if [gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::foo::funclocal, which is 3 if [gdb_test "print foo::funclocal" "\\\$$decimal = 3" "print foo::funclocal" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::foo::funclocal_ro, which is 203 if [gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" "print foo::funclocal_ro" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::bar::funclocal, which is 4 if [gdb_test "print bar::funclocal" "\\\$$decimal = 4" "print bar::funclocal" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } @@ -173,21 +173,21 @@ proc test_at_foo {} { global subdir if [gdb_test "next" ".*bar \\(\\);" "" ] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope0.c::filelocal, which is 1 if [gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at foo" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope0.c::filelocal_bss, which is 101 if [gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_foo" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss"] { - gdb_suppress_tests ; + gdb_suppress_tests } @@ -195,7 +195,7 @@ proc test_at_foo {} { if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro"] { - gdb_suppress_tests ; + gdb_suppress_tests } @@ -205,7 +205,7 @@ proc test_at_foo {} { if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } @@ -265,7 +265,7 @@ proc test_at_foo {} { if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } @@ -277,21 +277,21 @@ proc test_at_bar {} { global subdir if [gdb_test "next" ".*" "" ] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope0.c::filelocal, which is 1 if [gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope0.c::filelocal_bss, which is 101 if [gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss"] { - gdb_suppress_tests ; + gdb_suppress_tests } @@ -299,123 +299,123 @@ proc test_at_bar {} { if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro at bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::filelocal, which is 2 if [gdb_test "print filelocal" "\\\$$decimal = 2" "print filelocal at bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::filelocal_bss, which is 102 if [gdb_test "print filelocal_bss" "\\\$$decimal = 102" "print filelocal_bss at bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::filelocal_ro, which is 202 if [gdb_test "print filelocal_ro" "\\\$$decimal = 202" "print filelocal_ro in test_at_bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::foo::funclocal, which is 3 if [gdb_test "print foo::funclocal" "\\\$$decimal = 3" "print foo::funclocal at bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::foo::funclocal_bss, which is 103 if [gdb_test "print foo::funclocal_bss" "\\\$$decimal = 103" "print foo::funclocal_bss at bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_bss"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::foo::funclocal_ro, which is 203 if [gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" "print foo::funclocal_ro at bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::bar::funclocal, which is 4 if [gdb_test "print funclocal" "\\\$$decimal = 4" "print funclocal at bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if [gdb_test "print bar::funclocal" "\\\$$decimal = 4" "print bar::funclocal at bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal"] { - gdb_suppress_tests ; + gdb_suppress_tests } # Print scope1.c::bar::funclocal_bss, which is 104 if [gdb_test "print funclocal_bss" "\\\$$decimal = 104" "print funclocal_bss at bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if [gdb_test "print bar::funclocal_bss" "\\\$$decimal = 104" "print bar::funclocal_bss at bar" ] { - gdb_suppress_tests ; + gdb_suppress_tests } if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } if [gdb_test "print 'scope1.c'::bar::funclocal_bss" "\\\$$decimal = 104" "print 'scope1.c'::bar::funclocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal_bss"] { - gdb_suppress_tests ; + gdb_suppress_tests } - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } @@ -433,17 +433,17 @@ proc test_at_autovars {} { gdb_breakpoint marker1 if [gdb_test "cont" "Break.* marker1 \\(\\) at .*:$decimal.*" "continue to marker1"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "up" ".*autovars.*" "up from marker1 in scope.exp" ] { - gdb_suppress_tests ; + gdb_suppress_tests } set count 0 while {$count < 100} { if [gdb_test "print i$count" ".* = $count" "" ] { - gdb_suppress_tests ; + gdb_suppress_tests } set count [expr $count+1] @@ -466,10 +466,10 @@ proc test_at_localscopes {} { gdb_breakpoint marker4 if [gdb_test "cont" "Break.* marker2 \\(\\) at .*:$decimal.*" "continue to marker2"] { - gdb_suppress_tests; + gdb_suppress_tests } if [gdb_test "up" ".*localscopes.*" "up from marker2 in scopes.exp" ] { - gdb_suppress_tests ; + gdb_suppress_tests } # Should be at first (outermost) scope. Check values. @@ -508,7 +508,7 @@ proc test_at_localscopes {} { gdb_test "print localval1" " = 11" "print localval1, innermost scope" gdb_test "print localval2" " = 12" "print localval2, innermost scope" gdb_test "print localval3" " = 13" "print localval3, innermost scope" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } # Start with a fresh gdb. diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp index 1e63835c2a3..9e956c726de 100644 --- a/gdb/testsuite/gdb.base/sepdebug.exp +++ b/gdb/testsuite/gdb.base/sepdebug.exp @@ -578,8 +578,8 @@ proc test_next_with_recursion {} { gdb_expect { -re "Break.* factorial .value=6. .*$gdb_prompt $" {} -re ".*$gdb_prompt $" { - fail "run to factorial(6)"; - gdb_suppress_tests; + fail "run to factorial(6)" + gdb_suppress_tests } timeout { fail "run to factorial(6) (timeout)" ; gdb_suppress_tests } } @@ -640,7 +640,7 @@ proc test_next_with_recursion {} { if [target_info exists gdb,noresults] { gdb_suppress_tests } gdb_continue_to_end "recursive next test" - gdb_stop_suppressing_tests; + gdb_stop_suppressing_tests } test_next_with_recursion diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp index 6d250c04d09..e172fc7615d 100644 --- a/gdb/testsuite/gdb.base/setshow.exp +++ b/gdb/testsuite/gdb.base/setshow.exp @@ -33,7 +33,7 @@ gdb_load ${binfile} # make sure $pc is sane, in case we're talking to a board. if { ![runto_main] } { - gdb_suppress_tests; + gdb_suppress_tests } # diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp index a4d5764ed81..1c58300cf88 100644 --- a/gdb/testsuite/gdb.base/setvar.exp +++ b/gdb/testsuite/gdb.base/setvar.exp @@ -70,31 +70,31 @@ gdb_test_multiple "print sizeof (unsigned long)" "sizeof ulong" { proc test_set { args } { global gdb_prompt - set length [expr [llength $args] - 1]; - set message "[lindex $args $length]"; - set final [expr $length - 2]; - set count 1; + set length [expr [llength $args] - 1] + set message "[lindex $args $length]" + set final [expr $length - 2] + set count 1 # Set up the variables. for {set x 0} {$x < $length} {incr x} { if { "[lindex $args $x]" != "" } { - set arg [lindex $args $x]; + set arg [lindex $args $x] if { ($x == $final) || ([string first ".*" [lindex $args [expr $x + 1]]] >= 0) } { - set match [lindex $args [expr $x + 1]]; + set match [lindex $args [expr $x + 1]] if { $count == 1 } { set mess "$message" } else { - set mess "$message (#$count)"; + set mess "$message (#$count)" } - incr count; - incr x; + incr count + incr x } else { - set mess ""; + set mess "" set match "" } verbose "doing $arg $match" if [gdb_test "$arg" "$match" "$mess"] { - fail "$message -- $match"; + fail "$message -- $match" return 1 } } diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp index 62e075c3354..4fc5ac819b7 100644 --- a/gdb/testsuite/gdb.base/sigaltstack.exp +++ b/gdb/testsuite/gdb.base/sigaltstack.exp @@ -49,7 +49,7 @@ gdb_test "handle SIGPROF print pass nostop" # Advance to main if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } # Stop in handle, when at the inner most level diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp index 236dd952cc7..02810e89ba5 100644 --- a/gdb/testsuite/gdb.base/siginfo-addr.exp +++ b/gdb/testsuite/gdb.base/siginfo-addr.exp @@ -49,7 +49,7 @@ gdb_test "display/i \$pc" # Advance to main if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } # Run to the signal. diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp index db7d9f794a2..cebc2eeaa05 100644 --- a/gdb/testsuite/gdb.base/siginfo-obj.exp +++ b/gdb/testsuite/gdb.base/siginfo-obj.exp @@ -50,7 +50,7 @@ gdb_load ${binfile} # Advance to main if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } # Run to the signal. @@ -108,7 +108,7 @@ gdb_test "p ssi_signo" " = $ssi_signo" # Advance to main if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } # Run to the signal. diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp index e49cd56d957..5389e0b8456 100644 --- a/gdb/testsuite/gdb.base/siginfo.exp +++ b/gdb/testsuite/gdb.base/siginfo.exp @@ -47,7 +47,7 @@ gdb_test "display/i \$pc" # Advance to main if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } # Pass all the alarms straight through (but verbosely) diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp index 20006299246..3b423ec6494 100644 --- a/gdb/testsuite/gdb.base/sigrepeat.exp +++ b/gdb/testsuite/gdb.base/sigrepeat.exp @@ -41,7 +41,7 @@ gdb_load ${binfile} # Advance to main if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } # Run to the signal handler wait loop. diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp index 89edc2dbb99..e8ab8ea5b8a 100644 --- a/gdb/testsuite/gdb.base/sigstep.exp +++ b/gdb/testsuite/gdb.base/sigstep.exp @@ -45,7 +45,7 @@ gdb_test "display/i \$pc" # Advance to main if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } # Pass all the alarms straight through (but verbosely) diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp index 93b2ca13505..2aa181ea17e 100644 --- a/gdb/testsuite/gdb.base/structs.exp +++ b/gdb/testsuite/gdb.base/structs.exp @@ -91,7 +91,7 @@ proc start_structs_test { types } { # Advance to main if { ![runto_main] } then { - gdb_suppress_tests; + gdb_suppress_tests } # Get the debug format diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp index 15ecd29103a..ae8d2fa3dae 100644 --- a/gdb/testsuite/gdb.base/testenv.exp +++ b/gdb/testsuite/gdb.base/testenv.exp @@ -36,7 +36,7 @@ if { [prepare_for_testing ${testfile}.exp ${binfile} ${srcfile}] } { # make sure $pc is sane, in case we're talking to a board. if { ![runto_main] } { - gdb_suppress_tests; + gdb_suppress_tests } set bp_line [gdb_get_line_number "set breakpoint here"] @@ -95,7 +95,7 @@ clean_restart $binfile # make sure $pc is sane, in case we're talking to a board. if { ![runto_main] } { - gdb_suppress_tests; + gdb_suppress_tests } set bp_line [gdb_get_line_number "set breakpoint here"] diff --git a/gdb/testsuite/gdb.base/twice.exp b/gdb/testsuite/gdb.base/twice.exp index 53b613e54d2..fada7a10414 100644 --- a/gdb/testsuite/gdb.base/twice.exp +++ b/gdb/testsuite/gdb.base/twice.exp @@ -20,9 +20,9 @@ set binfile ${objdir}/${subdir}/${testfile} set options debug lappend options "additional_flags=-I." -set fileid [open ${objdir}/${subdir}/${srcfile} w]; -puts $fileid "#include \"twice.c\""; -close $fileid; +set fileid [open ${objdir}/${subdir}/${srcfile} w] +puts $fileid "#include \"twice.c\"" +close $fileid remote_download host ${srcdir}/${subdir}/twice.c twice.c diff --git a/gdb/testsuite/gdb.base/valgrind-db-attach.exp b/gdb/testsuite/gdb.base/valgrind-db-attach.exp index 79c985f6272..b1e1ec62c69 100644 --- a/gdb/testsuite/gdb.base/valgrind-db-attach.exp +++ b/gdb/testsuite/gdb.base/valgrind-db-attach.exp @@ -36,7 +36,7 @@ regsub -all " " $db_command "\\ " db_command set test "spawn valgrind" set cmd "valgrind --db-attach=yes $db_command $binfile" -set res [remote_spawn host $cmd]; +set res [remote_spawn host $cmd] if { $res < 0 || $res == "" } { verbose -log "Spawning $cmd failed." unsupported $test diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gdb.base/valgrind-infcall.exp index 40c8464bbe8..6d2893a8aea 100644 --- a/gdb/testsuite/gdb.base/valgrind-infcall.exp +++ b/gdb/testsuite/gdb.base/valgrind-infcall.exp @@ -28,7 +28,7 @@ if {[build_executable $test.exp $executable $srcfile {debug}] == -1} { set test "spawn valgrind" set cmd "valgrind --vgdb-error=0 $binfile" -set res [remote_spawn host $cmd]; +set res [remote_spawn host $cmd] if { $res < 0 || $res == "" } { verbose -log "Spawning $cmd failed." unsupported $test diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp index d956e5c6843..70de81dc3e7 100644 --- a/gdb/testsuite/gdb.base/varargs.exp +++ b/gdb/testsuite/gdb.base/varargs.exp @@ -67,7 +67,7 @@ gdb_test_no_output "set width 0" if [gdb_skip_stdio_test "varargs.exp"] { # Nothing in this module is testable without printf. - return; + return } if ![runto_main] then { diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index 502742cb2eb..5961ef63bae 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -344,7 +344,7 @@ proc test_watchpoint_triggered_in_syscall {} { # These tests won't work without printf support. if [gdb_skip_stdio_test "watchpoints triggered in syscall"] { - return; + return } # Run until we get to the first marker function. set x 0 @@ -364,13 +364,13 @@ proc test_watchpoint_triggered_in_syscall {} { # to gdb, not the inferior, and we lose. So that is why we have # watchpoint.c prompt us, so we can wait for that prompt. - send_gdb "continue\n"; + send_gdb "continue\n" gdb_expect { -re "Continuing\\.\r\ntype stuff for buf now:" { pass "continue to read" } default { - fail "continue to read"; + fail "continue to read" return } } |