This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA] testsuite, more wild card expressions
- From: Michael Snyder <msnyder at vmware dot com>
- To: "gdb-patches at sourceware dot org" <gdb-patches at sourceware dot org>
- Date: Tue, 08 Jun 2010 17:00:56 -0700
- Subject: [RFA] testsuite, more wild card expressions
Long...
2010-06-08 Michael Snyder <msnyder@vmware.com>
* gdb.ada/assign_1.exp: Use ".*" instead of "" as wildcard regexp.
* gdb.ada/boolean_expr.exp:
* gdb.ada/frame_args.exp: Ditto.
* gdb.ada/lang_switch.exp: Ditto.
* gdb.ada/ptype_arith_binop.exp: Ditto.
* gdb.ada/ref_param.exp: Ditto.
* gdb.ada/type_coercion.exp:Ditto.
* gdb.asm/asm-source.exp: Ditto.
* gdb.base/attach.exp: Ditto.
* gdb.base/bitfields2.exp: Ditto.
* gdb.base/call-signal-resume.exp: Ditto.
* gdb.base/callfuncs.exp: Ditto.
* gdb.base/commands.exp: Ditto.
* gdb.base/dbx.exp: Ditto.
* gdb.base/default.exp: Ditto.
* gdb.base/dump.exp: Ditto.
* gdb.base/exprs.exp: Ditto.
* gdb.base/freebpcmd.exp: Ditto.
* gdb.base/interrupt.exp: Ditto.
* gdb.base/list.exp: Ditto.
* gdb.base/long_long.exp: Ditto.
* gdb.base/maint.exp: Ditto.
* gdb.base/ptype.exp: Ditto.
* gdb.base/return.exp: Ditto.
* gdb.base/setshow.exp: Ditto.
* gdb.base/sigbpt.exp: Ditto.
* gdb.base/sigrepeat.exp: Ditto.
* gdb.cp/classes.exp: Ditto.
* gdb.dwarf2/dw2-restore.exp: Ditto.
* gdb.gdb/selftest.exp: Ditto.
* gdb.multi/base.exp: Ditto.
* gdb.multi/bkpt-multi-exec.exp: Ditto.
* gdb.python/py-block.exp: Ditto.
* gdb.python/py-prettyprint.exp: Ditto.
* gdb.python/py-template.exp: Ditto.
* gdb.server/ext-attach.exp: Ditto.
* gdb.server/ext-run.exp: Ditto.
* gdb.server/server-mon.exp: Ditto.
* gdb.threads/fork-thread-pending.exp: Ditto.
* gdb.threads/hand-call-in-threads.exp: Ditto.
* gdb.threads/interrupted-hand-call.exp: Ditto.
* gdb.threads/linux-dp.exp: Ditto.
* gdb.threads/manythreads.exp: Ditto.
* gdb.threads/print-threads.exp: Ditto.
* gdb.threads/pthreads.exp: Ditto.
* gdb.threads/schedlock.exp: Ditto.
* gdb.threads/thread-unwindonsignal.exp: Ditto.
* gdb.threads/threadapply.exp: Ditto.
Index: gdb.ada/assign_1.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.ada/assign_1.exp,v
retrieving revision 1.4
diff -u -p -r1.4 assign_1.exp
--- gdb.ada/assign_1.exp 1 Jan 2010 07:31:51 -0000 1.4
+++ gdb.ada/assign_1.exp 8 Jun 2010 23:45:47 -0000
@@ -25,8 +25,7 @@ gdb_reinitialize_dir $srcdir/$subdir
# Force the language to Ada, as this will not happen automatically
# in this case (no test program).
-gdb_test "set lang ada" \
- "" \
+gdb_test_no_output "set lang ada" \
"Changing the language to ada"
gdb_test "print \$xxx := 1" \
Index: gdb.ada/boolean_expr.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.ada/boolean_expr.exp,v
retrieving revision 1.5
diff -u -p -r1.5 boolean_expr.exp
--- gdb.ada/boolean_expr.exp 1 Jan 2010 07:31:51 -0000 1.5
+++ gdb.ada/boolean_expr.exp 8 Jun 2010 23:45:48 -0000
@@ -28,8 +28,7 @@ set any_addr "0x\[0-9a-zA-Z\]+"
# Force the language to Ada, as this will not happen automatically
# in this case (no test program).
-gdb_test "set lang ada" \
- "" \
+gdb_test_no_output "set lang ada" \
"Changing the language to ada"
gdb_test "print 1 = 2" \
Index: gdb.ada/frame_args.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.ada/frame_args.exp,v
retrieving revision 1.4
diff -u -p -r1.4 frame_args.exp
--- gdb.ada/frame_args.exp 1 Jan 2010 07:31:51 -0000 1.4
+++ gdb.ada/frame_args.exp 8 Jun 2010 23:45:48 -0000
@@ -46,8 +46,7 @@ if ![runto break_me] then {
# First, print all the arrays without indexes
-gdb_test "set print frame-arguments scalars" \
- "" \
+gdb_test_no_output "set print frame-arguments scalars" \
"set print frame-arguments scalars"
gdb_test "frame 1" \
Index: gdb.ada/lang_switch.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.ada/lang_switch.exp,v
retrieving revision 1.4
diff -u -p -r1.4 lang_switch.exp
--- gdb.ada/lang_switch.exp 1 Jan 2010 07:31:51 -0000 1.4
+++ gdb.ada/lang_switch.exp 8 Jun 2010 23:45:48 -0000
@@ -41,7 +41,7 @@ gdb_load ${binfile}
set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.c]
runto "foo.c:$bp_location"
-gdb_test "set print frame-arguments all" ""
+gdb_test_no_output "set print frame-arguments all"
# Make sure that the language is switched to Ada for the second frame
# by checking the string parameter.
Index: gdb.ada/ptype_arith_binop.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.ada/ptype_arith_binop.exp,v
retrieving revision 1.3
diff -u -p -r1.3 ptype_arith_binop.exp
--- gdb.ada/ptype_arith_binop.exp 1 Jan 2010 07:31:51 -0000 1.3
+++ gdb.ada/ptype_arith_binop.exp 8 Jun 2010 23:45:48 -0000
@@ -21,8 +21,7 @@ gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
-gdb_test "set lang ada" \
- "" \
+gdb_test_no_output "set lang ada" \
"set lang ada"
gdb_test "ptype 3 * 2.0" \
Index: gdb.ada/ref_param.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.ada/ref_param.exp,v
retrieving revision 1.4
diff -u -p -r1.4 ref_param.exp
--- gdb.ada/ref_param.exp 1 Jan 2010 07:31:51 -0000 1.4
+++ gdb.ada/ref_param.exp 8 Jun 2010 23:45:48 -0000
@@ -39,7 +39,7 @@ if ![runto call_me] then {
return
}
-gdb_test "set print frame-arguments all" ""
+gdb_test_no_output "set print frame-arguments all"
set expected_d "\\(one => 1, two => 2, three => 3, four => 4, five => 5, six => 6\\)"
gdb_test "frame" \
Index: gdb.ada/type_coercion.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.ada/type_coercion.exp,v
retrieving revision 1.4
diff -u -p -r1.4 type_coercion.exp
--- gdb.ada/type_coercion.exp 1 Jan 2010 07:31:51 -0000 1.4
+++ gdb.ada/type_coercion.exp 8 Jun 2010 23:45:48 -0000
@@ -41,8 +41,7 @@ gdb_test "p q" \
"= \\(2, 3, 5, 7, 11\\)" \
"p q"
-gdb_test "set \$addr := q'address" \
- "" \
+gdb_test_no_output "set \$addr := q'address" \
"save q'address in convenience variable"
gdb_test "p {Integer} \$addr" \
@@ -51,8 +50,7 @@ gdb_test "p {Integer} \$addr" \
# Now change the value at $addr using the same "{TYPE}" syntax.
-gdb_test "set {Integer} \$addr := 19" \
- "" \
+gdb_test_no_output "set {Integer} \$addr := 19" \
"set {Integer} \$addr := 19"
gdb_test "p q" \
Index: gdb.asm/asm-source.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.asm/asm-source.exp,v
retrieving revision 1.79
diff -u -p -r1.79 asm-source.exp
--- gdb.asm/asm-source.exp 26 May 2010 18:05:25 -0000 1.79
+++ gdb.asm/asm-source.exp 8 Jun 2010 23:45:48 -0000
@@ -348,10 +348,10 @@ gdb_test "bt 10" \
gdb_test "bt 2" "\#0.*foo2.*asmsrc2\[.\]s:$line_call_foo3.*\#1.*main.*asmsrc1\[.\]s:$line_call_foo2.*" "bt 2 in foo2"
# Step into another subroutine which lives back in the first source file.
-gdb_test "s" "" "s 2"
+gdb_test "s" ".*" "s 2"
# Next over insns to set up the stack frame.
-gdb_test "n" "" "n 2"
+gdb_test "n" ".*" "n 2"
# Now see if a capped `bt' is correct.
gdb_test "bt 3" "\#0.*foo3.*asmsrc1\[.\]s:$line_foo3.*\#1.*foo2.*asmsrc2\[.\]s:$line_call_foo3.*\#2.*main.*asmsrc1\[.\]s:$line_call_foo2.*" "bt 3 in foo3"
Index: gdb.base/attach.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/attach.exp,v
retrieving revision 1.32
diff -u -p -r1.32 attach.exp
--- gdb.base/attach.exp 4 Jun 2010 23:09:15 -0000 1.32
+++ gdb.base/attach.exp 8 Jun 2010 23:45:48 -0000
@@ -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 $" {
Index: gdb.base/bitfields2.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/bitfields2.exp,v
retrieving revision 1.9
diff -u -p -r1.9 bitfields2.exp
--- gdb.base/bitfields2.exp 26 May 2010 18:05:25 -0000 1.9
+++ gdb.base/bitfields2.exp 8 Jun 2010 23:45:48 -0000
@@ -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"
Index: gdb.base/call-signal-resume.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/call-signal-resume.exp,v
retrieving revision 1.6
diff -u -p -r1.6 call-signal-resume.exp
--- gdb.base/call-signal-resume.exp 1 Jun 2010 21:29:21 -0000 1.6
+++ gdb.base/call-signal-resume.exp 8 Jun 2010 23:45:48 -0000
@@ -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"
Index: gdb.base/callfuncs.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/callfuncs.exp,v
retrieving revision 1.37
diff -u -p -r1.37 callfuncs.exp
--- gdb.base/callfuncs.exp 1 Jun 2010 21:29:21 -0000 1.37
+++ gdb.base/callfuncs.exp 8 Jun 2010 23:45:48 -0000
@@ -470,10 +470,10 @@ if {![target_info exists gdb,nosignals]
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}
}
Index: gdb.base/commands.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/commands.exp,v
retrieving revision 1.39
diff -u -p -r1.39 commands.exp
--- gdb.base/commands.exp 4 Jun 2010 14:26:49 -0000 1.39
+++ gdb.base/commands.exp 8 Jun 2010 23:45:48 -0000
@@ -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" \
Index: gdb.base/dbx.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/dbx.exp,v
retrieving revision 1.15
diff -u -p -r1.15 dbx.exp
--- gdb.base/dbx.exp 1 Jan 2010 07:32:00 -0000 1.15
+++ gdb.base/dbx.exp 8 Jun 2010 23:45:48 -0000
@@ -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\\);"
Index: gdb.base/default.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/default.exp,v
retrieving revision 1.41
diff -u -p -r1.41 default.exp
--- gdb.base/default.exp 8 Jun 2010 22:58:03 -0000 1.41
+++ gdb.base/default.exp 8 Jun 2010 23:45:48 -0000
@@ -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
#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 check
#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 r
#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"
Index: gdb.base/dump.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/dump.exp,v
retrieving revision 1.22
diff -u -p -r1.22 dump.exp
--- gdb.base/dump.exp 8 Jun 2010 22:58:03 -0000 1.22
+++ gdb.base/dump.exp 8 Jun 2010 23:45:48 -0000
@@ -331,7 +331,7 @@ if ![string compare $is64bitonly "no"] t
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"] t
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"] t
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"] t
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"] t
$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 bi
"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"] t
"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"] t
"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"] t
$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"] t
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"] t
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"] t
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" \
Index: gdb.base/exprs.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/exprs.exp,v
retrieving revision 1.18
diff -u -p -r1.18 exprs.exp
--- gdb.base/exprs.exp 24 May 2010 22:06:59 -0000 1.18
+++ gdb.base/exprs.exp 8 Jun 2010 23:45:48 -0000
@@ -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\"" "\\$
# 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" ".*"
Index: gdb.base/freebpcmd.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/freebpcmd.exp,v
retrieving revision 1.12
diff -u -p -r1.12 freebpcmd.exp
--- gdb.base/freebpcmd.exp 5 May 2010 18:06:58 -0000 1.12
+++ gdb.base/freebpcmd.exp 8 Jun 2010 23:45:48 -0000
@@ -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;
Index: gdb.base/interrupt.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/interrupt.exp,v
retrieving revision 1.17
diff -u -p -r1.17 interrupt.exp
--- gdb.base/interrupt.exp 5 May 2010 18:06:58 -0000 1.17
+++ gdb.base/interrupt.exp 8 Jun 2010 23:45:48 -0000
@@ -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"
Index: gdb.base/list.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/list.exp,v
retrieving revision 1.22
diff -u -p -r1.22 list.exp
--- gdb.base/list.exp 1 Jun 2010 21:29:21 -0000 1.22
+++ gdb.base/list.exp 8 Jun 2010 23:45:48 -0000
@@ -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 } {
Index: gdb.base/long_long.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/long_long.exp,v
retrieving revision 1.32
diff -u -p -r1.32 long_long.exp
--- gdb.base/long_long.exp 25 May 2010 21:01:59 -0000 1.32
+++ gdb.base/long_long.exp 8 Jun 2010 23:45:48 -0000
@@ -154,7 +154,7 @@ gdb_test "p/d val.dec" "-610106517247498
#
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
# 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
# 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"
Index: gdb.base/maint.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/maint.exp,v
retrieving revision 1.46
diff -u -p -r1.46 maint.exp
--- gdb.base/maint.exp 1 Jun 2010 21:29:21 -0000 1.46
+++ gdb.base/maint.exp 8 Jun 2010 23:45:48 -0000
@@ -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
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" }
Index: gdb.base/ptype.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/ptype.exp,v
retrieving revision 1.22
diff -u -p -r1.22 ptype.exp
--- gdb.base/ptype.exp 25 May 2010 19:34:05 -0000 1.22
+++ gdb.base/ptype.exp 8 Jun 2010 23:45:48 -0000
@@ -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 (*(
# 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
Index: gdb.base/return.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/return.exp,v
retrieving revision 1.13
diff -u -p -r1.13 return.exp
--- gdb.base/return.exp 27 May 2010 23:44:51 -0000 1.13
+++ gdb.base/return.exp 8 Jun 2010 23:45:48 -0000
@@ -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"
Index: gdb.base/setshow.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/setshow.exp,v
retrieving revision 1.17
diff -u -p -r1.17 setshow.exp
--- gdb.base/setshow.exp 3 Jun 2010 23:54:17 -0000 1.17
+++ gdb.base/setshow.exp 8 Jun 2010 23:45:48 -0000
@@ -97,7 +97,7 @@ if { ![target_info exists use_gdb_stub]
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
#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
Index: gdb.base/sigbpt.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/sigbpt.exp,v
retrieving revision 1.20
diff -u -p -r1.20 sigbpt.exp
--- gdb.base/sigbpt.exp 27 May 2010 23:44:51 -0000 1.20
+++ gdb.base/sigbpt.exp 8 Jun 2010 23:45:48 -0000
@@ -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
Index: gdb.base/sigrepeat.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/sigrepeat.exp,v
retrieving revision 1.9
diff -u -p -r1.9 sigrepeat.exp
--- gdb.base/sigrepeat.exp 5 May 2010 18:06:58 -0000 1.9
+++ gdb.base/sigrepeat.exp 8 Jun 2010 23:45:48 -0000
@@ -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
Index: gdb.cp/classes.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/classes.exp,v
retrieving revision 1.28
diff -u -p -r1.28 classes.exp
--- gdb.cp/classes.exp 8 Jun 2010 22:58:03 -0000 1.28
+++ gdb.cp/classes.exp 8 Jun 2010 23:45:48 -0000
@@ -403,7 +403,7 @@ proc test_enums {} {
# advance one line
- gdb_test "next" ""
+ gdb_test "next" ".*"
# print the object again
Index: gdb.dwarf2/dw2-restore.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.dwarf2/dw2-restore.exp,v
retrieving revision 1.2
diff -u -p -r1.2 dw2-restore.exp
--- gdb.dwarf2/dw2-restore.exp 1 Jan 2010 07:32:02 -0000 1.2
+++ gdb.dwarf2/dw2-restore.exp 8 Jun 2010 23:45:48 -0000
@@ -33,5 +33,5 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_test "run" ""
+gdb_test "run" ".*"
gdb_test "where" ".*$hex in foo ().+$hex in _start ().*"
Index: gdb.gdb/selftest.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.gdb/selftest.exp,v
retrieving revision 1.21
diff -u -p -r1.21 selftest.exp
--- gdb.gdb/selftest.exp 2 Jun 2010 21:46:45 -0000 1.21
+++ gdb.gdb/selftest.exp 8 Jun 2010 23:45:48 -0000
@@ -292,7 +292,7 @@ proc test_with_self { executable } {
# On Ultrix, we don't need it and it is really slow (because shell_escape
# doesn't use vfork).
if ![istarget "*-*-ultrix*"] then {
- gdb_test "shell stty intr '^C'" "" \
+ gdb_test "shell stty intr '^C'" ".*" \
"set interrupt character in test_with_self"
}
Index: gdb.multi/base.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.multi/base.exp,v
retrieving revision 1.4
diff -u -p -r1.4 base.exp
--- gdb.multi/base.exp 2 Jun 2010 21:46:45 -0000 1.4
+++ gdb.multi/base.exp 8 Jun 2010 23:45:48 -0000
@@ -51,7 +51,7 @@ gdb_load ${binfile1}
# executable into it.
gdb_test "add-inferior" "Added inferior 2.*"
gdb_test "inferior 2" "Switching to inferior 2.*"
-gdb_test "file ${binfile2}" ""
+gdb_test "file ${binfile2}" ".*"
# Add a new inferior space and load a main executable into it in one
# command.
@@ -98,5 +98,5 @@ if { ![runto_main] } then {
return -1
}
-gdb_test "break hello" ""
+gdb_test "break hello" ".*"
gdb_test "continue" "Breakpoint \[0-9\].*, hello.*"
Index: gdb.multi/bkpt-multi-exec.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp,v
retrieving revision 1.2
diff -u -p -r1.2 bkpt-multi-exec.exp
--- gdb.multi/bkpt-multi-exec.exp 1 Jan 2010 07:32:04 -0000 1.2
+++ gdb.multi/bkpt-multi-exec.exp 8 Jun 2010 23:45:48 -0000
@@ -71,7 +71,7 @@ gdb_test "add-inferior -exec ${binfile2}
set bp_location [gdb_get_line_number "set breakpoint here" ${srcfile2}]
gdb_test "inferior 2"
-gdb_test "break ${srcfile2}:${bp_location}" ""
+gdb_test "break ${srcfile2}:${bp_location}" ".*"
# Start the program running, and stop at main.
#
Index: gdb.python/py-block.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-block.exp,v
retrieving revision 1.2
diff -u -p -r1.2 py-block.exp
--- gdb.python/py-block.exp 2 Jun 2010 21:50:55 -0000 1.2
+++ gdb.python/py-block.exp 8 Jun 2010 23:45:48 -0000
@@ -72,7 +72,7 @@ gdb_test_no_output "python block = block
gdb_test "python print block.function" "block_func"
# Switch frames, then test for main block.
-gdb_test "up" ""
+gdb_test "up" ".*"
gdb_py_test_silent_cmd "python frame = gdb.selected_frame()" "Get Frame" 0
gdb_py_test_silent_cmd "python block = frame.block()" "Get block" 0
gdb_test "python print block" "<gdb.Block object at $hex>" "Check block not None"
Index: gdb.python/py-prettyprint.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-prettyprint.exp,v
retrieving revision 1.10
diff -u -p -r1.10 py-prettyprint.exp
--- gdb.python/py-prettyprint.exp 4 Jun 2010 18:18:28 -0000 1.10
+++ gdb.python/py-prettyprint.exp 8 Jun 2010 23:45:48 -0000
@@ -133,17 +133,17 @@ gdb_test "continue" ".*Breakpoint.*"
set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}.py]
-gdb_test "python execfile ('${remote_python_file}')" ""
+gdb_test_no_output "python execfile ('${remote_python_file}')"
gdb_test "print ss" " = a=< a=<1> b=<$hex>> b=< a=<2> b=<$hex>>" \
"print ss enabled #1"
-gdb_test "python disable_lookup_function ()" ""
+gdb_test_no_output "python disable_lookup_function ()"
gdb_test "print ss" " = {a = {a = 1, b = $hex}, b = {a = 2, b = $hex}}" \
"print ss disabled"
-gdb_test "python enable_lookup_function ()" ""
+gdb_test_no_output "python enable_lookup_function ()"
gdb_test "print ss" " = a=< a=<1> b=<$hex>> b=< a=<2> b=<$hex>>" \
"print ss enabled #2"
Index: gdb.python/py-template.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-template.exp,v
retrieving revision 1.4
diff -u -p -r1.4 py-template.exp
--- gdb.python/py-template.exp 2 Jun 2010 21:50:55 -0000 1.4
+++ gdb.python/py-template.exp 8 Jun 2010 23:45:48 -0000
@@ -52,7 +52,7 @@ proc test_template_arg {type} {
return
}
# There is no executable code in main(), so we are where we want to be
- gdb_test "print foo" ""
+ gdb_test "print foo" ".*"
gdb_test_no_output "python foo = gdb.history(0)"
# Replace '*' with '\*' in regex.
Index: gdb.server/ext-attach.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/ext-attach.exp,v
retrieving revision 1.7
diff -u -p -r1.7 ext-attach.exp
--- gdb.server/ext-attach.exp 2 Jun 2010 21:50:56 -0000 1.7
+++ gdb.server/ext-attach.exp 8 Jun 2010 23:45:48 -0000
@@ -69,4 +69,4 @@ gdb_test "attach $testpid" "Attached to.
gdb_test "backtrace" ".*main.*" "backtrace 2"
gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
-gdb_test "monitor exit" ""
+gdb_test_no_output "monitor exit"
Index: gdb.server/ext-run.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/ext-run.exp,v
retrieving revision 1.9
diff -u -p -r1.9 ext-run.exp
--- gdb.server/ext-run.exp 2 Jun 2010 21:50:56 -0000 1.9
+++ gdb.server/ext-run.exp 8 Jun 2010 23:45:48 -0000
@@ -57,4 +57,4 @@ if { [istarget *-*-linux*] } {
}
gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
-gdb_test "monitor exit" ""
+gdb_test_no_output "monitor exit"
Index: gdb.server/server-mon.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/server-mon.exp,v
retrieving revision 1.7
diff -u -p -r1.7 server-mon.exp
--- gdb.server/server-mon.exp 1 Jan 2010 07:32:06 -0000 1.7
+++ gdb.server/server-mon.exp 8 Jun 2010 23:45:48 -0000
@@ -38,7 +38,7 @@ gdb_reinitialize_dir $srcdir/$subdir
gdbserver_run ""
-gdb_test_multiple "monitor help" "" {
+gdb_test_multiple "monitor help" "monitor help" {
-re "Unknown monitor command.*$gdb_prompt $" {
fail "monitor help"
}
Index: gdb.threads/fork-thread-pending.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/fork-thread-pending.exp,v
retrieving revision 1.3
diff -u -p -r1.3 fork-thread-pending.exp
--- gdb.threads/fork-thread-pending.exp 2 Jun 2010 21:53:28 -0000 1.3
+++ gdb.threads/fork-thread-pending.exp 8 Jun 2010 23:45:48 -0000
@@ -51,7 +51,7 @@ gdb_test "continue" "Catchpoint.*" "1, g
gdb_test "info threads" " Thread .* Thread .* Thread .* Thread .*" "1, multiple threads found"
-gdb_test "thread 2" "" "1, switched away from event thread"
+gdb_test "thread 2" ".*" "1, switched away from event thread"
gdb_test "continue" "Not resuming.*" "1, refused to resume"
Index: gdb.threads/hand-call-in-threads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/hand-call-in-threads.exp,v
retrieving revision 1.4
diff -u -p -r1.4 hand-call-in-threads.exp
--- gdb.threads/hand-call-in-threads.exp 2 Jun 2010 21:53:28 -0000 1.4
+++ gdb.threads/hand-call-in-threads.exp 8 Jun 2010 23:45:48 -0000
@@ -93,8 +93,10 @@ set total_nr_threads [expr $NR_THREADS +
# Thread numbering in gdb is origin-1, so begin numbering at 1.
for { set i 1 } { $i <= $total_nr_threads } { incr i } {
set thread_nr $i
- gdb_test "thread $thread_nr" "" "prepare to make hand call, thread $thread_nr"
- gdb_test "call hand_call()" "Breakpoint 3, .*" "hand call, thread $thread_nr"
+ gdb_test "thread $thread_nr" ".*" \
+ "prepare to make hand call, thread $thread_nr"
+ gdb_test "call hand_call()" "Breakpoint 3, .*" \
+ "hand call, thread $thread_nr"
}
# Now have each hand-called function return.
@@ -106,7 +108,8 @@ clear_xfail "*-*-*"
for { set i 1 } { $i <= $total_nr_threads } { incr i } {
set thread_nr $i
- gdb_test "thread $thread_nr" "" "prepare to discard hand call, thread $thread_nr"
+ gdb_test "thread $thread_nr" ".*" \
+ "prepare to discard hand call, thread $thread_nr"
set frame_number [get_dummy_frame_number]
if { "$frame_number" == "" } {
fail "dummy stack frame number, thread $thread_nr"
@@ -116,8 +119,8 @@ for { set i 1 } { $i <= $total_nr_thread
pass "dummy stack frame number, thread $thread_nr"
}
# Pop the dummy frame.
- gdb_test "frame $frame_number" "" "setting frame, thread $thread_nr"
- gdb_test "return" "" "discard hand call, thread $thread_nr"
+ gdb_test "frame $frame_number" ".*" "setting frame, thread $thread_nr"
+ gdb_test "return" ".*" "discard hand call, thread $thread_nr"
# In case getting the dummy frame number failed, re-enable for next iter.
clear_xfail "*-*-*"
}
@@ -149,7 +152,7 @@ gdb_test "show scheduler-locking" ".* lo
# all_threads_running breakpoint, which wasn't the last thread to run,
# and gdb doesn't know how to singlestep over reported breakpoints that
# weren't in the last thread to run.
-#gdb_test "thread 1" "" "set thread to 1, prepare to resume"
+#gdb_test "thread 1" ".*" "set thread to 1, prepare to resume"
#
#gdb_continue_to_end "hand-call-in-threads"
Index: gdb.threads/interrupted-hand-call.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/interrupted-hand-call.exp,v
retrieving revision 1.2
diff -u -p -r1.2 interrupted-hand-call.exp
--- gdb.threads/interrupted-hand-call.exp 1 Jan 2010 07:32:06 -0000 1.2
+++ gdb.threads/interrupted-hand-call.exp 8 Jun 2010 23:45:48 -0000
@@ -73,7 +73,7 @@ gdb_test "maint print dummy-frames" ".*s
# Continuing now should exit the hand-call and pop the dummy frame.
-gdb_test "continue" "" "finish hand-call"
+gdb_test "continue" ".*" "finish hand-call"
gdb_test_multiple "maint print dummy-frames" "dummy frame popped" {
-re ".*stack=.*$gdb_prompt $" {
Index: gdb.threads/linux-dp.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/linux-dp.exp,v
retrieving revision 1.25
diff -u -p -r1.25 linux-dp.exp
--- gdb.threads/linux-dp.exp 2 Jun 2010 19:58:21 -0000 1.25
+++ gdb.threads/linux-dp.exp 8 Jun 2010 23:45:48 -0000
@@ -58,7 +58,7 @@ gdb_test_no_output "set print sevenbit-s
runto_main
# There should be no threads initially.
-gdb_test "info threads" "" "info threads 1"
+gdb_test "info threads" ".*" "info threads 1"
# Try stepping over the thread creation function.
gdb_breakpoint [gdb_get_line_number "linuxthreads.exp: create philosopher"]
Index: gdb.threads/manythreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/manythreads.exp,v
retrieving revision 1.18
diff -u -p -r1.18 manythreads.exp
--- gdb.threads/manythreads.exp 2 Jun 2010 21:53:28 -0000 1.18
+++ gdb.threads/manythreads.exp 8 Jun 2010 23:45:48 -0000
@@ -41,7 +41,7 @@ runto_main
# On Ultrix, we don't need it and it is really slow (because shell_escape
# doesn't use vfork).
if ![istarget "*-*-ultrix*"] then {
- gdb_test "shell stty intr '^C'" ""
+ gdb_test "shell stty intr '^C'" ".*"
}
set message "first continue"
Index: gdb.threads/print-threads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/print-threads.exp,v
retrieving revision 1.16
diff -u -p -r1.16 print-threads.exp
--- gdb.threads/print-threads.exp 2 Jun 2010 21:53:28 -0000 1.16
+++ gdb.threads/print-threads.exp 8 Jun 2010 23:45:48 -0000
@@ -55,7 +55,7 @@ gdb_test_no_output "set width 0"
# On Ultrix, we don't need it and it is really slow (because shell_escape
# doesn't use vfork).
if ![istarget "*-*-ultrix*"] then {
- gdb_test "shell stty intr '^C'" ""
+ gdb_test "shell stty intr '^C'" ".*"
}
proc test_all_threads { name kill } {
Index: gdb.threads/pthreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/pthreads.exp,v
retrieving revision 1.21
diff -u -p -r1.21 pthreads.exp
--- gdb.threads/pthreads.exp 2 Jun 2010 21:53:28 -0000 1.21
+++ gdb.threads/pthreads.exp 8 Jun 2010 23:45:48 -0000
@@ -61,7 +61,7 @@ gdb_test_no_output "set width 0"
# On Ultrix, we don't need it and it is really slow (because shell_escape
# doesn't use vfork).
if ![istarget "*-*-ultrix*"] then {
- gdb_test "shell stty intr '^C'" ""
+ gdb_test "shell stty intr '^C'" ".*"
}
proc all_threads_running {} {
@@ -82,7 +82,7 @@ proc all_threads_running {} {
# been called 15 times. This should be plenty of time to allow
# every thread to run at least once, since each thread sleeps for
# one second between calls to common_routine.
- gdb_test "tbreak common_routine if hits >= 15" ""
+ gdb_test "tbreak common_routine if hits >= 15" ".*"
# Start all the threads running again and wait for the inferior
# to stop. Since no other breakpoints are set at this time
@@ -230,7 +230,7 @@ proc check_control_c {} {
return 1;
}
}
- gdb_test "bt" ""
+ gdb_test "bt" ".*"
# Verify that all threads can be run again after a ^C stop.
if [all_threads_running] then {
Index: gdb.threads/schedlock.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/schedlock.exp,v
retrieving revision 1.15
diff -u -p -r1.15 schedlock.exp
--- gdb.threads/schedlock.exp 2 Jun 2010 21:53:28 -0000 1.15
+++ gdb.threads/schedlock.exp 8 Jun 2010 23:45:48 -0000
@@ -140,7 +140,7 @@ gdb_reinitialize_dir $srcdir/$subdir
# On Ultrix, we don't need it and it is really slow (because shell_escape
# doesn't use vfork).
if ![istarget "*-*-ultrix*"] then {
- gdb_test "shell stty intr '^C'" ""
+ gdb_test "shell stty intr '^C'" ".*"
}
gdb_load ${binfile}
Index: gdb.threads/thread-unwindonsignal.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp,v
retrieving revision 1.3
diff -u -p -r1.3 thread-unwindonsignal.exp
--- gdb.threads/thread-unwindonsignal.exp 2 Jun 2010 21:53:28 -0000 1.3
+++ gdb.threads/thread-unwindonsignal.exp 8 Jun 2010 23:45:48 -0000
@@ -97,7 +97,7 @@ gdb_test_multiple "thread apply all bt"
# Continuing now should exit the hand-call and pop the dummy frame.
-gdb_test "continue" "" "finish hand-call"
+gdb_test "continue" ".*" "finish hand-call"
gdb_test_multiple "maint print dummy-frames" "dummy frame popped" {
-re ".*stack=.*$gdb_prompt $" {
Index: gdb.threads/threadapply.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/threadapply.exp,v
retrieving revision 1.10
diff -u -p -r1.10 threadapply.exp
--- gdb.threads/threadapply.exp 2 Jun 2010 21:53:28 -0000 1.10
+++ gdb.threads/threadapply.exp 8 Jun 2010 23:45:48 -0000
@@ -46,7 +46,7 @@ if ![runto_main] then {
# Break after all threads have been started.
set break_line [gdb_get_line_number "Break here"]
-gdb_test "b $break_line" ""
+gdb_test "b $break_line" ".*"
gdb_test "continue"
gdb_test_multiple "define backthread" "defining macro" {
Index: gdb.trace/ax.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/ax.exp,v
retrieving revision 1.2
diff -u -p -r1.2 ax.exp
--- gdb.trace/ax.exp 5 May 2010 18:07:03 -0000 1.2
+++ gdb.trace/ax.exp 8 Jun 2010 23:45:48 -0000
@@ -42,95 +42,95 @@ gdb_reinitialize_dir $srcdir/$subdir
gdb_test "maint agent 12" ".*const8 12.*pop.*end.*" "maint agent 12"
-gdb_test "maint agent gdb_char_test" "" "maint agent gdb_char_test"
+gdb_test "maint agent gdb_char_test" ".*" "maint agent gdb_char_test"
-gdb_test "maint agent gdb_arr_test\[12\]" "" "maint agent gdb_arr_test\[12\]"
+gdb_test "maint agent gdb_arr_test\[12\]" ".*" "maint agent gdb_arr_test\[12\]"
-gdb_test "maint agent gdb_arr_test\[gdb_short_test\]" "" "maint agent gdb_arr_test\[gdb_short_test\]"
+gdb_test "maint agent gdb_arr_test\[gdb_short_test\]" ".*" "maint agent gdb_arr_test\[gdb_short_test\]"
-gdb_test "maint agent gdb_struct1_test" "" "maint agent gdb_struct1_test"
+gdb_test "maint agent gdb_struct1_test" ".*" "maint agent gdb_struct1_test"
-gdb_test "maint agent gdb_struct1_test.s" "" "maint agent gdb_struct1_test.s"
+gdb_test "maint agent gdb_struct1_test.s" ".*" "maint agent gdb_struct1_test.s"
-gdb_test "maint agent gdb_struct1_test.arr\[gdb_struct1_test.c\]" "" "maint agent gdb_struct1_test.arr\[gdb_struct1_test.c\]"
+gdb_test "maint agent gdb_struct1_test.arr\[gdb_struct1_test.c\]" ".*" "maint agent gdb_struct1_test.arr\[gdb_struct1_test.c\]"
-gdb_test "maint agent gdb_structp_test" "" "maint agent gdb_structp_test"
+gdb_test "maint agent gdb_structp_test" ".*" "maint agent gdb_structp_test"
-gdb_test "maint agent gdb_structp_test->l" "" "maint agent gdb_structp_test->l"
+gdb_test "maint agent gdb_structp_test->l" ".*" "maint agent gdb_structp_test->l"
-gdb_test "maint agent gdb_structp_test->bfield" "" "maint agent gdb_structp_test->bfield"
+gdb_test "maint agent gdb_structp_test->bfield" ".*" "maint agent gdb_structp_test->bfield"
-gdb_test "maint agent gdb_long_test + gdb_short_test" "" "maint agent gdb_long_test + gdb_short_test"
+gdb_test "maint agent gdb_long_test + gdb_short_test" ".*" "maint agent gdb_long_test + gdb_short_test"
-gdb_test "maint agent gdb_long_test - gdb_short_test" "" "maint agent gdb_long_test - gdb_short_test"
+gdb_test "maint agent gdb_long_test - gdb_short_test" ".*" "maint agent gdb_long_test - gdb_short_test"
-gdb_test "maint agent gdb_long_test * gdb_short_test" "" "maint agent gdb_long_test * gdb_short_test"
+gdb_test "maint agent gdb_long_test * gdb_short_test" ".*" "maint agent gdb_long_test * gdb_short_test"
-gdb_test "maint agent gdb_long_test / gdb_short_test" "" "maint agent gdb_long_test / gdb_short_test"
+gdb_test "maint agent gdb_long_test / gdb_short_test" ".*" "maint agent gdb_long_test / gdb_short_test"
-gdb_test "maint agent gdb_structp_test + 1" "" "maint agent gdb_structp_test + 1"
+gdb_test "maint agent gdb_structp_test + 1" ".*" "maint agent gdb_structp_test + 1"
-gdb_test "maint agent gdb_long_test == gdb_short_test" "" "maint agent gdb_long_test == gdb_short_test"
+gdb_test "maint agent gdb_long_test == gdb_short_test" ".*" "maint agent gdb_long_test == gdb_short_test"
-gdb_test "maint agent gdb_long_test != gdb_short_test" "" "maint agent gdb_long_test != gdb_short_test"
+gdb_test "maint agent gdb_long_test != gdb_short_test" ".*" "maint agent gdb_long_test != gdb_short_test"
-gdb_test "maint agent gdb_long_test < gdb_short_test" "" "maint agent gdb_long_test < gdb_short_test"
+gdb_test "maint agent gdb_long_test < gdb_short_test" ".*" "maint agent gdb_long_test < gdb_short_test"
-gdb_test "maint agent gdb_long_test <= gdb_short_test" "" "maint agent gdb_long_test <= gdb_short_test"
+gdb_test "maint agent gdb_long_test <= gdb_short_test" ".*" "maint agent gdb_long_test <= gdb_short_test"
-gdb_test "maint agent gdb_long_test > gdb_short_test" "" "maint agent gdb_long_test > gdb_short_test"
+gdb_test "maint agent gdb_long_test > gdb_short_test" ".*" "maint agent gdb_long_test > gdb_short_test"
-gdb_test "maint agent gdb_long_test >= gdb_short_test" "" "maint agent gdb_long_test >= gdb_short_test"
+gdb_test "maint agent gdb_long_test >= gdb_short_test" ".*" "maint agent gdb_long_test >= gdb_short_test"
-gdb_test "maint agent &gdb_long_test == &gdb_short_test" "" "maint agent &gdb_long_test == &gdb_short_test"
+gdb_test "maint agent &gdb_long_test == &gdb_short_test" ".*" "maint agent &gdb_long_test == &gdb_short_test"
-gdb_test "maint agent &gdb_long_test < &gdb_short_test" "" "maint agent &gdb_long_test < &gdb_short_test"
+gdb_test "maint agent &gdb_long_test < &gdb_short_test" ".*" "maint agent &gdb_long_test < &gdb_short_test"
# Now test eval version of agent expressions.
gdb_test "maint agent-eval 12" ".*const8 12.*end.*" "maint agent-eval 12"
-gdb_test "maint agent-eval gdb_char_test" "" "maint agent-eval gdb_char_test"
+gdb_test "maint agent-eval gdb_char_test" ".*" "maint agent-eval gdb_char_test"
-gdb_test "maint agent-eval gdb_arr_test\[12\]" "" "maint agent-eval gdb_arr_test\[12\]"
+gdb_test "maint agent-eval gdb_arr_test\[12\]" ".*" "maint agent-eval gdb_arr_test\[12\]"
-gdb_test "maint agent-eval gdb_arr_test\[gdb_short_test\]" "" "maint agent-eval gdb_arr_test\[gdb_short_test\]"
+gdb_test "maint agent-eval gdb_arr_test\[gdb_short_test\]" ".*" "maint agent-eval gdb_arr_test\[gdb_short_test\]"
-gdb_test "maint agent-eval gdb_struct1_test" "" "maint agent-eval gdb_struct1_test"
+gdb_test "maint agent-eval gdb_struct1_test" ".*" "maint agent-eval gdb_struct1_test"
-gdb_test "maint agent-eval gdb_struct1_test.s" "" "maint agent-eval gdb_struct1_test.s"
+gdb_test "maint agent-eval gdb_struct1_test.s" ".*" "maint agent-eval gdb_struct1_test.s"
-gdb_test "maint agent-eval gdb_struct1_test.arr\[gdb_struct1_test.c\]" "" "maint agent-eval gdb_struct1_test.arr\[gdb_struct1_test.c\]"
+gdb_test "maint agent-eval gdb_struct1_test.arr\[gdb_struct1_test.c\]" ".*" "maint agent-eval gdb_struct1_test.arr\[gdb_struct1_test.c\]"
-gdb_test "maint agent-eval gdb_structp_test" "" "maint agent-eval gdb_structp_test"
+gdb_test "maint agent-eval gdb_structp_test" ".*" "maint agent-eval gdb_structp_test"
-gdb_test "maint agent-eval gdb_structp_test->l" "" "maint agent-eval gdb_structp_test->l"
+gdb_test "maint agent-eval gdb_structp_test->l" ".*" "maint agent-eval gdb_structp_test->l"
-gdb_test "maint agent-eval gdb_structp_test->bfield" "" "maint agent-eval gdb_structp_test->bfield"
+gdb_test "maint agent-eval gdb_structp_test->bfield" ".*" "maint agent-eval gdb_structp_test->bfield"
-gdb_test "maint agent-eval gdb_long_test + gdb_short_test" "" "maint agent-eval gdb_long_test + gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test + gdb_short_test" ".*" "maint agent-eval gdb_long_test + gdb_short_test"
-gdb_test "maint agent-eval gdb_long_test - gdb_short_test" "" "maint agent-eval gdb_long_test - gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test - gdb_short_test" ".*" "maint agent-eval gdb_long_test - gdb_short_test"
-gdb_test "maint agent-eval gdb_long_test * gdb_short_test" "" "maint agent-eval gdb_long_test * gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test * gdb_short_test" ".*" "maint agent-eval gdb_long_test * gdb_short_test"
-gdb_test "maint agent-eval gdb_long_test / gdb_short_test" "" "maint agent-eval gdb_long_test / gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test / gdb_short_test" ".*" "maint agent-eval gdb_long_test / gdb_short_test"
-gdb_test "maint agent-eval gdb_structp_test + 1" "" "maint agent-eval gdb_structp_test + 1"
+gdb_test "maint agent-eval gdb_structp_test + 1" ".*" "maint agent-eval gdb_structp_test + 1"
-gdb_test "maint agent-eval gdb_long_test == gdb_short_test" "" "maint agent-eval gdb_long_test == gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test == gdb_short_test" ".*" "maint agent-eval gdb_long_test == gdb_short_test"
-gdb_test "maint agent-eval gdb_long_test != gdb_short_test" "" "maint agent-eval gdb_long_test != gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test != gdb_short_test" ".*" "maint agent-eval gdb_long_test != gdb_short_test"
-gdb_test "maint agent-eval gdb_long_test < gdb_short_test" "" "maint agent-eval gdb_long_test < gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test < gdb_short_test" ".*" "maint agent-eval gdb_long_test < gdb_short_test"
-gdb_test "maint agent-eval gdb_long_test <= gdb_short_test" "" "maint agent-eval gdb_long_test <= gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test <= gdb_short_test" ".*" "maint agent-eval gdb_long_test <= gdb_short_test"
-gdb_test "maint agent-eval gdb_long_test > gdb_short_test" "" "maint agent-eval gdb_long_test > gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test > gdb_short_test" ".*" "maint agent-eval gdb_long_test > gdb_short_test"
-gdb_test "maint agent-eval gdb_long_test >= gdb_short_test" "" "maint agent-eval gdb_long_test >= gdb_short_test"
+gdb_test "maint agent-eval gdb_long_test >= gdb_short_test" ".*" "maint agent-eval gdb_long_test >= gdb_short_test"
gdb_test "maint agent-eval &gdb_long_test == &gdb_short_test" ".*equal.*end.*" "maint agent-eval &gdb_long_test == &gdb_short_test"
-gdb_test "maint agent-eval &gdb_long_test < &gdb_short_test" "" "maint agent-eval &gdb_long_test < &gdb_short_test"
+gdb_test "maint agent-eval &gdb_long_test < &gdb_short_test" ".*" "maint agent-eval &gdb_long_test < &gdb_short_test"