From cf38969ab87f80916886bdd13b720cbe8bc86dbf Mon Sep 17 00:00:00 2001
From: msnyder <msnyder>
Date: Tue, 8 Jun 2010 22:58:03 +0000
Subject: [PATCH] 2010-06-08  Michael Snyder  <msnyder@vmware.com>

	* gdb.ada/exec_changed.exp:
	Use ".*" instead of "" as wildcard regexp.

	* gdb.base/async.exp: Use ".*" instead of "" as wildcard regexp.
	* gdb.base/call-ar-st.exp: Ditto.
	* gdb.base/checkpoint.exp: Ditto.
	* gdb.base/default.exp: Ditto.
	* gdb.base/dump.exp: Ditto.
	* gdb.base/ending-run.exp: Ditto.
	* gdb.base/fileio.exp: Ditto.
	* gdb.base/miscexprs.exp: Ditto.
	* gdb.base/pointers.exp: Ditto.
	* gdb.base/readline.exp: Ditto.
	* gdb.base/reread.exp: Ditto.
	* gdb.base/restore.exp: Ditto.
	* gdb.base/shlib-call.exp: Ditto.
	* gdb.base/valgrind-db-attach.exp: Ditto.
	* gdb.base/volatile.exp: Ditto.
	* gdb.base/watchpoints.exp: Ditto.

	* gdb.cp/classes.exp: Use ".*" instead of "" as wildcard regexp.

	* gdb.python/py-frame.exp: Use ".*" instead of "" as wildcard regexp.
	* gdb.python/py-value.exp: Ditto.

	* gdb.trace/backtrace.exp: Use ".*" instead of "" as wildcard regexp.
	* gdb.trace/circ.exp: Ditto.
	* gdb.trace/collection.exp: Ditto.
	* gdb.trace/packetlen.exp: Ditto.
	* gdb.trace/passc-dyn.exp: Ditto.
	* gdb.trace/report.exp: Ditto.
	* gdb.trace/tfile.exp: Ditto.
	* gdb.trace/tfind.exp: Ditto.
	* gdb.trace/while-dyn.exp: Ditto.
---
 gdb/testsuite/ChangeLog                       | 37 +++++++++++++++++++++++++++
 gdb/testsuite/gdb.ada/exec_changed.exp        | 10 ++++----
 gdb/testsuite/gdb.base/async.exp              |  6 ++---
 gdb/testsuite/gdb.base/call-ar-st.exp         | 14 +++++-----
 gdb/testsuite/gdb.base/checkpoint.exp         | 34 ++++++++++++------------
 gdb/testsuite/gdb.base/default.exp            |  8 +++---
 gdb/testsuite/gdb.base/dump.exp               |  2 +-
 gdb/testsuite/gdb.base/ending-run.exp         |  2 +-
 gdb/testsuite/gdb.base/fileio.exp             |  2 +-
 gdb/testsuite/gdb.base/miscexprs.exp          |  2 +-
 gdb/testsuite/gdb.base/pointers.exp           |  2 +-
 gdb/testsuite/gdb.base/readline.exp           |  2 +-
 gdb/testsuite/gdb.base/reread.exp             | 18 ++++++-------
 gdb/testsuite/gdb.base/restore.exp            |  2 +-
 gdb/testsuite/gdb.base/shlib-call.exp         |  2 +-
 gdb/testsuite/gdb.base/valgrind-db-attach.exp |  2 +-
 gdb/testsuite/gdb.base/volatile.exp           |  2 +-
 gdb/testsuite/gdb.base/watchpoints.exp        |  4 +--
 gdb/testsuite/gdb.cp/classes.exp              |  4 +--
 gdb/testsuite/gdb.python/py-frame.exp         |  2 +-
 gdb/testsuite/gdb.python/py-value.exp         |  4 +--
 gdb/testsuite/gdb.trace/backtrace.exp         | 12 ++++-----
 gdb/testsuite/gdb.trace/circ.exp              | 10 ++++----
 gdb/testsuite/gdb.trace/collection.exp        |  6 ++---
 gdb/testsuite/gdb.trace/packetlen.exp         |  8 +++---
 gdb/testsuite/gdb.trace/passc-dyn.exp         | 24 ++++++++---------
 gdb/testsuite/gdb.trace/report.exp            | 10 ++++----
 gdb/testsuite/gdb.trace/tfile.exp             |  6 ++---
 gdb/testsuite/gdb.trace/tfind.exp             |  6 ++---
 gdb/testsuite/gdb.trace/while-dyn.exp         | 16 ++++++------
 30 files changed, 148 insertions(+), 111 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 815c3bc805..1e16fa4d3f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,40 @@
+2010-06-08  Michael Snyder  <msnyder@vmware.com>
+
+	* gdb.ada/exec_changed.exp: 
+	Use ".*" instead of "" as wildcard regexp.
+
+	* gdb.base/async.exp: Use ".*" instead of "" as wildcard regexp.
+	* gdb.base/call-ar-st.exp: Ditto.
+	* gdb.base/checkpoint.exp: Ditto.
+	* gdb.base/default.exp: Ditto.
+	* gdb.base/dump.exp: Ditto.
+	* gdb.base/ending-run.exp: Ditto.
+	* gdb.base/fileio.exp: Ditto.
+	* gdb.base/miscexprs.exp: Ditto.
+	* gdb.base/pointers.exp: Ditto.
+	* gdb.base/readline.exp: Ditto.
+	* gdb.base/reread.exp: Ditto.
+	* gdb.base/restore.exp: Ditto.
+	* gdb.base/shlib-call.exp: Ditto.
+	* gdb.base/valgrind-db-attach.exp: Ditto.
+	* gdb.base/volatile.exp: Ditto.
+	* gdb.base/watchpoints.exp: Ditto.
+
+	* gdb.cp/classes.exp: Use ".*" instead of "" as wildcard regexp.
+
+	* gdb.python/py-frame.exp: Use ".*" instead of "" as wildcard regexp.
+	* gdb.python/py-value.exp: Ditto.
+
+	* gdb.trace/backtrace.exp: Use ".*" instead of "" as wildcard regexp.
+	* gdb.trace/circ.exp: Ditto.
+	* gdb.trace/collection.exp: Ditto.
+	* gdb.trace/packetlen.exp: Ditto.
+	* gdb.trace/passc-dyn.exp: Ditto.
+	* gdb.trace/report.exp: Ditto.
+	* gdb.trace/tfile.exp: Ditto.
+	* gdb.trace/tfind.exp: Ditto.
+	* gdb.trace/while-dyn.exp: Ditto.
+
 2010-06-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.python/python.exp (pythonX.Y/lib-dynload/*.so): New.
diff --git a/gdb/testsuite/gdb.ada/exec_changed.exp b/gdb/testsuite/gdb.ada/exec_changed.exp
index 0505b7afc1..7aaa95c7ed 100644
--- a/gdb/testsuite/gdb.ada/exec_changed.exp
+++ b/gdb/testsuite/gdb.ada/exec_changed.exp
@@ -52,7 +52,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 # Load the first executable.
 
-gdb_test "shell mv ${binfile1} ${binfile}" "" ""
+gdb_test "shell mv ${binfile1} ${binfile}" ".*" ""
 gdb_load ${binfile}
 
 # Start the program, we should land in the program main procedure
@@ -69,10 +69,10 @@ gdb_test "" \
 # second executable into its place.  Ensure that the new
 # executable is at least a second newer than the old.
 
-gdb_test "shell mv ${binfile} ${binfile1}" "" ""
-gdb_test "shell mv ${binfile2} ${binfile}" "" ""
-gdb_test "shell sleep 1" "" ""
-gdb_test "shell touch ${binfile}" "" ""
+gdb_test "shell mv ${binfile} ${binfile1}" ".*" ""
+gdb_test "shell mv ${binfile2} ${binfile}" ".*" ""
+gdb_test "shell sleep 1" ".*" ""
+gdb_test "shell touch ${binfile}" ".*" ""
 
 # Start the program a second time, GDB should land in procedure Second
 # this time.
diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp
index 6b6772365b..e036368b23 100644
--- a/gdb/testsuite/gdb.base/async.exp
+++ b/gdb/testsuite/gdb.base/async.exp
@@ -67,12 +67,12 @@ if ![runto_main] then {
     continue
 }
 
-gdb_test "break baz" "" ""
+gdb_test "break baz" ".*" ""
 
 #
 # Make sure we get a 'completed' message when the target is done.
 #
-gdb_test "set display-exec-done on" "" ""
+gdb_test "set display-exec-done on" ".*" ""
 
 
 send_gdb "next&\n" 
@@ -135,7 +135,7 @@ gdb_expect {
     timeout  { fail "(timeout) until &" }
 }
 
-gdb_test "set display-exec-done off" "" ""
+gdb_test "set display-exec-done off" ".*" ""
 
 unset_board_info "gdb_protocol"
 set_board_info "gdb_protocol" "remote"
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index 09bb19fc0f..d71454ee25 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -155,7 +155,7 @@ if ![gdb_skip_stdio_test "continue to 1216"] {
 	"\[ \t\r\n\]+1216.*print_double_array\\(double_array\\)"
     }
 } else {
-    gdb_test "continue" "" ""
+    gdb_test "continue" ".*" ""
 }
 
 # I am disabling this test, because it takes too long. I verified by
@@ -192,7 +192,7 @@ if {![gdb_skip_float_test "continuing to breakpoint 1220"] && \
 	".*main \\(\\) at .*call-ar-st.c:1220\[ \t\r\n\]+.*print_all_arrays\\(integer_array, char_array, float_array, double_array\\)."
     }
 } else {
-    gdb_test "continue" "" ""
+    gdb_test "continue" ".*" ""
 }
 
 #step
@@ -206,7 +206,7 @@ if ![gdb_skip_stdio_test "next over print_int_array in print_all_arrays"] {
 	"array_i :.*307.*print_char_array.*" \
 	"next over print_int_array in print-all_arrays"
 } else {
-    gdb_test "next" "" ""
+    gdb_test "next" ".*" ""
 }
 
 #call print_double_array(array_d)
@@ -240,7 +240,7 @@ if {![gdb_skip_float_test "continuing to 1236"] && \
 	"\[ \t\r\n\]+.*HELLO WORLD.*main \\(\\) at .*call-ar-st.c:1236.*printf\\(.BYE BYE FOR NOW.n.\\)."
     }
 } else {
-    gdb_test "continue" "" ""
+    gdb_test "continue" ".*" ""
 }
 
 
@@ -258,7 +258,7 @@ if ![gdb_skip_stdio_test "next to 1237"] {
 	"BYE BYE FOR NOW.*1237.*printf\\(.VERY GREEN GRASS.n.\\);.*" \
 	"next to 1237"
 } else {
-    gdb_test "next" "" ""
+    gdb_test "next" ".*" ""
 }
 
 #call print_array_rep(\*list1, \*list2, \*list3)
@@ -319,7 +319,7 @@ if ![gdb_skip_stdio_test "continuing to 1281"] {
 	"Continuing\\..*Sum of 4 arrays.*Contents of linked list1.*Contents of two_floats_t.*main \\(\\) at .*call-ar-st.c:1281.*c = 0.*" \
 	"continue to 1281"
 } else {
-    gdb_test "continue" "" ""
+    gdb_test "continue" ".*" ""
 }
 
 #call print_small_structs(*struct1, *struct2, *struct3, *struct4, 
@@ -500,7 +500,7 @@ if ![gdb_skip_stdio_test "continuing to 1300"] {
     gdb_test "continue" "Continuing\\..*Contents of two_floats_t:.*main \\(\\) at.*call-ar-st.c:1300.*1300.*init_bit_flags_combo\\(flags_combo, \\(unsigned\\)1, \\(unsigned\\)0, .y.,.*" \
 	    "continue to 1300"
 } else {
-    gdb_test "continue" "" ""
+    gdb_test "continue" ".*" ""
 }
 
 #step
diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index afb66a2562..23a0a36830 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -62,34 +62,34 @@ set break4_loc [gdb_get_line_number "breakpoint 4"]
 gdb_breakpoint $break1_loc
 gdb_test "continue" "breakpoint 1.*" "break1 start"
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 gdb_test "continue 10" "breakpoint 1.*" "break1 two"
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 gdb_test "continue 10" "breakpoint 1.*" "break1 three"
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 gdb_test "continue 10" "breakpoint 1.*" "break1 four" 
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 gdb_test "continue 10" "breakpoint 1.*" "break1 five"
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 gdb_test "continue 10" "breakpoint 1.*" "break1 six"
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 gdb_test "continue 10" "breakpoint 1.*" "break1 seven"
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 gdb_test "continue 10" "breakpoint 1.*" "break1 eight"
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 gdb_test "continue 10" "breakpoint 1.*" "break1 nine"
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 gdb_test "continue 10" "breakpoint 1.*" "break1 ten"
 
-gdb_test "checkpoint" "" ""
+gdb_test "checkpoint" ".*" ""
 
 gdb_test "info checkpoints" \
     " 10 .* 9 .* 8 .* 7 .* 6 .* 5 .* 4 .* 3 .* 2 .* 1 .*" \
@@ -169,43 +169,43 @@ gdb_test "shell diff -s pi.txt copy1.txt" \
 gdb_breakpoint $break1_loc
 
 gdb_test "restart 1" "Switching to .*c == EOF.*" "restart 1 two"
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 gdb_test "continue 100" "breakpoint 1.*" "breakpoint 1 1 one"
 gdb_test "step" "if .c == EOF.*" "step in 1 two"
 gdb_test "print lines" " = 102.*" "verify lines 1 two"
 
 gdb_test "restart 2" "Switching to .*c == EOF.*" "restart 2 two"
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 gdb_test "continue 100" "breakpoint 1.*" "breakpoint 1 2 one"
 gdb_test "step" "if .c == EOF.*" "step in 2 two"
 gdb_test "print lines" " = 112.*" "verify lines 2 two"
 
 gdb_test "restart 3" "Switching to .*c == EOF.*" "restart 3 two"
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 gdb_test "continue 500" "breakpoint 1.*" "breakpoint 1 3 one"
 gdb_test "step" "if .c == EOF.*" "step in 3 two"
 gdb_test "print lines" " = 522.*" "verify lines 3 two"
 
 gdb_test "restart 4" "Switching to .*c == EOF.*" "restart 4 two"
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 gdb_test "continue 500" "breakpoint 1.*" "breakpoint 1 4 one"
 gdb_test "step" "if .c == EOF.*" "step in 4 two"
 gdb_test "print lines" " = 532.*" "verify lines 4 two"
 
 gdb_test "restart 5" "Switching to .*c == EOF.*" "restart 5 two"
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 gdb_test "continue 1000" "breakpoint 1.*" "breakpoint 1 5 one"
 gdb_test "step" "if .c == EOF.*" "step in 5 two"
 gdb_test "print lines" " = 1042.*" "verify lines 5 two"
 
 gdb_test "restart 6" "Switching to .*c == EOF.*" "restart 6 two"
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 gdb_test "continue 1000" "breakpoint 1.*" "breakpoint 1 6 one"
 gdb_test "step" "if .c == EOF.*" "step in 6 two"
 gdb_test "print lines" " = 1052.*" "verify lines 5 two"
 
 gdb_test "restart 7" "Switching to .*c == EOF.*" "restart 7 two"
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 gdb_test "continue 1100" "breakpoint 1.*" "breakpoint 1 7 one"
 gdb_test "step" "if .c == EOF.*" "step in 7 two"
 gdb_test "print lines" " = 1162.*" "verify lines 7 two"
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index caba3b391c..a9a07016e3 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -392,12 +392,12 @@ gdb_test "pwd" "Working directory .*" "pwd"
 
 #test run "r" abbreviation
 if [istarget "*-*-vxworks*"] then {
-    gdb_test "set args" "" "" 
+    gdb_test "set args" ".*" "" 
 
     gdb_test "r" "Starting program: .*
 You must specify a function name to run, and arguments if any"\
 		"run \"r\" abbreviation"
-    gdb_test "set args main" "" "" 
+    gdb_test "set args main" ".*" "" 
 
 } else {
     gdb_test_multiple "r" "run \"r\" abbreviation" {
@@ -418,11 +418,11 @@ You must specify a function name to run, and arguments if any"\
 
 #test run
 if [istarget "*-*-vxworks*"] then {
-    gdb_test "set args" "" "" 
+    gdb_test "set args" ".*" "" 
 
     gdb_test "run" "Starting program: .*
 You must specify a function name to run, and arguments if any"
-    gdb_test "set args main" "" "" 
+    gdb_test "set args main" ".*" "" 
 
 } else {
     gdb_test_multiple "run" "run" {
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index 384db3fe17..eb048b8286 100644
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -488,7 +488,7 @@ gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 4"
 gdb_test "print intarray\[4\] == 0" " = 1" "element 4 not changed - 4"
 
 if ![string compare $is64bitonly "no"] then {
-  gdb_test "print zero_all ()" "" ""
+  gdb_test "print zero_all ()" ".*" ""
 
   # restore with expressions 
   test_restore_saved_value \
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index bdc3f3f5f9..779f4d3e48 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -105,7 +105,7 @@ if ![gdb_skip_stdio_test "Step to return"] {
     gdb_test "next" ".*Goodbye!.*32.*" \
 	    "Step to return"
 } else {
-    gdb_test "next" "" ""
+    gdb_test "next" ".*" ""
 }
 
 set old_timeout $timeout
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index bd1876cfc8..d6242d00c3 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -83,7 +83,7 @@ gdb_test continue \
 "Continuing\\..*open 4:.*ENOENT$stop_msg" \
 "Opening nonexistant file returns ENOENT"
 
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 
 catch "system \"chmod -f -w nowrt.fileio.test\""
 
diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index b22b7f4ab8..43665ff111 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -69,7 +69,7 @@ if ![runto_main] then {
     continue
 }
 
-gdb_test "break marker1" "" ""
+gdb_test "break marker1" ".*" ""
 
 gdb_test "cont" \
     "Break.* marker1 \\(\\) at .*:$decimal.*" \
diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
index 4d577c9550..e671bfb586 100644
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ b/gdb/testsuite/gdb.base/pointers.exp
@@ -215,7 +215,7 @@ gdb_test "print **ptr_to_ptr_to_float" " = 100" \
 # with elementary type variables and pointers.
 # 
 
-gdb_test "break marker1" "" ""
+gdb_test "break marker1" ".*" ""
 gdb_test "cont" "Break.* marker1 \\(\\) at .*:$decimal.*" \
     continue to marker1"
 gdb_test "up" "more_code.*" "up from marker1"
diff --git a/gdb/testsuite/gdb.base/readline.exp b/gdb/testsuite/gdb.base/readline.exp
index 62fe14ad07..761ff1c8a1 100644
--- a/gdb/testsuite/gdb.base/readline.exp
+++ b/gdb/testsuite/gdb.base/readline.exp
@@ -136,7 +136,7 @@ proc operate_and_get_next {name args} {
   }
 
   # Match the prompt so the next test starts at the right place.
-  gdb_test "" "" "$name - final prompt"
+  gdb_test "" ".*" "$name - final prompt"
 
   return 1
 }
diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp
index 17d0da3fbf..53ffa14b24 100644
--- a/gdb/testsuite/gdb.base/reread.exp
+++ b/gdb/testsuite/gdb.base/reread.exp
@@ -53,7 +53,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 # Load the first executable.
 
-gdb_test "shell mv ${binfile1} ${binfile}" "" ""
+gdb_test "shell mv ${binfile1} ${binfile}" ".*" ""
 gdb_load ${binfile}
 
 # Set a breakpoint at foo
@@ -82,10 +82,10 @@ gdb_expect {
 # second executable into its place.  Ensure that the new
 # executable is at least a second newer than the old.
 
-gdb_test "shell mv ${binfile} ${binfile1}" "" ""
-gdb_test "shell mv ${binfile2} ${binfile}" "" ""
-gdb_test "shell sleep 1" "" ""
-gdb_test "shell touch ${binfile}" "" ""
+gdb_test "shell mv ${binfile} ${binfile1}" ".*" ""
+gdb_test "shell mv ${binfile2} ${binfile}" ".*" ""
+gdb_test "shell sleep 1" ".*" ""
+gdb_test "shell touch ${binfile}" ".*" ""
 
 # Run a second time; GDB should detect that the executable has changed
 # and reset the breakpoints correctly.
@@ -120,8 +120,8 @@ if [is_remote target] {
 } else {
 
     # Put the older executable back in place.
-    gdb_test "shell mv ${binfile} ${binfile2}" "" ""
-    gdb_test "shell mv ${binfile1} ${binfile}" "" ""
+    gdb_test "shell mv ${binfile} ${binfile2}" ".*" ""
+    gdb_test "shell mv ${binfile1} ${binfile}" ".*" ""
 
     # Restart GDB entirely.
     gdb_start
@@ -155,8 +155,8 @@ if [is_remote target] {
     # Now move the newer executable into place, and re-run.  GDB
     # should still notice that the executable file has changed,
     # and still re-set the breakpoint appropriately.
-    gdb_test "shell mv ${binfile} ${binfile1}" "" ""
-    gdb_test "shell mv ${binfile2} ${binfile}" "" ""
+    gdb_test "shell mv ${binfile} ${binfile1}" ".*" ""
+    gdb_test "shell mv ${binfile2} ${binfile}" ".*" ""
     gdb_run_cmd
     gdb_expect {
 	-re ".*Breakpoint.* foo .* at .*:9.*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp
index 4a2eb87f3f..708a1c2de6 100644
--- a/gdb/testsuite/gdb.base/restore.exp
+++ b/gdb/testsuite/gdb.base/restore.exp
@@ -98,7 +98,7 @@ proc restore_tests { } {
 	    }
 	}
     } else {
-	gdb_test "continue" "" ""
+	gdb_test "continue" ".*" ""
     }
 }
 
diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp
index a11199adef..a12b805278 100644
--- a/gdb/testsuite/gdb.base/shlib-call.exp
+++ b/gdb/testsuite/gdb.base/shlib-call.exp
@@ -94,7 +94,7 @@ if ![gdb_skip_stdio_test "next over shr1"] {
 	"address of sgs is $hex.*g = shr2\\(g\\);" \
 	"next over shr1"
 } else {
-    gdb_test "next" "" ""
+    gdb_test "next" ".*" ""
 }
 
 
diff --git a/gdb/testsuite/gdb.base/valgrind-db-attach.exp b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
index 05540e78cb..9ef36d02a9 100644
--- a/gdb/testsuite/gdb.base/valgrind-db-attach.exp
+++ b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
@@ -71,7 +71,7 @@ gdb_test_multiple "" $test {
     }
 }
 
-gdb_test "" "" "eat first prompt"
+gdb_test "" ".*" "eat first prompt"
 
 # Initialization from default_gdb_start.
 gdb_test_no_output "set height 0"
diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index ecb345593a..c061591531 100644
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -87,7 +87,7 @@ proc local_compiler_xfail_check_2 { } {
     }
 }
 
-gdb_test "break marker1" "" ""
+gdb_test "break marker1" ".*" ""
 
 gdb_test_multiple "cont" "continue to marker1" {
     -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp
index a8ff3edb6b..37bef99442 100644
--- a/gdb/testsuite/gdb.base/watchpoints.exp
+++ b/gdb/testsuite/gdb.base/watchpoints.exp
@@ -48,8 +48,8 @@ gdb_load $binfile
     }
 
     runto_main
-    gdb_test "watch ival1" "" ""
-    gdb_test "watch ival3" "" ""
+    gdb_test "watch ival1" ".*" ""
+    gdb_test "watch ival3" ".*" ""
 
     set prev_timeout $timeout
     set timeout 600
diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
index 49774e396e..e5d65ca2d5 100644
--- a/gdb/testsuite/gdb.cp/classes.exp
+++ b/gdb/testsuite/gdb.cp/classes.exp
@@ -584,13 +584,13 @@ proc do_tests {} {
     # are any more instructions to finish the function call.
     gdb_test_multiple "finish" "" {
 	-re "enums2 \\(\\);.*$gdb_prompt $" {
-	    gdb_test "next" "" ""
+	    gdb_test "next" ".*" ""
 	}
 	-re "$gdb_prompt $" { }
     }
     test_enums
 
-    gdb_test "finish" "" ""
+    gdb_test "finish" ".*" ""
     test_pointers_to_class_members
     test_static_members
 
diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
index baa080ddd7..e1212d3feb 100644
--- a/gdb/testsuite/gdb.python/py-frame.exp
+++ b/gdb/testsuite/gdb.python/py-frame.exp
@@ -82,7 +82,7 @@ gdb_test "python print bf1.read_var(\"i\", sb).type" "int" "test int i"
 
 gdb_breakpoint "f2"
 gdb_continue_to_breakpoint "breakpoint at f2"
-gdb_test "up" "" ""
+gdb_test "up" ".*" ""
 
 gdb_py_test_silent_cmd "python f1 = gdb.selected_frame ()" "get second frame" 0
 gdb_py_test_silent_cmd "python f0 = f1.newer ()" "get first frame" 0
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index 39a456f33b..a24bc11b0f 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -122,9 +122,9 @@ proc test_value_numeric_ops {} {
   # Test pointer arithmethic
 
   # First, obtain the pointers
-  gdb_test "print (void *) 2" "" ""
+  gdb_test "print (void *) 2" ".*" ""
   gdb_test_no_output "python a = gdb.history (0)" ""
-  gdb_test "print (void *) 5" "" ""
+  gdb_test "print (void *) 5" ".*" ""
   gdb_test_no_output "python b = gdb.history (0)" ""
 
   gdb_test "python print 'result = ' + str(a+5)" " = 0x7" "add pointer value with python integer"
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index ae4e6285b5..4fa2cf0f7c 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -34,8 +34,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 gdb_load $binfile
-gdb_test "tstop"       "" ""
-gdb_test "tfind none"  "" ""
+gdb_test "tstop"       ".*" ""
+gdb_test "tfind none"  ".*" ""
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
@@ -164,14 +164,14 @@ gdb_trace_setactions "8.6: setup TP to collect stack mem cast expr" \
        "$tdp6" \
        "collect $fpreg, \(\*\(void \*\*\) \($spreg\)\) @ 64" "^$"
 
-gdb_test "tstart" "" ""
+gdb_test "tstart" ".*" ""
 
-gdb_test "break end" "" ""
+gdb_test "break end" ".*" ""
 gdb_test "continue" \
     "Continuing.*Breakpoint $decimal, end.*" \
     "run trace experiment"
 
-gdb_test "tstop" "" ""
+gdb_test "tstop" ".*" ""
 
 proc gdb_backtrace_tdp_1 { msg } {
     global gdb_prompt
@@ -337,4 +337,4 @@ gdb_test "printf \"x \%d x\\n\", depth == 3" \
 	"1.13: trace in recursion: depth not equal to 3"
 
 # Finished!
-gdb_test "tfind none" "" ""
+gdb_test "tfind none" ".*" ""
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index 2cc360f09d..87e414cdb0 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -117,10 +117,10 @@ proc gdb_trace_circular_tests { } {
 
     if [trace_buffer_normal] then { return 1; }
 
-    gdb_test "break begin" "" ""
-    gdb_test "break end"   "" ""
-    gdb_test "tstop"       "" ""
-    gdb_test "tfind none"  "" ""
+    gdb_test "break begin" ".*" ""
+    gdb_test "break end"   ".*" ""
+    gdb_test "tstop"       ".*" ""
+    gdb_test "tfind none"  ".*" ""
 
     if [setup_tracepoints] then { return 1; }
 
@@ -213,4 +213,4 @@ if { ![gdb_trace_circular_tests] } then {
 }
 
 # Finished!
-gdb_test "tfind none" "" ""
+gdb_test "tfind none" ".*" ""
diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index ffa7eb7a55..6fd24a3338 100644
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -86,8 +86,8 @@ proc prepare_for_trace_test {} {
 
     runto_main
 
-    gdb_test "break begin" "" ""
-    gdb_test "break end" "" ""
+    gdb_test "break begin" ".*" ""
+    gdb_test "break end" ".*" ""
 }
 
 proc run_trace_experiment { msg test_func } {
@@ -635,4 +635,4 @@ if { ![gdb_target_supports_trace] } then {
 gdb_trace_collection_test
 
 # Finished!
-gdb_test "tfind none" "" ""
+gdb_test "tfind none" ".*" ""
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index 3a7ab3ac5e..be89ee6edc 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -34,8 +34,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 gdb_load $binfile
-gdb_test "tstop"       "" ""
-gdb_test "tfind none"  "" ""
+gdb_test "tstop"       ".*" ""
+gdb_test "tfind none"  ".*" ""
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
@@ -48,7 +48,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 #
 
 gdb_delete_tracepoints
-gdb_test "trace gdb_c_test" "" ""
+gdb_test "trace gdb_c_test" ".*" ""
 gdb_trace_setactions "setup collect actions" \
 	"" \
 	"collect parm\[0\], parm\[1\], parm\[2\], parm\[3\]" "^$" \
@@ -61,7 +61,7 @@ gdb_trace_setactions "setup collect actions" \
 	"end" ""
 
 gdb_test_no_output "tstart" "survive the long packet send"
-gdb_test "break end" "" ""
+gdb_test "break end" ".*" ""
 gdb_test "continue" \
     "Continuing.*Breakpoint $decimal, end.*" \
     "run trace experiment"
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index ec7d435c97..3d5bc0a34f 100644
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -34,8 +34,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 gdb_load $binfile
-gdb_test "tstop"       "" ""
-gdb_test "tfind none"  "" ""
+gdb_test "tstop"       ".*" ""
+gdb_test "tfind none"  ".*" ""
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
@@ -93,45 +93,45 @@ gdb_test "passcount 2 $tdp3" "Setting tracepoint $tdp3's passcount to 2" \
 gdb_test "passcount 3 $tdp4" "Setting tracepoint $tdp4's passcount to 3" \
 	"4.5: set passcount for tracepoint $tdp4"
 
-gdb_test "tstart" "" ""
+gdb_test "tstart" ".*" ""
 
-gdb_test "break end" "" ""
+gdb_test "break end" ".*" ""
 gdb_test "continue" \
     "Continuing.*Breakpoint $decimal, end.*" \
     "run trace experiment"
-gdb_test "tstop" "" ""
+gdb_test "tstop" ".*" ""
 
-gdb_test "tfind none" "" ""
+gdb_test "tfind none" ".*" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x -1 x" ""] {
     untested passc-dyn.exp
     return -1
 }
 
-gdb_test "tfind tracepoint $tdp2" "" ""
+gdb_test "tfind tracepoint $tdp2" ".*" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 0 x" ""] {
     untested passc-dyn.exp
     return -1
 }
 
-gdb_test "tfind tracepoint $tdp3" "" ""
+gdb_test "tfind tracepoint $tdp3" ".*" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 1 x" ""] {
     untested passc-dyn.exp
     return -1
 }
 
-gdb_test "tfind tracepoint $tdp4" "" ""
+gdb_test "tfind tracepoint $tdp4" ".*" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 2 x" ""] {
     untested passc-dyn.exp
     return -1
 }
 
-gdb_test "tfind tracepoint $tdp2" "" ""
+gdb_test "tfind tracepoint $tdp2" ".*" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 3 x" ""] {
     untested passc-dyn.exp
     return -1
 }
 
-gdb_test "tfind tracepoint $tdp3" "" ""
+gdb_test "tfind tracepoint $tdp3" ".*" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 4 x" ""] {
     untested passc-dyn.exp
     return -1
@@ -144,5 +144,5 @@ if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 4 x" ""] {
 gdb_test "tfind" "failed to find.*" "4.5: dynamic passcount test"
 
 # Finished!
-gdb_test "tfind none" "" ""
+gdb_test "tfind none" ".*" ""
 
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index b9cec99ad7..591ddf1e50 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -34,8 +34,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 gdb_load $binfile
-gdb_test "tstop"       "" ""
-gdb_test "tfind none"  "" ""
+gdb_test "tstop"       ".*" ""
+gdb_test "tfind none"  ".*" ""
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
@@ -180,14 +180,14 @@ gdb_trace_setactions "9.x: setup TP to collect expressions" \
 	"$tdp6" \
 	"collect gdb_char_test, gdb_short_test, gdb_long_test" "^$"
 
-gdb_test "tstart" "" ""
+gdb_test "tstart" ".*" ""
 
-gdb_test "break end" "" ""
+gdb_test "break end" ".*" ""
 gdb_test "continue" \
     "Continuing.*Breakpoint $decimal, end.*" \
     "run trace experiment"
 
-gdb_test "tstop" "" ""
+gdb_test "tstop" ".*" ""
 
 #
 # 9.1 test the tdump command
diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp
index 59bed78148..0cbeb68aee 100644
--- a/gdb/testsuite/gdb.trace/tfile.exp
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -52,13 +52,13 @@ gdb_load $binfile
 
 runto_main
 
-gdb_test "break done_making_trace_files" "" ""
+gdb_test "break done_making_trace_files" ".*" ""
 
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 
 # tsave command would be tested here...
 
-gdb_test "continue" "" ""
+gdb_test "continue" ".*" ""
 
 # Program has presumably exited, now target a trace file it created.
 
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index e448850114..a89bce6a95 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -36,8 +36,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
     return -1
 }
 gdb_load $binfile
-gdb_test "tstop"       "" ""
-gdb_test "tfind none"  "" ""
+gdb_test "tstop"       ".*" ""
+gdb_test "tfind none"  ".*" ""
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
@@ -111,7 +111,7 @@ gdb_test "tstatus" "\[Tt\]race is running.*" "test tstatus on"
 # 6.2 test help tstart
 gdb_test "help tstart" "Start trace data collection." "6.2: help tstart"
 
-gdb_test "break end" "" ""
+gdb_test "break end" ".*" ""
 gdb_test "continue" \
     "Continuing.*Breakpoint $decimal, end.*" \
     "run trace experiment"
diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index 2831d25b92..8c8864ff00 100644
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -35,8 +35,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 gdb_load $binfile
-gdb_test "tstop"       "" ""
-gdb_test "tfind none"  "" ""
+gdb_test "tstop"       ".*" ""
+gdb_test "tfind none"  ".*" ""
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
@@ -67,8 +67,8 @@ proc test_while_stepping { while_stepping } {
 
     clean_restart $executable
 
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
+    gdb_test "tstop" ".*" ""
+    gdb_test "tfind none" ".*" ""
     runto_main
 
     ## verify number of trace frames collected matches stepcount
@@ -86,14 +86,14 @@ proc test_while_stepping { while_stepping } {
 	"end" "^$" \
 	"end" ""
 
-    gdb_test "tstart" "" ""
+    gdb_test "tstart" ".*" ""
 
-    gdb_test "break end" "" ""
+    gdb_test "break end" ".*" ""
     gdb_test "continue" \
 	"Continuing.*Breakpoint $decimal, end.*" \
 	"$while_stepping: run trace experiment"
 
-    gdb_test "tstop" "" ""
+    gdb_test "tstop" ".*" ""
 
     gdb_tfind_test "$while_stepping: frame 5 should be the last one collected" "5" "5"
 
@@ -107,7 +107,7 @@ proc test_while_stepping { while_stepping } {
 	}
     }
 
-    gdb_test "tfind none" "" ""
+    gdb_test "tfind none" ".*" ""
 }
 
 # Test all while-stepping aliases.
-- 
2.11.0