diff options
Diffstat (limited to 'gdb/testsuite/gdb.base')
-rw-r--r-- | gdb/testsuite/gdb.base/attach.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/bitfields2.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/call-signal-resume.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/callfuncs.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/commands.exp | 14 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/dbx.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/default.exp | 12 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/dump.exp | 28 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/exprs.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/freebpcmd.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/interrupt.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/list.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/long_long.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/maint.exp | 8 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/ptype.exp | 10 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/return.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/setshow.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/sigbpt.exp | 8 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/sigrepeat.exp | 2 |
19 files changed, 64 insertions, 63 deletions
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp index bc7d4eb..83a4b75 100644 --- a/gdb/testsuite/gdb.base/attach.exp +++ b/gdb/testsuite/gdb.base/attach.exp @@ -336,7 +336,7 @@ proc do_call_attach_tests {} { # Attach - gdb_test "file $binfile2" "" "force switch to gdb64, if necessary" + gdb_test "file $binfile2" ".*" "force switch to gdb64, if necessary" set test "attach call" gdb_test_multiple "attach $testpid" "$test" { -re "warning: reading register.*I.*O error.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.base/bitfields2.exp b/gdb/testsuite/gdb.base/bitfields2.exp index c854de8..b27f25f 100644 --- a/gdb/testsuite/gdb.base/bitfields2.exp +++ b/gdb/testsuite/gdb.base/bitfields2.exp @@ -57,7 +57,7 @@ proc continue_test { function tag } { # proc start_test { function } { delete_breakpoints - if [gdb_test "break tester" "" "break tester prior to $function"] { + if [gdb_test "break tester" ".*" "break tester prior to $function"] { gdb_suppress_tests } continue_test "tester" "prior to $function" diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp index cbcb9f4..0813782 100644 --- a/gdb/testsuite/gdb.base/call-signal-resume.exp +++ b/gdb/testsuite/gdb.base/call-signal-resume.exp @@ -101,7 +101,7 @@ if { "$frame_number" == "" } { } # Pop the dummy frame. -gdb_test "frame $frame_number" "" +gdb_test "frame $frame_number" ".*" gdb_test_no_output "set confirm off" gdb_test_no_output "return" @@ -134,7 +134,7 @@ if { "$frame_number" == "" } { } # Pop the dummy frame. -gdb_test "frame $frame_number" "" +gdb_test "frame $frame_number" ".*" gdb_test_no_output "set confirm off" gdb_test_no_output "return" diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp index 40bbb6a..02e7acb 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -470,10 +470,10 @@ if {![target_info exists gdb,nosignals] && ![istarget "*-*-uclinux*"]} { gdb_test {set $old_sp = $sp} gdb_test {set $sp = 0} - gdb_test "call doubleit (1)" "" "sp == 0: call doubleit (1)" + gdb_test "call doubleit (1)" ".*" "sp == 0: call doubleit (1)" gdb_test {set $sp = -1} - gdb_test "call doubleit (1)" "" "sp == -1: call doubleit (1)" + gdb_test "call doubleit (1)" ".*" "sp == -1: call doubleit (1)" gdb_test {set $sp = $old_sp} } diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index a9ba92e..7151206 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -71,7 +71,7 @@ proc progvar_simple_if_test {} { if { ![runto factorial] } then { gdb_suppress_tests; } # Don't depend upon argument passing, since most simulators don't # currently support it. Bash value variable to be what we want. - gdb_test "p value=5" "" "set value to 5 in progvar_simple_if_test #1" + gdb_test "p value=5" ".*" "set value to 5 in progvar_simple_if_test #1" # All this test should do is print 0xdeadbeef once. gdb_test "if value == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \ "\\\$\[0-9\]* = 0xdeadbeef" \ @@ -95,7 +95,7 @@ proc progvar_simple_while_test {} { if { ![runto factorial] } then { gdb_suppress_tests } # Don't depend upon argument passing, since most simulators don't # currently support it. Bash value variable to be what we want. - gdb_test "p value=5" "" "set value to 5 in progvar_simple_if_test #2" + gdb_test "p value=5" ".*" "set value to 5 in progvar_simple_if_test #2" # This test should print 0xfeedface five times. 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" \ @@ -116,7 +116,7 @@ proc progvar_complex_if_while_test {} { if { ![runto factorial] } then { gdb_suppress_tests } # Don't depend upon argument passing, since most simulators don't # currently support it. Bash value variable to be what we want. - gdb_test "p value=4" "" "set value to 4 in progvar_simple_if_test" + gdb_test "p value=4" ".*" "set value to 4 in progvar_simple_if_test" # This test should alternate between 0xdeadbeef and 0xfeedface two times. 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" \ @@ -135,7 +135,7 @@ proc if_while_breakpoint_command_test {} { if { ![runto factorial] } then { gdb_suppress_tests } # Don't depend upon argument passing, since most simulators don't # currently support it. Bash value variable to be what we want. - gdb_test "p value=5" "" "set value to 5 in progvar_simple_if_test" + gdb_test "p value=5" ".*" "set value to 5 in progvar_simple_if_test" delete_breakpoints gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #1" @@ -176,7 +176,7 @@ proc infrun_breakpoint_command_test {} { if { ![runto factorial] } then { gdb_suppress_tests } # Don't depend upon argument passing, since most simulators don't # currently support it. Bash value variable to be what we want. - gdb_test "p value=6" "" "set value to 6 in progvar_simple_if_test #1" + gdb_test "p value=6" ".*" "set value to 6 in progvar_simple_if_test #1" delete_breakpoints gdb_test "break factorial if value == 5" "Breakpoint.*at.*" @@ -210,7 +210,7 @@ proc breakpoint_command_test {} { if { ![runto factorial] } then { gdb_suppress_tests; } # Don't depend upon argument passing, since most simulators don't # currently support it. Bash value variable to be what we want. - gdb_test "p value=6" "" "set value to 6 in progvar_simple_if_test #2" + gdb_test "p value=6" ".*" "set value to 6 in progvar_simple_if_test #2" delete_breakpoints gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #2" gdb_test "commands\nprintf \"Now the value is %d\\n\", value\nend" \ @@ -326,7 +326,7 @@ proc test_command_prompt_position {} { # currently support it. Bash value variable to be what we want. delete_breakpoints gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #3" - gdb_test "p value=5" "" "set value to 5 in test_command_prompt_position" + gdb_test "p value=5" ".*" "set value to 5 in test_command_prompt_position" # All this test should do is print 0xdeadbeef once. gdb_test "if value == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \ "\\\$\[0-9\]* = 0xdeadbeef" \ diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index b587093..3e0fa40 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -305,13 +305,13 @@ proc test_whereis { } { #test_func # proc test_func { } { - gdb_test "cont" "" "cont 1" - gdb_test "step" "" + gdb_test "cont" ".*" "cont 1" + gdb_test "step" ".*" # This always fails, but it's not clear why. -sts 1999-08-17 setup_xfail "*-*-*" gdb_test "func sum" "'sum' not within current stack frame\." gdb_test "stop in sum" "Breakpoint.*at.*: file.*sum\.c, line 11\." - gdb_test "cont" "" "cont 2" + gdb_test "cont" ".*" "cont 2" # This always fails, but it's not clear why. -sts 1999-08-17 setup_xfail "*-*-*" gdb_test "func print_average" ".*in print_average.*\\(list=.*, low=0, high=6\\).*at.*average\.c:24\r\n24\[ \t\]+total = sum\\(list, low, high\\);" diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index a9a0701..283745a 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -123,7 +123,7 @@ gdb_test "delete display" \ #test detach -gdb_test "detach" "" "detach" +gdb_test "detach" ".*" "detach" if [istarget "h8300-*-hms"] then { gdb_exit @@ -474,9 +474,9 @@ gdb_test "set ch" "\"set check\" must be followed by the name of a check subcomm #test set check gdb_test "set check" "\"set check\" must be followed by the name of a check subcommand.(\[^\r\n\]*\[\r\n\])+List of set check subcommands:(\[^\r\n\]*\[\r\n\])+set check range -- Set range checking(\[^\r\n\]*\[\r\n\])+set check type -- Set type checking(\[^\r\n\]*\[\r\n\])+Type \"help set check\" followed by set check subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set check" #test set check range -gdb_test "set check range" "" "set check range" +gdb_test "set check range" ".*" "set check range" #test set check type -gdb_test "set check type" "" "set check type" +gdb_test "set check type" ".*" "set check type" #test set complaints gdb_test "set complaints" "Argument required .integer to set it to.*" "set complaints" #test set confirm @@ -562,7 +562,7 @@ gdb_test "show check range" "Range checking is \"auto; currently off\"." "show c #test show check type gdb_test "show check type" "Type checking is \"auto; currently off\"." "show check type" #test show commands -gdb_test "show commands" "" "show commands" +gdb_test "show commands" ".*" "show commands" #test show complaints gdb_test "show complaints" "Max number of complaints about incorrect symbols is 0." "show complaints" #test show confirm @@ -594,7 +594,7 @@ gdb_test "show p" ".*" "show p" #test show print "pr" abbreviation gdb_test "show pr" ".*" "show pr" #test show print -gdb_test "show print" "" "show print" +gdb_test "show print" ".*" "show print" #test show paths gdb_test "show paths" "Executable and object file path:.*" "show paths" #test show print address @@ -654,7 +654,7 @@ gdb_test "s" "The program is not being run." "step \"s\" abbreviation #2" #test step gdb_test "step" "The program is not being run." "step #2" #test symbol-file -gdb_test "symbol-file" "" "symbol-file" +gdb_test "symbol-file" ".*" "symbol-file" #test target child gdb_test "target child" "Use the \"run\" command to start a Unix child process.*|Undefined target command: \"child\". *Try \"help target\".*" "target child" diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp index eb048b8..1f307f4 100644 --- a/gdb/testsuite/gdb.base/dump.exp +++ b/gdb/testsuite/gdb.base/dump.exp @@ -331,7 +331,7 @@ if ![string compare $is64bitonly "no"] then { test_restore_saved_value "intstr2.srec" "struct as memory, srec" \ $struct_val "intstruct" - gdb_test "print zero_all ()" "" + gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr1.ihex" "array as value, ihex" \ $array_val "intarray" @@ -339,7 +339,7 @@ if ![string compare $is64bitonly "no"] then { test_restore_saved_value "intstr1.ihex" "struct as value, ihex" \ $struct_val "intstruct" - gdb_test "print zero_all ()" "" + gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr2.ihex" "array as memory, ihex" \ $array_val "intarray" @@ -347,7 +347,7 @@ if ![string compare $is64bitonly "no"] then { test_restore_saved_value "intstr2.ihex" "struct as memory, ihex" \ $struct_val "intstruct" - gdb_test "print zero_all ()" "" + gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr1.tekhex" "array as value, tekhex" \ $array_val "intarray" @@ -355,7 +355,7 @@ if ![string compare $is64bitonly "no"] then { test_restore_saved_value "intstr1.tekhex" "struct as value, tekhex" \ $struct_val "intstruct" - gdb_test "print zero_all ()" "" + gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr2.tekhex" "array as memory, tekhex" \ $array_val "intarray" @@ -364,7 +364,7 @@ if ![string compare $is64bitonly "no"] then { $struct_val "intstruct" } -gdb_test "print zero_all ()" "" +gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr1.bin binary $array_start" \ "array as value, binary" \ @@ -374,7 +374,7 @@ test_restore_saved_value "intstr1.bin binary $struct_start" \ "struct as value, binary" \ $struct_val "intstruct" -gdb_test "print zero_all ()" "" +gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr2.bin binary $array_start" \ "array as memory, binary" \ @@ -393,7 +393,7 @@ set array2_offset \ set struct2_offset \ [capture_value "(char *) &intstruct2 - (char *) &intstruct"] -gdb_test "print zero_all ()" "" +gdb_test "print zero_all ()" ".*" if ![string compare $is64bitonly "no"] then { @@ -405,7 +405,7 @@ if ![string compare $is64bitonly "no"] then { "struct copy, srec" \ $struct_val "intstruct2" - gdb_test "print zero_all ()" "" + gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr1.ihex $array2_offset" \ "array copy, ihex" \ @@ -415,7 +415,7 @@ if ![string compare $is64bitonly "no"] then { "struct copy, ihex" \ $struct_val "intstruct2" - gdb_test "print zero_all ()" "" + gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr1.tekhex $array2_offset" \ "array copy, tekhex" \ @@ -426,7 +426,7 @@ if ![string compare $is64bitonly "no"] then { $struct_val "intstruct2" } -gdb_test "print zero_all ()" "" +gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr1.bin binary $array2_start" \ "array copy, binary" \ @@ -453,7 +453,7 @@ set element4_offset \ [capture_value "/x (char *) &intarray\[4\] - (char *) &intarray\[0\]"] if ![string compare $is64bitonly "no"] then { - gdb_test "print zero_all ()" "" + gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr1.srec 0 $element3_start $element4_start" \ "array partial, srec" 4 "intarray\[3\]" @@ -461,7 +461,7 @@ if ![string compare $is64bitonly "no"] then { gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 1" gdb_test "print intarray\[4\] == 0" " = 1" "element 4 not changed - 1" - gdb_test "print zero_all ()" "" + gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr1.ihex 0 $element3_start $element4_start" \ "array partial, ihex" 4 "intarray\[3\]" @@ -469,7 +469,7 @@ if ![string compare $is64bitonly "no"] then { gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 2" gdb_test "print intarray\[4\] == 0" " = 1" "element 4 not changed - 2" - gdb_test "print zero_all ()" "" + gdb_test "print zero_all ()" ".*" test_restore_saved_value "intarr1.tekhex 0 $element3_start $element4_start" \ "array partial, tekhex" 4 "intarray\[3\]" @@ -478,7 +478,7 @@ if ![string compare $is64bitonly "no"] then { gdb_test "print intarray\[4\] == 0" " = 1" "element 4 not changed - 3" } -gdb_test "print zero_all ()" "" +gdb_test "print zero_all ()" ".*" test_restore_saved_value \ "intarr1.bin binary $array_start $element3_offset $element4_offset" \ diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp index a872d13..e84bf31 100644 --- a/gdb/testsuite/gdb.base/exprs.exp +++ b/gdb/testsuite/gdb.base/exprs.exp @@ -56,7 +56,7 @@ proc test_expr { args } { } set last_ent [expr [llength $args] - 1]; set testname [lindex $args $last_ent]; - if [gdb_test [lindex $args 0] "" "$testname (setup)"] { + if [gdb_test [lindex $args 0] ".*" "$testname (setup)"] { gdb_suppress_tests; } for {set x 1} {$x < $last_ent} {set x [expr $x + 2]} { @@ -249,7 +249,7 @@ test_expr "print \"x\" \"y\" \"z\"" "\\$\[0-9\]* = \"xyz\"" # Enum formatting tests. test_expr "print red" "\\$\[0-9\]* = red" -gdb_test "set output-radix 8" "" +gdb_test "set output-radix 8" ".*" test_expr "print red" "\\$\[0-9\]* = red" test_expr "print/d red" "\\$\[0-9\]* = 0" -gdb_test "set output-radix 10" "" +gdb_test "set output-radix 10" ".*" diff --git a/gdb/testsuite/gdb.base/freebpcmd.exp b/gdb/testsuite/gdb.base/freebpcmd.exp index cbc31be..4999697 100644 --- a/gdb/testsuite/gdb.base/freebpcmd.exp +++ b/gdb/testsuite/gdb.base/freebpcmd.exp @@ -58,7 +58,8 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "break ${srcfile}:[gdb_get_line_number "euphonium"]" "" "set breakpoint" +gdb_test "break ${srcfile}:[gdb_get_line_number "euphonium"]" ".*" \ + "set breakpoint" # The goal of all this is to make sure that there's plenty of memory # churn, and different amounts of it each time the inferior stops; diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp index 5ae911c..1f2d533 100644 --- a/gdb/testsuite/gdb.base/interrupt.exp +++ b/gdb/testsuite/gdb.base/interrupt.exp @@ -53,7 +53,7 @@ if ![file exists $binfile] then { gdb_reinitialize_dir $srcdir/$subdir gdb_load $binfile # Hope this is unix :-) - gdb_test "shell stty intr '^C'" "" \ + gdb_test "shell stty intr '^C'" ".*" \ "set interrupt character in interrupt.exp" if [runto_main] then { send_gdb "continue\n" diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp index 91633cc..e0e35b3 100644 --- a/gdb/testsuite/gdb.base/list.exp +++ b/gdb/testsuite/gdb.base/list.exp @@ -63,7 +63,7 @@ proc set_listsize { arg } { global set_listsize_count; incr set_listsize_count; - if [gdb_test "set listsize $arg" "" "setting listsize to $arg #$set_listsize_count"] { + if [gdb_test "set listsize $arg" ".*" "setting listsize to $arg #$set_listsize_count"] { return 0; } if { $arg <= 0 } { diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp index 9112b65..4ab428f 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -154,7 +154,7 @@ gdb_test "p/d val.dec" "-6101065172474983726" "decimal print p/d" # gdb_test "p/d val.oct" "-6399925985474168457" gdb_test "p/u val.oct" "12046818088235383159" -gdb_test "p/o val.oct" "" +gdb_test "p/o val.oct" ".*" gdb_test "p/t val.oct" "1010011100101110111001010011100101110111000001010011100101110111" gdb_test_ptr "p/a val.oct" "" "" "0x77053977" "0xa72ee53977053977" gdb_test "p/c val.oct" "'w'" @@ -230,7 +230,7 @@ gdb_test_long_long "p/c *(long long *)ll" "" "" "" "-17 '.*'" # Implict Word size (except for a, c, and f) -gdb_test "x/w w" "" "set examine size to w" +gdb_test "x/w w" ".*" "set examine size to w" gdb_test "x/x w" "0x01234567" gdb_test "x/d w" "19088743" gdb_test "x/u w" "19088743" @@ -246,7 +246,7 @@ if { $sizeof_double == 8 || $sizeof_long_double == 8 } { # Implict Giant size (except for a, c, and f) -gdb_test "x/g g" "" "set examine size to g" +gdb_test "x/g g" ".*" "set examine size to g" gdb_test "x/2x g" "0x0123456789abcdef.*0xa72ee53977053977" gdb_test "x/2d g" "81985529216486895.*-6399925985474168457" gdb_test "x/2u g" "81985529216486895.*12046818088235383159" diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index f48647d..40e9e8d 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -226,7 +226,7 @@ gdb_expect { -re ".*$gdb_prompt $" { fail "maint print psymbols" } timeout { fail "(timeout) maint print psymbols" } } - gdb_test "shell rm -f psymbols_output" "" + gdb_test "shell rm -f psymbols_output" ".*" } -re ".*$gdb_prompt $" { fail "maint print psymbols" } timeout { fail "(timeout) maint print psymbols" } @@ -255,7 +255,7 @@ gdb_expect { -re ".*$gdb_prompt $" { fail "maint print msymbols" } timeout { fail "(timeout) maint print msymbols" } } - gdb_test "shell rm -f msymbols_output" "" + gdb_test "shell rm -f msymbols_output" ".*" } -re ".*$gdb_prompt $" { fail "maint print msymbols" } timeout { fail "(timeout) maint print msymbols" } @@ -286,7 +286,7 @@ gdb_test_multiple "maint print msymbols msymbols_output2 ${subdir}/${testfile}" fail "(timeout) maint print msymbols" } } - gdb_test "shell rm -f msymbols_output2" "" + gdb_test "shell rm -f msymbols_output2" ".*" } -re ".*$gdb_prompt $" { fail "maint print msymbols" @@ -331,7 +331,7 @@ gdb_expect { -re ".*$gdb_prompt $" { fail "maint print symbols" } timeout { fail "(timeout) maint print symbols" } } - gdb_test "shell rm -f symbols_output" "" + gdb_test "shell rm -f symbols_output" ".*" } -re ".*$gdb_prompt $" { fail "maint print symbols" } timeout { fail "(timeout) maint print symbols" } diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp index 05ab9c9..7a8afc9 100644 --- a/gdb/testsuite/gdb.base/ptype.exp +++ b/gdb/testsuite/gdb.base/ptype.exp @@ -137,7 +137,7 @@ if {!$gcc_compiled && !$hp_aCC_compiler} { } # For get_debug_format to do its job, we need to have a current source file. -gdb_test "list main" "" +gdb_test "list main" ".*" get_debug_format gdb_test "whatis v_boolean" "type = (enum |)boolean" \ "whatis unnamed typedef'd enum (compiler bug in IBM's xlc)" @@ -604,13 +604,13 @@ ptype_maybe_prototyped "fffptr" "int (*(*(*)(char))(short int))(long int)" \ # Test printing type of typedefs in different scopes, with same name # but different type. -gdb_test "list intfoo" "" +gdb_test "list intfoo" ".*" gdb_test "ptype foo" "type = int" "ptype foo typedef after first list of intfoo" -gdb_test "list charfoo" "" +gdb_test "list charfoo" ".*" gdb_test "ptype foo" "type = char" "ptype foo typedef after first list of charfoo" -gdb_test "list intfoo" "" +gdb_test "list intfoo" ".*" gdb_test "ptype foo" "type = int" "ptype foo typedef after second list of intfoo" -gdb_test "list charfoo" "" +gdb_test "list charfoo" ".*" gdb_test "ptype foo" "type = char" "ptype foo typedef after second list of charfoo" # Test printing type of string constants and array constants, but diff --git a/gdb/testsuite/gdb.base/return.exp b/gdb/testsuite/gdb.base/return.exp index f1b9fd7..dcd66f8 100644 --- a/gdb/testsuite/gdb.base/return.exp +++ b/gdb/testsuite/gdb.base/return.exp @@ -41,8 +41,8 @@ proc return_tests { } { } # Set breakpoints in other interesting functions. - gdb_test "break func2" "" "break func2" - gdb_test "break func3" "" "break func3" + gdb_test "break func2" ".*" "break func2" + gdb_test "break func3" ".*" "break func3" gdb_test "continue" "return -5;" "continue to return of -5" diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp index deddcd2..6b0f844 100644 --- a/gdb/testsuite/gdb.base/setshow.exp +++ b/gdb/testsuite/gdb.base/setshow.exp @@ -97,7 +97,7 @@ if { ![target_info exists use_gdb_stub] && ![target_info exists noargs] } { gdb_test "run" "Starting program:.*foo bar blup baz bubble.*" "passing args" } #test set check range on -gdb_test "set check range on" "" "set check range on" +gdb_test "set check range on" ".*" "set check range on" #test show check range on gdb_test "show check range" "Range checking is \"on\"\..*" "show check range (on)" #test set check range off with trailing space @@ -109,7 +109,7 @@ gdb_test_no_output "set check range auto" "set check range auto" #test show check range auto gdb_test "show check range" "Range checking is \"auto; currently .*" "show check range (auto)" #test set check type on -gdb_test "set check type on" "" "set check type on" +gdb_test "set check type on" ".*" "set check type on" #test show check type on gdb_test "show check type" "Type checking is \"on\"..*" "show check type (on)" #test set check type off with trailing space diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp index 99656d8..e5e95ff 100644 --- a/gdb/testsuite/gdb.base/sigbpt.exp +++ b/gdb/testsuite/gdb.base/sigbpt.exp @@ -153,9 +153,9 @@ proc stepi_out { name args } { # inferior. Stops a SIGSEGV infinite loop when a broke system # keeps re-executing the faulting instruction. rerun_to_main - gdb_test "handle ${signame} nostop print pass" "" "${name}; pass ${signame}" + gdb_test "handle ${signame} nostop print pass" ".*" "${name}; pass ${signame}" gdb_test "continue" "keeper.*" "${name}; continue to keeper" - gdb_test "handle ${signame} stop print nopass" "" "${name}; nopass ${signame}" + gdb_test "handle ${signame} stop print nopass" ".*" "${name}; nopass ${signame}" # Insert all the breakpoints. To avoid the need to step over # these instructions, this is delayed until after the keeper has @@ -223,9 +223,9 @@ proc cont_out { name args } { # inferior. Stops a SIGSEGV infinite loop when a broke system # keeps re-executing the faulting instruction. rerun_to_main - gdb_test "handle ${signame} nostop print pass" "" "${name}; pass ${signame}" + gdb_test "handle ${signame} nostop print pass" ".*" "${name}; pass ${signame}" gdb_test "continue" "keeper.*" "${name}; continue to keeper" - gdb_test "handle ${signame} stop print nopass" "" "${name}; nopass ${signame}" + gdb_test "handle ${signame} stop print nopass" ".*" "${name}; nopass ${signame}" # Insert all the breakpoints. To avoid the need to step over # these instructions, this is delayed until after the keeper has diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp index 7cfbddb..ee67887 100644 --- a/gdb/testsuite/gdb.base/sigrepeat.exp +++ b/gdb/testsuite/gdb.base/sigrepeat.exp @@ -50,7 +50,7 @@ if { ![runto_main] } then { # Run to the signal handler wait loop. set infinite_loop [gdb_get_line_number {infinite loop}] -gdb_test "advance $infinite_loop" "" "advance to infinite loop" +gdb_test "advance $infinite_loop" ".*" "advance to infinite loop" # Make the first of many signals come pending sleep 1 |