From f6978de9f5df575df336f7044d1a7611a5f6182e Mon Sep 17 00:00:00 2001
From: Michael Snyder <msnyder@vmware.com>
Date: Thu, 10 Jun 2010 19:48:20 +0000
Subject: [PATCH] 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.
---
 gdb/testsuite/ChangeLog                       | 60 +++++++++++++++++++
 gdb/testsuite/gdb.ada/assign_1.exp            |  3 +-
 gdb/testsuite/gdb.ada/boolean_expr.exp        |  3 +-
 gdb/testsuite/gdb.ada/frame_args.exp          |  3 +-
 gdb/testsuite/gdb.ada/lang_switch.exp         |  2 +-
 gdb/testsuite/gdb.ada/ptype_arith_binop.exp   |  3 +-
 gdb/testsuite/gdb.ada/ref_param.exp           |  2 +-
 gdb/testsuite/gdb.ada/type_coercion.exp       |  6 +-
 gdb/testsuite/gdb.asm/asm-source.exp          |  4 +-
 gdb/testsuite/gdb.base/attach.exp             |  2 +-
 gdb/testsuite/gdb.base/bitfields2.exp         |  2 +-
 gdb/testsuite/gdb.base/call-signal-resume.exp |  4 +-
 gdb/testsuite/gdb.base/callfuncs.exp          |  4 +-
 gdb/testsuite/gdb.base/commands.exp           | 14 ++---
 gdb/testsuite/gdb.base/dbx.exp                |  6 +-
 gdb/testsuite/gdb.base/default.exp            | 12 ++--
 gdb/testsuite/gdb.base/dump.exp               | 28 ++++-----
 gdb/testsuite/gdb.base/exprs.exp              |  6 +-
 gdb/testsuite/gdb.base/freebpcmd.exp          |  3 +-
 gdb/testsuite/gdb.base/interrupt.exp          |  2 +-
 gdb/testsuite/gdb.base/list.exp               |  2 +-
 gdb/testsuite/gdb.base/long_long.exp          |  6 +-
 gdb/testsuite/gdb.base/maint.exp              |  8 +--
 gdb/testsuite/gdb.base/ptype.exp              | 10 ++--
 gdb/testsuite/gdb.base/return.exp             |  4 +-
 gdb/testsuite/gdb.base/setshow.exp            |  4 +-
 gdb/testsuite/gdb.base/sigbpt.exp             |  8 +--
 gdb/testsuite/gdb.base/sigrepeat.exp          |  2 +-
 gdb/testsuite/gdb.cp/classes.exp              |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-restore.exp      |  2 +-
 gdb/testsuite/gdb.gdb/selftest.exp            |  2 +-
 gdb/testsuite/gdb.multi/base.exp              |  4 +-
 gdb/testsuite/gdb.multi/bkpt-multi-exec.exp   |  2 +-
 gdb/testsuite/gdb.python/py-block.exp         |  2 +-
 gdb/testsuite/gdb.python/py-prettyprint.exp   |  6 +-
 gdb/testsuite/gdb.python/py-template.exp      |  2 +-
 gdb/testsuite/gdb.server/ext-attach.exp       |  2 +-
 gdb/testsuite/gdb.server/ext-run.exp          |  2 +-
 gdb/testsuite/gdb.server/server-mon.exp       |  2 +-
 .../gdb.threads/fork-thread-pending.exp       |  2 +-
 .../gdb.threads/hand-call-in-threads.exp      | 15 +++--
 .../gdb.threads/interrupted-hand-call.exp     |  2 +-
 gdb/testsuite/gdb.threads/linux-dp.exp        |  2 +-
 gdb/testsuite/gdb.threads/manythreads.exp     |  2 +-
 gdb/testsuite/gdb.threads/print-threads.exp   |  2 +-
 gdb/testsuite/gdb.threads/pthreads.exp        |  6 +-
 gdb/testsuite/gdb.threads/schedlock.exp       |  2 +-
 .../gdb.threads/thread-unwindonsignal.exp     |  2 +-
 gdb/testsuite/gdb.threads/threadapply.exp     |  2 +-
 49 files changed, 168 insertions(+), 110 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1e16fa4d3fb..f27c4ebf6e1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,63 @@
+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.
+
 2010-06-08  Michael Snyder  <msnyder@vmware.com>
 
 	* gdb.ada/exec_changed.exp: 
diff --git a/gdb/testsuite/gdb.ada/assign_1.exp b/gdb/testsuite/gdb.ada/assign_1.exp
index 93e26a212b4..5af472eef1c 100644
--- a/gdb/testsuite/gdb.ada/assign_1.exp
+++ b/gdb/testsuite/gdb.ada/assign_1.exp
@@ -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" \
diff --git a/gdb/testsuite/gdb.ada/boolean_expr.exp b/gdb/testsuite/gdb.ada/boolean_expr.exp
index d4d28c05af8..178f5e5215d 100644
--- a/gdb/testsuite/gdb.ada/boolean_expr.exp
+++ b/gdb/testsuite/gdb.ada/boolean_expr.exp
@@ -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" \
diff --git a/gdb/testsuite/gdb.ada/frame_args.exp b/gdb/testsuite/gdb.ada/frame_args.exp
index d7fbb1cb10d..5558d238ec0 100644
--- a/gdb/testsuite/gdb.ada/frame_args.exp
+++ b/gdb/testsuite/gdb.ada/frame_args.exp
@@ -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" \
diff --git a/gdb/testsuite/gdb.ada/lang_switch.exp b/gdb/testsuite/gdb.ada/lang_switch.exp
index 45ce7923fed..b5bf7dd55cd 100644
--- a/gdb/testsuite/gdb.ada/lang_switch.exp
+++ b/gdb/testsuite/gdb.ada/lang_switch.exp
@@ -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.
diff --git a/gdb/testsuite/gdb.ada/ptype_arith_binop.exp b/gdb/testsuite/gdb.ada/ptype_arith_binop.exp
index 53344da5bca..9581f86290c 100644
--- a/gdb/testsuite/gdb.ada/ptype_arith_binop.exp
+++ b/gdb/testsuite/gdb.ada/ptype_arith_binop.exp
@@ -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" \
diff --git a/gdb/testsuite/gdb.ada/ref_param.exp b/gdb/testsuite/gdb.ada/ref_param.exp
index 834ab01a6bd..53a13861b76 100644
--- a/gdb/testsuite/gdb.ada/ref_param.exp
+++ b/gdb/testsuite/gdb.ada/ref_param.exp
@@ -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" \
diff --git a/gdb/testsuite/gdb.ada/type_coercion.exp b/gdb/testsuite/gdb.ada/type_coercion.exp
index 27c12524670..2c2a13ab3e6 100644
--- a/gdb/testsuite/gdb.ada/type_coercion.exp
+++ b/gdb/testsuite/gdb.ada/type_coercion.exp
@@ -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" \
diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index d3a8f11d0c8..ca342bd31d2 100644
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -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"
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index bc7d4eb7208..83a4b753a1c 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 c854de8e661..b27f25f231e 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 cbcb9f4ab68..08137821f45 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 40bbb6a7c5b..02e7acb5281 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 a9ba92ecfc4..71512068572 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 b58709343be..3e0fa4012ea 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 a9a07016e3b..283745abffb 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 eb048b8286b..1f307f401dc 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 a872d1355ca..e84bf31b5a5 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 cbc31be6d6d..4999697056f 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 5ae911c0b8c..1f2d533e8d6 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 91633cc3c04..e0e35b3a469 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 9112b651e1b..4ab428f599d 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 f48647de670..40e9e8db3f1 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 05ab9c92aba..7a8afc92099 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 f1b9fd77756..dcd66f895cf 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 deddcd2829c..6b0f844451c 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 99656d8880b..e5e95ff08ce 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 7cfbddb3512..ee67887acdf 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
diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
index e5d65ca2d55..36050ac6a0c 100644
--- a/gdb/testsuite/gdb.cp/classes.exp
+++ b/gdb/testsuite/gdb.cp/classes.exp
@@ -403,7 +403,7 @@ proc test_enums {} {
 
     # advance one line
 
-    gdb_test "next" ""
+    gdb_test "next" ".*"
 
     # print the object again
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
index 183e0141e5e..1f5afc6927c 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
@@ -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 ().*"
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index a448cbcc703..e2b5b1c9af5 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -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"
     }
 
diff --git a/gdb/testsuite/gdb.multi/base.exp b/gdb/testsuite/gdb.multi/base.exp
index c8a7bf49a6e..b55d4d93469 100644
--- a/gdb/testsuite/gdb.multi/base.exp
+++ b/gdb/testsuite/gdb.multi/base.exp
@@ -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.*"
diff --git a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
index e3f86964c9d..1fe24f6447c 100644
--- a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
+++ b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
@@ -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.
 #
diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index 9826e61177e..f6e5d73c072 100644
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -72,7 +72,7 @@ gdb_test_no_output "python block = block.superblock" "Get superblock 2"
 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"
diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp
index a26c48b3d35..f435fb76999 100644
--- a/gdb/testsuite/gdb.python/py-prettyprint.exp
+++ b/gdb/testsuite/gdb.python/py-prettyprint.exp
@@ -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"
diff --git a/gdb/testsuite/gdb.python/py-template.exp b/gdb/testsuite/gdb.python/py-template.exp
index af59353e890..bb2e5f2a3fa 100644
--- a/gdb/testsuite/gdb.python/py-template.exp
+++ b/gdb/testsuite/gdb.python/py-template.exp
@@ -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.
diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp
index 2fc4e44a6d5..60b8fc12ae8 100644
--- a/gdb/testsuite/gdb.server/ext-attach.exp
+++ b/gdb/testsuite/gdb.server/ext-attach.exp
@@ -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"
diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp
index 5cc3501cd54..d8fda739260 100644
--- a/gdb/testsuite/gdb.server/ext-run.exp
+++ b/gdb/testsuite/gdb.server/ext-run.exp
@@ -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"
diff --git a/gdb/testsuite/gdb.server/server-mon.exp b/gdb/testsuite/gdb.server/server-mon.exp
index 79a68b74525..2047a3cfc5f 100644
--- a/gdb/testsuite/gdb.server/server-mon.exp
+++ b/gdb/testsuite/gdb.server/server-mon.exp
@@ -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"
     }
diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
index d53ddef8866..382e5375226 100644
--- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp
+++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
@@ -51,7 +51,7 @@ gdb_test "continue" "Catchpoint.*" "1, get to the fork event"
 
 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"
 
diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
index 93383300e34..59bf4903c7f 100644
--- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
+++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
@@ -93,8 +93,10 @@ set total_nr_threads [expr $NR_THREADS + 1]
 # 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_threads } { incr i } {
 	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" ".* locking scheduler .* is \"off\"." "show sc
 # 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"
 
diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
index 33b636b0135..d38c80669ad 100644
--- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
+++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
@@ -73,7 +73,7 @@ gdb_test "maint print dummy-frames" ".*stack=.*" "dummy stack frame present"
 
 # 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 $" {
diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp
index d798a9cab52..fb2a2ed6303 100644
--- a/gdb/testsuite/gdb.threads/linux-dp.exp
+++ b/gdb/testsuite/gdb.threads/linux-dp.exp
@@ -58,7 +58,7 @@ gdb_test_no_output "set print sevenbit-strings"
 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"]
diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp
index 385cb4b7d52..cfdd0e79b2a 100644
--- a/gdb/testsuite/gdb.threads/manythreads.exp
+++ b/gdb/testsuite/gdb.threads/manythreads.exp
@@ -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"
diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp
index 4589d522ebc..f12d7a58b8d 100644
--- a/gdb/testsuite/gdb.threads/print-threads.exp
+++ b/gdb/testsuite/gdb.threads/print-threads.exp
@@ -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 } {
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 44e3c4ece3c..d2a8968b570 100644
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -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 {
diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp
index 0bdabf5e197..1ccc95ca497 100644
--- a/gdb/testsuite/gdb.threads/schedlock.exp
+++ b/gdb/testsuite/gdb.threads/schedlock.exp
@@ -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}
diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
index 45be253700f..a2b95458375 100644
--- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
+++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
@@ -97,7 +97,7 @@ gdb_test_multiple "thread apply all bt" "wrong thread not unwound" {
 
 # 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 $" {
diff --git a/gdb/testsuite/gdb.threads/threadapply.exp b/gdb/testsuite/gdb.threads/threadapply.exp
index 5982455b513..3b23902bb5d 100644
--- a/gdb/testsuite/gdb.threads/threadapply.exp
+++ b/gdb/testsuite/gdb.threads/threadapply.exp
@@ -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" {
-- 
2.30.2