public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [PATCH v2 7/8] Fix test names starting with uppercase using multi-line gdb_test_multiple
  2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
  2016-11-25 20:54 ` [PATCH v2 6/8] Fix test names starting with uppercase using multi-line gdb_test_no_output Luis Machado
@ 2016-11-25 20:54 ` Luis Machado
  2016-11-30 20:47   ` Pedro Alves
  2016-11-25 20:54 ` [PATCH v2 3/8] Fix test names starting with uppercase using gdb_test_no_output Luis Machado
                   ` (6 subsequent siblings)
  8 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-25 20:54 UTC (permalink / raw)
  To: gdb-patches

This fixes offender testcases that have test names starting with uppercase
when using gdb_test_multiple in a multi-line construct.

gdb/testsuite/ChangeLog
2016-11-25  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names starting with uppercase throughout the files.

	* gdb/testsuite/gdb.cp/gdb2495.exp
---
 gdb/testsuite/gdb.cp/gdb2495.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp
index dff5977..7e4dfa8 100644
--- a/gdb/testsuite/gdb.cp/gdb2495.exp
+++ b/gdb/testsuite/gdb.cp/gdb2495.exp
@@ -95,7 +95,7 @@ gdb_test "info breakpoints" \
 
 # Turn off this new behaviour.
 gdb_test_multiple "set unwind-on-terminating-exception off" \
-    "Turn unwind-on-terminating-exception off" {
+    "turn unwind-on-terminating-exception off" {
     -re "$gdb_prompt $" {pass "set unwinn-on-terminating-exception off"}
     timeout {fail "(timeout) set unwind-on-terminating-exception off"}
 }
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v2 3/8] Fix test names starting with uppercase using gdb_test_no_output
  2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
  2016-11-25 20:54 ` [PATCH v2 6/8] Fix test names starting with uppercase using multi-line gdb_test_no_output Luis Machado
  2016-11-25 20:54 ` [PATCH v2 7/8] Fix test names starting with uppercase using multi-line gdb_test_multiple Luis Machado
@ 2016-11-25 20:54 ` Luis Machado
  2016-11-27 16:58   ` Yao Qi
  2016-11-25 20:55 ` [PATCH v2 1/8] Fix test names starting with uppercase output by basic functions Luis Machado
                   ` (5 subsequent siblings)
  8 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-25 20:54 UTC (permalink / raw)
  To: gdb-patches

This fixes offender testcases that have test names starting with uppercase
when using gdb_test_no_output in a single-line construct.

gdb/testsuite/ChangeLog
2016-11-25  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names starting with uppercase throughout the files.

	* gdb/testsuite/gdb.base/charset.exp
	* gdb/testsuite/gdb.base/eval.exp
	* gdb/testsuite/gdb.base/multi-forks.exp
	* gdb/testsuite/gdb.guile/scm-progspace.exp
	* gdb/testsuite/gdb.opencl/datatypes.exp
	* gdb/testsuite/gdb.python/py-block.exp
	* gdb/testsuite/gdb.python/py-function.exp
	* gdb/testsuite/gdb.python/py-symbol.exp
	* gdb/testsuite/gdb.python/py-symtab.exp
	* gdb/testsuite/gdb.python/py-xmethods.exp
	* gdb/testsuite/gdb.reverse/break-precsave.exp
	* gdb/testsuite/gdb.reverse/break-reverse.exp
	* gdb/testsuite/gdb.reverse/consecutive-precsave.exp
	* gdb/testsuite/gdb.reverse/consecutive-reverse.exp
	* gdb/testsuite/gdb.reverse/finish-precsave.exp
	* gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
	* gdb/testsuite/gdb.reverse/finish-reverse.exp
	* gdb/testsuite/gdb.reverse/fstatat-reverse.exp
	* gdb/testsuite/gdb.reverse/getresuid-reverse.exp
	* gdb/testsuite/gdb.reverse/i386-precsave.exp
	* gdb/testsuite/gdb.reverse/i386-reverse.exp
	* gdb/testsuite/gdb.reverse/i386-sse-reverse.exp
	* gdb/testsuite/gdb.reverse/i387-stack-reverse.exp
	* gdb/testsuite/gdb.reverse/insn-reverse.exp
	* gdb/testsuite/gdb.reverse/machinestate-precsave.exp
	* gdb/testsuite/gdb.reverse/machinestate.exp
	* gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
	* gdb/testsuite/gdb.reverse/pipe-reverse.exp
	* gdb/testsuite/gdb.reverse/readv-reverse.exp
	* gdb/testsuite/gdb.reverse/recvmsg-reverse.exp
	* gdb/testsuite/gdb.reverse/rerun-prec.exp
	* gdb/testsuite/gdb.reverse/s390-mvcle.exp
	* gdb/testsuite/gdb.reverse/sigall-precsave.exp
	* gdb/testsuite/gdb.reverse/sigall-reverse.exp
	* gdb/testsuite/gdb.reverse/solib-precsave.exp
	* gdb/testsuite/gdb.reverse/solib-reverse.exp
	* gdb/testsuite/gdb.reverse/step-precsave.exp
	* gdb/testsuite/gdb.reverse/step-reverse.exp
	* gdb/testsuite/gdb.reverse/time-reverse.exp
	* gdb/testsuite/gdb.reverse/until-precsave.exp
	* gdb/testsuite/gdb.reverse/until-reverse.exp
	* gdb/testsuite/gdb.reverse/waitpid-reverse.exp
	* gdb/testsuite/gdb.reverse/watch-precsave.exp
	* gdb/testsuite/gdb.reverse/watch-reverse.exp
---
 gdb/testsuite/gdb.base/charset.exp                      | 2 +-
 gdb/testsuite/gdb.base/eval.exp                         | 2 +-
 gdb/testsuite/gdb.base/multi-forks.exp                  | 2 +-
 gdb/testsuite/gdb.guile/scm-progspace.exp               | 2 +-
 gdb/testsuite/gdb.opencl/datatypes.exp                  | 6 +++---
 gdb/testsuite/gdb.python/py-block.exp                   | 4 ++--
 gdb/testsuite/gdb.python/py-function.exp                | 4 ++--
 gdb/testsuite/gdb.python/py-symbol.exp                  | 2 +-
 gdb/testsuite/gdb.python/py-symtab.exp                  | 4 ++--
 gdb/testsuite/gdb.python/py-xmethods.exp                | 2 +-
 gdb/testsuite/gdb.reverse/break-precsave.exp            | 2 +-
 gdb/testsuite/gdb.reverse/break-reverse.exp             | 2 +-
 gdb/testsuite/gdb.reverse/consecutive-precsave.exp      | 2 +-
 gdb/testsuite/gdb.reverse/consecutive-reverse.exp       | 2 +-
 gdb/testsuite/gdb.reverse/finish-precsave.exp           | 2 +-
 gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp       | 2 +-
 gdb/testsuite/gdb.reverse/finish-reverse.exp            | 2 +-
 gdb/testsuite/gdb.reverse/fstatat-reverse.exp           | 2 +-
 gdb/testsuite/gdb.reverse/getresuid-reverse.exp         | 2 +-
 gdb/testsuite/gdb.reverse/i386-precsave.exp             | 2 +-
 gdb/testsuite/gdb.reverse/i386-reverse.exp              | 2 +-
 gdb/testsuite/gdb.reverse/i386-sse-reverse.exp          | 2 +-
 gdb/testsuite/gdb.reverse/i387-stack-reverse.exp        | 2 +-
 gdb/testsuite/gdb.reverse/insn-reverse.exp              | 2 +-
 gdb/testsuite/gdb.reverse/machinestate-precsave.exp     | 2 +-
 gdb/testsuite/gdb.reverse/machinestate.exp              | 2 +-
 gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp | 2 +-
 gdb/testsuite/gdb.reverse/pipe-reverse.exp              | 2 +-
 gdb/testsuite/gdb.reverse/readv-reverse.exp             | 2 +-
 gdb/testsuite/gdb.reverse/recvmsg-reverse.exp           | 2 +-
 gdb/testsuite/gdb.reverse/rerun-prec.exp                | 2 +-
 gdb/testsuite/gdb.reverse/s390-mvcle.exp                | 2 +-
 gdb/testsuite/gdb.reverse/sigall-precsave.exp           | 2 +-
 gdb/testsuite/gdb.reverse/sigall-reverse.exp            | 2 +-
 gdb/testsuite/gdb.reverse/solib-precsave.exp            | 2 +-
 gdb/testsuite/gdb.reverse/solib-reverse.exp             | 2 +-
 gdb/testsuite/gdb.reverse/step-precsave.exp             | 2 +-
 gdb/testsuite/gdb.reverse/step-reverse.exp              | 2 +-
 gdb/testsuite/gdb.reverse/time-reverse.exp              | 2 +-
 gdb/testsuite/gdb.reverse/until-precsave.exp            | 2 +-
 gdb/testsuite/gdb.reverse/until-reverse.exp             | 2 +-
 gdb/testsuite/gdb.reverse/waitpid-reverse.exp           | 2 +-
 gdb/testsuite/gdb.reverse/watch-precsave.exp            | 2 +-
 gdb/testsuite/gdb.reverse/watch-reverse.exp             | 2 +-
 44 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index a376461..5e930ef 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -591,7 +591,7 @@ gdb_test "print 'a' == 'a' || 'b' == 'b'" \
 
 
 proc string_display { var_name set_prefix x_size x_type} {
-  gdb_test_no_output "set ${var_name} = ${set_prefix}\"Test String\\0with zeroes\"" "Assign ${var_name} with prefix ${set_prefix}"
+  gdb_test_no_output "set ${var_name} = ${set_prefix}\"Test String\\0with zeroes\"" "assign ${var_name} with prefix ${set_prefix}"
   gdb_test "x /2${x_size}s ${var_name}" ".*\t${x_type}\"Test String\"\[\r\n\]+.*\t${x_type}\"with zeroes\"" "display String ${var_name} with x/${x_size}s"
 }
 
diff --git a/gdb/testsuite/gdb.base/eval.exp b/gdb/testsuite/gdb.base/eval.exp
index f47e7e3..4dc6e8c 100644
--- a/gdb/testsuite/gdb.base/eval.exp
+++ b/gdb/testsuite/gdb.base/eval.exp
@@ -16,7 +16,7 @@
 gdb_exit
 gdb_start
 
-gdb_test_no_output "set \$a = 10" "Initialize \$a."
+gdb_test_no_output "set \$a = 10" "initialize \$a."
 
 gdb_test "eval \"echo %d\\n\", \$a++" "10" "first eval."
 gdb_test "eval \"echo %d\\n\", \$a*2" "22" "second eval."
diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index c2e113b..d3f5700 100644
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -178,7 +178,7 @@ gdb_test "detach inferior 5" "Detaching .*" "detach 5"
 #
 
 for {set i 6} { $i <= 16} {incr i} {
-    gdb_test_no_output "kill inferior $i" "Kill $i"
+    gdb_test_no_output "kill inferior $i" "kill $i"
     gdb_test "info inferior $i" "<null>.*" "did kill $i"
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-progspace.exp b/gdb/testsuite/gdb.guile/scm-progspace.exp
index c9ae23a..fc202d6 100644
--- a/gdb/testsuite/gdb.guile/scm-progspace.exp
+++ b/gdb/testsuite/gdb.guile/scm-progspace.exp
@@ -75,7 +75,7 @@ with_test_prefix "program unloaded" {
 
 gdb_test "add-inferior" "Added inferior 2" "create new inferior"
 gdb_test "inferior 2" ".*" "switch to new inferior"
-gdb_test_no_output "remove-inferiors 1" "Remove first inferior"
+gdb_test_no_output "remove-inferiors 1" "remove first inferior"
 
 with_test_prefix "inferior removed" {
     gdb_test "gu (print (progspace-valid? progspace))" "= #f"
diff --git a/gdb/testsuite/gdb.opencl/datatypes.exp b/gdb/testsuite/gdb.opencl/datatypes.exp
index 95d5b70..5beb74a 100644
--- a/gdb/testsuite/gdb.opencl/datatypes.exp
+++ b/gdb/testsuite/gdb.opencl/datatypes.exp
@@ -36,7 +36,7 @@ gdb_exit
 gdb_start
 
 # Manually switch the language to opencl
-gdb_test_no_output "set language opencl" "No prompt when setting the language to opencl"
+gdb_test_no_output "set language opencl" "no prompt when setting the language to opencl"
 
 # Check OpenCL data types (GDB)
 gdb_test "whatis bool" "type = bool"
@@ -194,8 +194,8 @@ gdb_test "whatis double16" "type = double16"
 gdb_test "p sizeof(double16)" " = 128"
 
 # Set the language back to the default: "auto; currently c"
-gdb_test_no_output "set language c" "No prompt when setting the language to c"
-gdb_test_no_output "set language auto" "No prompt when setting the language to auto"
+gdb_test_no_output "set language c" "no prompt when setting the language to c"
+gdb_test_no_output "set language auto" "no prompt when setting the language to auto"
 
 # Load the OpenCL app
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index e04cb76..88de4a9 100644
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -55,9 +55,9 @@ gdb_test "python print (gblock.is_global)" "True" "is the global block"
 gdb_test "python print (sblock.is_static)" "True" "is the static block"
 
 # Move up superblock(s) until we reach function block_func.
-gdb_test_no_output "python block = block.superblock" "Get superblock"
+gdb_test_no_output "python block = block.superblock" "get superblock"
 gdb_test "python print (block.function)" "None" "second anonymous block"
-gdb_test_no_output "python block = block.superblock" "Get superblock 2"
+gdb_test_no_output "python block = block.superblock" "get superblock 2"
 gdb_test "python print (block.function)" "block_func" \
          "Print superblock 2 function"
 
diff --git a/gdb/testsuite/gdb.python/py-function.exp b/gdb/testsuite/gdb.python/py-function.exp
index a1beabc..4950f28 100644
--- a/gdb/testsuite/gdb.python/py-function.exp
+++ b/gdb/testsuite/gdb.python/py-function.exp
@@ -103,6 +103,6 @@ gdb_py_test_multiple "input command-calling function" \
   "CallCommand ()" "" \
   "end" ""
 
-gdb_test_no_output "set var \$foo = \$call_command()" "Setting a value from a function which executes a command."
+gdb_test_no_output "set var \$foo = \$call_command()" "setting a value from a function which executes a command."
 # There was a bug where GDB would segfault in the second call, so try calling again.
-gdb_test_no_output "set var \$foo = \$call_command()" "Setting a value from a function which executes a command, again."
+gdb_test_no_output "set var \$foo = \$call_command()" "setting a value from a function which executes a command, again."
diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
index fa05962..c4b3f2e 100644
--- a/gdb/testsuite/gdb.python/py-symbol.exp
+++ b/gdb/testsuite/gdb.python/py-symbol.exp
@@ -178,4 +178,4 @@ gdb_test "python print (a\[0\].is_valid())" "True" "test symbol validity"
 delete_breakpoints
 gdb_unload
 gdb_test "python print (a\[0\].is_valid())" "False" "test symbol non-validity"
-gdb_test_no_output "python a = None" "Test symbol destructor"
+gdb_test_no_output "python a = None" "test symbol destructor"
diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp
index 2acfe1c..f6225eb 100644
--- a/gdb/testsuite/gdb.python/py-symtab.exp
+++ b/gdb/testsuite/gdb.python/py-symtab.exp
@@ -82,5 +82,5 @@ gdb_unload
 gdb_test "python print (sal.is_valid())" "False" "test sal.is_valid"
 gdb_test "python print (symtab.is_valid())" "False" "test symtab.is_valid()"
 
-gdb_test_no_output "python sal = None" "Test sal destructor"
-gdb_test_no_output "python symtab = None" "Test symtab destructor"
+gdb_test_no_output "python sal = None" "test sal destructor"
+gdb_test_no_output "python symtab = None" "test symtab destructor"
diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
index 5490c03..0d7957f 100644
--- a/gdb/testsuite/gdb.python/py-xmethods.exp
+++ b/gdb/testsuite/gdb.python/py-xmethods.exp
@@ -152,7 +152,7 @@ gdb_test_no_output "disable xmethod progspace E_methods;method_int" \
   "disable xmethod progspace E_methods;method_int"
 gdb_test "info xmethod progspace E_methods;method_int" ".* \\\[disabled\\\]" \
   "info xmethod xmethods E_methods;method_int"
-gdb_test_no_output "disable xmethod progspace G_methods" "Disable G_methods 2"
+gdb_test_no_output "disable xmethod progspace G_methods" "disable G_methods 2"
 gdb_test "info xmethod progspace" ".*G_methods \\\[disabled\\\].*" \
   "info xmethod progspace"
 
diff --git a/gdb/testsuite/gdb.reverse/break-precsave.exp b/gdb/testsuite/gdb.reverse/break-precsave.exp
index 7140aa7..348234d 100644
--- a/gdb/testsuite/gdb.reverse/break-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/break-precsave.exp
@@ -41,7 +41,7 @@ proc precsave_tests {} {
 
     if [supports_process_record] {
 	# Activate process record/replay
-	gdb_test_no_output "record" "Turn on process record"
+	gdb_test_no_output "record" "turn on process record"
     }
 
     gdb_test "break $end_location" \
diff --git a/gdb/testsuite/gdb.reverse/break-reverse.exp b/gdb/testsuite/gdb.reverse/break-reverse.exp
index 90a20db..33fe6e9 100644
--- a/gdb/testsuite/gdb.reverse/break-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/break-reverse.exp
@@ -35,7 +35,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break foo" \
diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
index be34a43..ff86051 100644
--- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
@@ -32,7 +32,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 set end_location  [gdb_get_line_number "end of main"  ]
diff --git a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp
index c230f67..0d5aadb 100644
--- a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp
@@ -30,7 +30,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_breakpoint foo
diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp
index fcaf89c..65a3af1 100644
--- a/gdb/testsuite/gdb.reverse/finish-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp
@@ -31,7 +31,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 # Run until end, then save execution log. 
diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
index 795a313..f5e3772 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
@@ -36,7 +36,7 @@ if ![runto_main] then {
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 set breakloc [gdb_get_line_number "VOID FUNC" "$srcfile"]
diff --git a/gdb/testsuite/gdb.reverse/finish-reverse.exp b/gdb/testsuite/gdb.reverse/finish-reverse.exp
index 07e2f53..6760b3a 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse.exp
@@ -30,7 +30,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 # Test finish from void func
diff --git a/gdb/testsuite/gdb.reverse/fstatat-reverse.exp b/gdb/testsuite/gdb.reverse/fstatat-reverse.exp
index 79a642d..3d1c4fd 100644
--- a/gdb/testsuite/gdb.reverse/fstatat-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/fstatat-reverse.exp
@@ -33,7 +33,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break marker2" \
diff --git a/gdb/testsuite/gdb.reverse/getresuid-reverse.exp b/gdb/testsuite/gdb.reverse/getresuid-reverse.exp
index d296a1d..330efaf 100644
--- a/gdb/testsuite/gdb.reverse/getresuid-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/getresuid-reverse.exp
@@ -33,7 +33,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break marker2" \
diff --git a/gdb/testsuite/gdb.reverse/i386-precsave.exp b/gdb/testsuite/gdb.reverse/i386-precsave.exp
index 8d07f95..81788d6 100644
--- a/gdb/testsuite/gdb.reverse/i386-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/i386-precsave.exp
@@ -48,7 +48,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 global hex
diff --git a/gdb/testsuite/gdb.reverse/i386-reverse.exp b/gdb/testsuite/gdb.reverse/i386-reverse.exp
index 901a64b..0c6b16d 100644
--- a/gdb/testsuite/gdb.reverse/i386-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/i386-reverse.exp
@@ -46,7 +46,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 global hex
diff --git a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp
index 8ffac26..eff3911 100644
--- a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp
@@ -48,7 +48,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 global hex
diff --git a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp
index 2b3bc23..2bae54c 100644
--- a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp
@@ -36,7 +36,7 @@ runto main
 # Record to end of main
 
 set location [gdb_get_line_number "END I387-FLOAT-REVERSE"]
-gdb_test_no_output "record" "Turn on process record"
+gdb_test_no_output "record" "turn on process record"
 gdb_test "until $location" ".*$srcfile:$location.*" \
     "record to end of main"
 
diff --git a/gdb/testsuite/gdb.reverse/insn-reverse.exp b/gdb/testsuite/gdb.reverse/insn-reverse.exp
index a252959..3b8957e 100644
--- a/gdb/testsuite/gdb.reverse/insn-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/insn-reverse.exp
@@ -71,7 +71,7 @@ proc test { func } {
 	}
 
 	# Activate process record/replay
-	gdb_test_no_output "record" "Turn on process record"
+	gdb_test_no_output "record" "turn on process record"
 
 	# Registers contents before each forward single step.
 	set count 0
diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
index 95e50f3..02f1cca 100644
--- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
@@ -59,7 +59,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break $endmain" \
diff --git a/gdb/testsuite/gdb.reverse/machinestate.exp b/gdb/testsuite/gdb.reverse/machinestate.exp
index f79f719..ab94c94 100644
--- a/gdb/testsuite/gdb.reverse/machinestate.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate.exp
@@ -57,7 +57,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 # Proceed to end of main
diff --git a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
index e0cfcf7..2b8dffa 100644
--- a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
+++ b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
@@ -40,7 +40,7 @@ if ![runto_main] then {
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 set lineno [gdb_get_line_number "STEP INTO THIS CALL"]
diff --git a/gdb/testsuite/gdb.reverse/pipe-reverse.exp b/gdb/testsuite/gdb.reverse/pipe-reverse.exp
index d2497c0..0257851 100644
--- a/gdb/testsuite/gdb.reverse/pipe-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/pipe-reverse.exp
@@ -33,7 +33,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break marker2" \
diff --git a/gdb/testsuite/gdb.reverse/readv-reverse.exp b/gdb/testsuite/gdb.reverse/readv-reverse.exp
index 4f8846c..0f60fb6 100644
--- a/gdb/testsuite/gdb.reverse/readv-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/readv-reverse.exp
@@ -33,7 +33,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break marker2" \
diff --git a/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp b/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp
index b16d801..0a02950 100644
--- a/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp
@@ -33,7 +33,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break marker2" \
diff --git a/gdb/testsuite/gdb.reverse/rerun-prec.exp b/gdb/testsuite/gdb.reverse/rerun-prec.exp
index 4185dfc..a72e9a0 100644
--- a/gdb/testsuite/gdb.reverse/rerun-prec.exp
+++ b/gdb/testsuite/gdb.reverse/rerun-prec.exp
@@ -25,7 +25,7 @@ if {[prepare_for_testing $testfile.exp $testfile [list $srcfile]]} {
 
 # The bug is a regression in the sequence "run; record; run".
 runto main
-gdb_test_no_output "record" "Turn on process record"
+gdb_test_no_output "record" "turn on process record"
 
 gdb_run_cmd
 gdb_test_multiple "" "restarting inferior" {
diff --git a/gdb/testsuite/gdb.reverse/s390-mvcle.exp b/gdb/testsuite/gdb.reverse/s390-mvcle.exp
index 18d78b0..2effc82 100644
--- a/gdb/testsuite/gdb.reverse/s390-mvcle.exp
+++ b/gdb/testsuite/gdb.reverse/s390-mvcle.exp
@@ -36,7 +36,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break marker1" \
diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
index 8f72f46..24dff80 100644
--- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
@@ -154,7 +154,7 @@ runto gen_ABRT
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 # Run until end, then save execution log. 
diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
index 913d38a..9aec1eb 100644
--- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
@@ -153,7 +153,7 @@ runto gen_ABRT
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 # The list of signals that the program generates, in the order they
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index cfdcadf..8dbf355 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -83,7 +83,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 set end_of_main [gdb_get_line_number "end of main" ]
diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp
index 1389952..61c76d3 100644
--- a/gdb/testsuite/gdb.reverse/solib-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp
@@ -75,7 +75,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 #
diff --git a/gdb/testsuite/gdb.reverse/step-precsave.exp b/gdb/testsuite/gdb.reverse/step-precsave.exp
index 62c9489..11a56d5 100644
--- a/gdb/testsuite/gdb.reverse/step-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/step-precsave.exp
@@ -36,7 +36,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 set end_of_main [gdb_get_line_number "end of main" ]
diff --git a/gdb/testsuite/gdb.reverse/step-reverse.exp b/gdb/testsuite/gdb.reverse/step-reverse.exp
index 6f1e8b6..c88223c 100644
--- a/gdb/testsuite/gdb.reverse/step-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/step-reverse.exp
@@ -34,7 +34,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 # plain vanilla step/next (no count)
diff --git a/gdb/testsuite/gdb.reverse/time-reverse.exp b/gdb/testsuite/gdb.reverse/time-reverse.exp
index f2314a6..78d990c 100644
--- a/gdb/testsuite/gdb.reverse/time-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/time-reverse.exp
@@ -33,7 +33,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break marker2" \
diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp
index 5091200..471a7e1 100644
--- a/gdb/testsuite/gdb.reverse/until-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/until-precsave.exp
@@ -40,7 +40,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 set end_of_main [gdb_get_line_number "set breakpoint 10a here" ]
diff --git a/gdb/testsuite/gdb.reverse/until-reverse.exp b/gdb/testsuite/gdb.reverse/until-reverse.exp
index 07870f6..5e2ca04 100644
--- a/gdb/testsuite/gdb.reverse/until-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/until-reverse.exp
@@ -38,7 +38,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 # Verify that plain vanilla "until <location>" works.
diff --git a/gdb/testsuite/gdb.reverse/waitpid-reverse.exp b/gdb/testsuite/gdb.reverse/waitpid-reverse.exp
index e8a1690..ab999cd 100644
--- a/gdb/testsuite/gdb.reverse/waitpid-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/waitpid-reverse.exp
@@ -35,7 +35,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 gdb_test "break marker2" \
diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp
index 3c2f06e..ee24a48 100644
--- a/gdb/testsuite/gdb.reverse/watch-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp
@@ -33,7 +33,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 set end_location  [gdb_get_line_number "end of main"  ]
diff --git a/gdb/testsuite/gdb.reverse/watch-reverse.exp b/gdb/testsuite/gdb.reverse/watch-reverse.exp
index 7227801..5887e76 100644
--- a/gdb/testsuite/gdb.reverse/watch-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/watch-reverse.exp
@@ -32,7 +32,7 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 # Test software watchpoints
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v2 0/8] Fix gdb's testsuite test names
@ 2016-11-25 20:54 Luis Machado
  2016-11-25 20:54 ` [PATCH v2 6/8] Fix test names starting with uppercase using multi-line gdb_test_no_output Luis Machado
                   ` (8 more replies)
  0 siblings, 9 replies; 33+ messages in thread
From: Luis Machado @ 2016-11-25 20:54 UTC (permalink / raw)
  To: gdb-patches

Changes in v2:

* Patch 1/8 in v1 is now patch 8/8 in v2, due to organization issues. Patch 8/8
  does a few additional things in v2. Patches 2~8 in v1 are now 1~7 in v2.

Patch 1/8 and Patch 2/8
=========

* Fixed spurious whitespaces.

Patch 8/8
=========

* Updated compilation failure message and replaced existing ones to keep them
  standard.

All other patches have no meaningful changes.

v1 can be found here: https://sourceware.org/ml/gdb-patches/2016-11/msg00813.html

---

I was going to go with a single patch for this, but i kept hitting other
cases where i needed to adjust the regular expressions and substitution rules.

I then decided to have a series with each individual piece that should make it
easier to review as well. The changes are all pretty mechanical, but it would
be nice to have another pair of eyes looking at these to make sure nothing
incorrect got through.

The first patch handles the "testfile as test name" problem. The rest of the
series handles test names starting with uppercase.

---

Luis Machado (8):
  Fix test names starting with uppercase output by basic functions
  Fix test names starting with uppercase using gdb_test on a single
    line.
  Fix test names starting with uppercase using gdb_test_no_output
  Fix test names starting with uppercase using gdb_test_multiple
  Fix test names starting with uppercase using multi-line
    gdb_test/mi_gdb_test
  Fix test names starting with uppercase using multi-line
    gdb_test_no_output
  Fix test names starting with uppercase using multi-line
    gdb_test_multiple
  Fixup testcases outputting own name as a test name and standardize
    failed compilation messages

 gdb/testsuite/gdb.ada/array_return.exp             |  8 +--
 gdb/testsuite/gdb.ada/assign_1.exp                 |  2 +-
 gdb/testsuite/gdb.ada/boolean_expr.exp             |  2 +-
 gdb/testsuite/gdb.ada/catch_ex.exp                 |  6 +-
 gdb/testsuite/gdb.ada/expr_delims.exp              | 10 +--
 gdb/testsuite/gdb.ada/info_exc.exp                 |  2 +-
 gdb/testsuite/gdb.ada/mi_catch_ex.exp              |  6 +-
 gdb/testsuite/gdb.ada/mi_dyn_arr.exp               |  4 +-
 gdb/testsuite/gdb.ada/mi_ex_cond.exp               |  2 +-
 gdb/testsuite/gdb.ada/mi_exc_info.exp              |  2 +-
 gdb/testsuite/gdb.ada/mi_interface.exp             |  4 +-
 gdb/testsuite/gdb.ada/mi_task_arg.exp              |  2 +-
 gdb/testsuite/gdb.ada/mi_task_info.exp             |  2 +-
 gdb/testsuite/gdb.ada/mi_var_array.exp             |  4 +-
 gdb/testsuite/gdb.ada/start.exp                    |  4 +-
 gdb/testsuite/gdb.ada/watch_arg.exp                |  4 +-
 gdb/testsuite/gdb.arch/alpha-step.exp              |  6 +-
 gdb/testsuite/gdb.arch/altivec-regs.exp            |  4 +-
 gdb/testsuite/gdb.arch/amd64-disp-step.exp         |  2 +-
 gdb/testsuite/gdb.arch/arm-disp-step.exp           |  2 +-
 gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp    |  4 +-
 gdb/testsuite/gdb.arch/e500-prologue.exp           |  2 +-
 gdb/testsuite/gdb.arch/e500-regs.exp               |  4 +-
 gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp       | 10 +--
 gdb/testsuite/gdb.arch/gdb1291.exp                 |  2 +-
 gdb/testsuite/gdb.arch/gdb1431.exp                 |  2 +-
 gdb/testsuite/gdb.arch/gdb1558.exp                 |  4 +-
 gdb/testsuite/gdb.arch/i386-bp_permanent.exp       |  4 +-
 gdb/testsuite/gdb.arch/i386-disp-step.exp          |  2 +-
 gdb/testsuite/gdb.arch/i386-dr3-watch.exp          |  2 +-
 gdb/testsuite/gdb.arch/i386-float.exp              |  2 +-
 gdb/testsuite/gdb.arch/i386-gnu-cfi.exp            |  8 +--
 gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp    |  6 +-
 gdb/testsuite/gdb.arch/i386-mpx.exp                | 16 ++---
 gdb/testsuite/gdb.arch/i386-permbkpt.exp           |  4 +-
 gdb/testsuite/gdb.arch/i386-sse-stack-align.exp    |  2 +-
 gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp  |  2 +-
 gdb/testsuite/gdb.arch/mips16-thunks.exp           | 10 +--
 gdb/testsuite/gdb.arch/pa-nullify.exp              |  8 +--
 gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp    |  2 +-
 gdb/testsuite/gdb.arch/powerpc-d128-regs.exp       | 12 ++--
 gdb/testsuite/gdb.arch/powerpc-power.exp           |  2 +-
 gdb/testsuite/gdb.arch/ppc-dfp.exp                 |  4 +-
 gdb/testsuite/gdb.arch/s390-tdbregs.exp            |  4 +-
 gdb/testsuite/gdb.arch/spu-info.exp                |  2 +-
 gdb/testsuite/gdb.arch/spu-ls.exp                  |  2 +-
 gdb/testsuite/gdb.arch/thumb-bx-pc.exp             |  2 +-
 gdb/testsuite/gdb.arch/vsx-regs.exp                |  4 +-
 gdb/testsuite/gdb.base/advance.exp                 |  2 +-
 .../gdb.base/annota-input-while-running.exp        |  2 +-
 gdb/testsuite/gdb.base/annota1.exp                 |  2 +-
 gdb/testsuite/gdb.base/annota3.exp                 |  2 +-
 gdb/testsuite/gdb.base/arrayidx.exp                | 10 +--
 gdb/testsuite/gdb.base/asmlabel.exp                |  2 +-
 gdb/testsuite/gdb.base/assign.exp                  |  2 +-
 gdb/testsuite/gdb.base/async.exp                   |  2 +-
 gdb/testsuite/gdb.base/attach-wait-input.exp       |  2 +-
 gdb/testsuite/gdb.base/attach.exp                  |  4 +-
 .../gdb.base/auto-connect-native-target.exp        |  8 +--
 gdb/testsuite/gdb.base/auxv.exp                    |  2 +-
 gdb/testsuite/gdb.base/bang.exp                    |  2 +-
 .../gdb.base/batch-preserve-term-settings.exp      |  2 +-
 gdb/testsuite/gdb.base/bfp-test.exp                | 20 +++---
 gdb/testsuite/gdb.base/bigcore.exp                 |  8 +--
 gdb/testsuite/gdb.base/bitfields2.exp              |  2 +-
 gdb/testsuite/gdb.base/bp-permanent.exp            |  2 +-
 gdb/testsuite/gdb.base/break-always.exp            |  2 +-
 gdb/testsuite/gdb.base/break-fun-addr.exp          |  4 +-
 gdb/testsuite/gdb.base/break-idempotent.exp        |  4 +-
 .../gdb.base/break-main-file-remove-fail.exp       |  2 +-
 gdb/testsuite/gdb.base/break-probes.exp            |  2 +-
 gdb/testsuite/gdb.base/break-unload-file.exp       |  2 +-
 gdb/testsuite/gdb.base/break.exp                   | 18 ++---
 gdb/testsuite/gdb.base/breakpoint-shadow.exp       |  4 +-
 gdb/testsuite/gdb.base/call-ar-st.exp              |  2 +-
 gdb/testsuite/gdb.base/call-rt-st.exp              |  4 +-
 gdb/testsuite/gdb.base/call-sc.exp                 |  2 +-
 gdb/testsuite/gdb.base/call-signal-resume.exp      |  4 +-
 gdb/testsuite/gdb.base/call-strs.exp               |  2 +-
 gdb/testsuite/gdb.base/callexit.exp                |  6 +-
 gdb/testsuite/gdb.base/callfuncs.exp               |  6 +-
 gdb/testsuite/gdb.base/catch-fork-kill.exp         |  2 +-
 .../gdb.base/catch-gdb-caused-signals.exp          |  2 +-
 .../gdb.base/catch-signal-siginfo-cond.exp         |  2 +-
 gdb/testsuite/gdb.base/catch-syscall.exp           |  2 +-
 gdb/testsuite/gdb.base/charset.exp                 |  6 +-
 gdb/testsuite/gdb.base/checkpoint.exp              | 16 ++---
 gdb/testsuite/gdb.base/commands.exp                |  4 +-
 gdb/testsuite/gdb.base/compare-sections.exp        |  2 +-
 gdb/testsuite/gdb.base/completion.exp              |  2 +-
 gdb/testsuite/gdb.base/comprdebug.exp              |  4 +-
 gdb/testsuite/gdb.base/cond-eval-mode.exp          |  2 +-
 gdb/testsuite/gdb.base/condbreak-call-false.exp    |  2 +-
 gdb/testsuite/gdb.base/consecutive-step-over.exp   |  2 +-
 gdb/testsuite/gdb.base/constvars.exp               |  2 +-
 gdb/testsuite/gdb.base/coredump-filter.exp         |  2 +-
 gdb/testsuite/gdb.base/cursal.exp                  |  2 +-
 gdb/testsuite/gdb.base/cvexpr.exp                  |  2 +-
 gdb/testsuite/gdb.base/debug-expr.exp              |  2 +-
 gdb/testsuite/gdb.base/del.exp                     |  2 +-
 gdb/testsuite/gdb.base/detach.exp                  |  2 +-
 gdb/testsuite/gdb.base/dfp-test.exp                | 18 ++---
 gdb/testsuite/gdb.base/disabled-location.exp       |  2 +-
 gdb/testsuite/gdb.base/disasm-end-cu.exp           | 10 +--
 gdb/testsuite/gdb.base/display.exp                 |  4 +-
 gdb/testsuite/gdb.base/dmsym.exp                   |  6 +-
 .../gdb.base/double-prompt-target-event-error.exp  |  2 +-
 gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp    |  2 +-
 gdb/testsuite/gdb.base/dprintf-detach.exp          |  2 +-
 gdb/testsuite/gdb.base/dprintf-next.exp            |  2 +-
 gdb/testsuite/gdb.base/dprintf-non-stop.exp        |  4 +-
 gdb/testsuite/gdb.base/dprintf-pending.exp         |  2 +-
 gdb/testsuite/gdb.base/dso2dso.exp                 |  4 +-
 gdb/testsuite/gdb.base/dtrace-probe.exp            |  2 +-
 gdb/testsuite/gdb.base/dump.exp                    |  4 +-
 gdb/testsuite/gdb.base/echo.exp                    |  2 +-
 gdb/testsuite/gdb.base/ending-run.exp              |  6 +-
 gdb/testsuite/gdb.base/enum_cond.exp               |  2 +-
 gdb/testsuite/gdb.base/eval.exp                    |  6 +-
 gdb/testsuite/gdb.base/examine-backward.exp        |  2 +-
 gdb/testsuite/gdb.base/exe-lock.exp                |  2 +-
 gdb/testsuite/gdb.base/exec-invalid-sysroot.exp    |  6 +-
 .../gdb.base/execl-update-breakpoints.exp          |  8 +--
 gdb/testsuite/gdb.base/execution-termios.exp       |  2 +-
 gdb/testsuite/gdb.base/expand-psymtabs.exp         |  2 +-
 gdb/testsuite/gdb.base/exprs.exp                   |  2 +-
 gdb/testsuite/gdb.base/fileio.exp                  |  4 +-
 gdb/testsuite/gdb.base/find.exp                    |  2 +-
 gdb/testsuite/gdb.base/finish.exp                  |  2 +-
 gdb/testsuite/gdb.base/fixsection.exp              |  4 +-
 gdb/testsuite/gdb.base/float128.exp                | 12 ++--
 gdb/testsuite/gdb.base/floatn.exp                  | 40 +++++------
 gdb/testsuite/gdb.base/foll-exec-mode.exp          |  6 +-
 gdb/testsuite/gdb.base/foll-exec.exp               | 12 ++--
 gdb/testsuite/gdb.base/foll-vfork.exp              |  4 +-
 gdb/testsuite/gdb.base/fork-running-state.exp      |  2 +-
 gdb/testsuite/gdb.base/frame-args.exp              |  2 +-
 gdb/testsuite/gdb.base/fullpath-expand.exp         |  2 +-
 gdb/testsuite/gdb.base/func-ptr.exp                |  2 +-
 gdb/testsuite/gdb.base/gcore-buffer-overflow.exp   |  2 +-
 gdb/testsuite/gdb.base/gcore-relro-pie.exp         |  2 +-
 gdb/testsuite/gdb.base/gcore.exp                   |  4 +-
 gdb/testsuite/gdb.base/gdb1056.exp                 |  2 +-
 gdb/testsuite/gdb.base/gdb1090.exp                 |  2 +-
 gdb/testsuite/gdb.base/gdb11531.exp                |  2 +-
 gdb/testsuite/gdb.base/gdb1250.exp                 |  2 +-
 gdb/testsuite/gdb.base/gdb1555.exp                 |  2 +-
 .../gdb.base/global-var-nested-by-dso.exp          |  4 +-
 gdb/testsuite/gdb.base/gnu-ifunc.exp               |  6 +-
 gdb/testsuite/gdb.base/hashline1.exp               |  2 +-
 gdb/testsuite/gdb.base/hashline2.exp               |  2 +-
 gdb/testsuite/gdb.base/hashline3.exp               |  2 +-
 .../gdb.base/hbreak-in-shr-unsupported.exp         |  4 +-
 gdb/testsuite/gdb.base/hbreak-unmapped.exp         |  4 +-
 gdb/testsuite/gdb.base/hook-stop.exp               |  2 +-
 gdb/testsuite/gdb.base/huge.exp                    |  4 +-
 gdb/testsuite/gdb.base/infcall-input.exp           |  4 +-
 gdb/testsuite/gdb.base/info-fun.exp                |  6 +-
 gdb/testsuite/gdb.base/info-shared.exp             |  4 +-
 gdb/testsuite/gdb.base/interrupt-noterm.exp        |  2 +-
 gdb/testsuite/gdb.base/jit-simple.exp              |  4 +-
 gdb/testsuite/gdb.base/jit-so.exp                  | 13 ++--
 gdb/testsuite/gdb.base/jit.exp                     |  7 +-
 gdb/testsuite/gdb.base/jump.exp                    |  2 +-
 gdb/testsuite/gdb.base/kill-after-signal.exp       |  2 +-
 gdb/testsuite/gdb.base/label.exp                   |  2 +-
 gdb/testsuite/gdb.base/line-symtabs.exp            |  2 +-
 gdb/testsuite/gdb.base/lineinc.exp                 |  2 +-
 gdb/testsuite/gdb.base/list.exp                    |  2 +-
 gdb/testsuite/gdb.base/logical.exp                 |  2 +-
 gdb/testsuite/gdb.base/longjmp.exp                 |  4 +-
 gdb/testsuite/gdb.base/macscp.exp                  |  6 +-
 gdb/testsuite/gdb.base/max-value-size.exp          |  2 +-
 gdb/testsuite/gdb.base/miscexprs.exp               |  2 +-
 gdb/testsuite/gdb.base/multi-forks.exp             | 16 ++---
 gdb/testsuite/gdb.base/new-ui-echo.exp             |  2 +-
 gdb/testsuite/gdb.base/new-ui-pending-input.exp    |  2 +-
 gdb/testsuite/gdb.base/new-ui.exp                  |  2 +-
 gdb/testsuite/gdb.base/nodebug.exp                 |  2 +-
 gdb/testsuite/gdb.base/nofield.exp                 |  2 +-
 gdb/testsuite/gdb.base/offsets.exp                 |  2 +-
 gdb/testsuite/gdb.base/overlays.exp                | 24 +++----
 .../gdb.base/paginate-after-ctrl-c-running.exp     |  2 +-
 gdb/testsuite/gdb.base/paginate-bg-execution.exp   |  4 +-
 gdb/testsuite/gdb.base/paginate-inferior-exit.exp  |  2 +-
 gdb/testsuite/gdb.base/pending.exp                 | 10 +--
 gdb/testsuite/gdb.base/pointers.exp                |  2 +-
 gdb/testsuite/gdb.base/pr11022.exp                 |  4 +-
 gdb/testsuite/gdb.base/printcmds.exp               |  8 +--
 gdb/testsuite/gdb.base/prologue.exp                |  2 +-
 gdb/testsuite/gdb.base/ptr-typedef.exp             |  4 +-
 gdb/testsuite/gdb.base/ptype.exp                   |  2 +-
 gdb/testsuite/gdb.base/radix.exp                   | 10 +--
 gdb/testsuite/gdb.base/randomize.exp               |  6 +-
 gdb/testsuite/gdb.base/range-stepping.exp          |  2 +-
 gdb/testsuite/gdb.base/realname-expand.exp         |  4 +-
 gdb/testsuite/gdb.base/relativedebug.exp           |  2 +-
 gdb/testsuite/gdb.base/relocate.exp                |  2 +-
 gdb/testsuite/gdb.base/remote.exp                  |  4 +-
 gdb/testsuite/gdb.base/reread.exp                  |  4 +-
 gdb/testsuite/gdb.base/return2.exp                 |  4 +-
 gdb/testsuite/gdb.base/savedregs.exp               |  4 +-
 gdb/testsuite/gdb.base/sep.exp                     |  2 +-
 gdb/testsuite/gdb.base/sepdebug.exp                | 16 ++---
 gdb/testsuite/gdb.base/sepsymtab.exp               |  2 +-
 gdb/testsuite/gdb.base/set-inferior-tty.exp        |  2 +-
 gdb/testsuite/gdb.base/set-noassign.exp            |  2 +-
 gdb/testsuite/gdb.base/setshow.exp                 |  2 +-
 gdb/testsuite/gdb.base/shlib-call.exp              |  2 +-
 gdb/testsuite/gdb.base/shreloc.exp                 | 12 ++--
 gdb/testsuite/gdb.base/sigaltstack.exp             |  2 +-
 gdb/testsuite/gdb.base/sigbpt.exp                  |  4 +-
 gdb/testsuite/gdb.base/siginfo-addr.exp            |  2 +-
 gdb/testsuite/gdb.base/siginfo-obj.exp             | 10 +--
 gdb/testsuite/gdb.base/siginfo-thread.exp          |  8 +--
 gdb/testsuite/gdb.base/signals.exp                 |  2 +-
 gdb/testsuite/gdb.base/signest.exp                 |  2 +-
 gdb/testsuite/gdb.base/signull.exp                 |  4 +-
 gdb/testsuite/gdb.base/sigrepeat.exp               |  2 +-
 gdb/testsuite/gdb.base/skip.exp                    | 20 +++---
 gdb/testsuite/gdb.base/so-impl-ld.exp              |  2 +-
 gdb/testsuite/gdb.base/solib-corrupted.exp         |  2 +-
 gdb/testsuite/gdb.base/solib-disc.exp              |  2 +-
 gdb/testsuite/gdb.base/solib-display.exp           | 14 ++--
 gdb/testsuite/gdb.base/solib-overlap.exp           |  6 +-
 gdb/testsuite/gdb.base/solib-search.exp            |  6 +-
 gdb/testsuite/gdb.base/solib-symbol.exp            |  4 +-
 gdb/testsuite/gdb.base/source-execution.exp        |  2 +-
 gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp     |  2 +-
 gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp       |  2 +-
 gdb/testsuite/gdb.base/stack-checking.exp          |  2 +-
 gdb/testsuite/gdb.base/stale-infcall.exp           |  2 +-
 gdb/testsuite/gdb.base/step-break.exp              |  2 +-
 gdb/testsuite/gdb.base/step-line.exp               |  2 +-
 gdb/testsuite/gdb.base/step-over-exit.exp          |  2 +-
 gdb/testsuite/gdb.base/step-test.exp               |  2 +-
 gdb/testsuite/gdb.base/structs.exp                 |  4 +-
 gdb/testsuite/gdb.base/structs2.exp                |  2 +-
 gdb/testsuite/gdb.base/sym-file.exp                |  2 +-
 gdb/testsuite/gdb.base/symtab-search-order.exp     |  4 +-
 gdb/testsuite/gdb.base/term.exp                    |  2 +-
 gdb/testsuite/gdb.base/testenv.exp                 | 22 +++---
 gdb/testsuite/gdb.base/twice.exp                   |  2 +-
 gdb/testsuite/gdb.base/type-opaque.exp             |  2 +-
 gdb/testsuite/gdb.base/unload.exp                  |  2 +-
 gdb/testsuite/gdb.base/until-nodebug.exp           |  2 +-
 gdb/testsuite/gdb.base/until.exp                   |  2 +-
 gdb/testsuite/gdb.base/unwindonsignal.exp          |  4 +-
 gdb/testsuite/gdb.base/valgrind-db-attach.exp      |  2 +-
 gdb/testsuite/gdb.base/varargs.exp                 |  2 +-
 gdb/testsuite/gdb.base/watch-cond.exp              |  6 +-
 gdb/testsuite/gdb.base/watch-non-mem.exp           |  2 +-
 gdb/testsuite/gdb.base/watch_thread_num.exp        | 12 ++--
 gdb/testsuite/gdb.base/watchpoint-cond-gone.exp    |  4 +-
 gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp   |  2 +-
 gdb/testsuite/gdb.base/watchpoint-solib.exp        |  2 +-
 gdb/testsuite/gdb.base/watchpoint.exp              | 16 ++---
 gdb/testsuite/gdb.base/watchpoints.exp             | 14 ++--
 gdb/testsuite/gdb.base/whatis.exp                  |  2 +-
 gdb/testsuite/gdb.base/wrong_frame_bt_full.exp     |  2 +-
 gdb/testsuite/gdb.btrace/dlopen.exp                |  2 +-
 gdb/testsuite/gdb.cell/arch.exp                    | 14 ++--
 gdb/testsuite/gdb.cell/break.exp                   | 12 ++--
 gdb/testsuite/gdb.cell/bt.exp                      | 12 ++--
 gdb/testsuite/gdb.cell/core.exp                    |  6 +-
 gdb/testsuite/gdb.cell/data.exp                    |  8 +--
 gdb/testsuite/gdb.cell/dwarfaddr.exp               |  4 +-
 gdb/testsuite/gdb.cell/ea-cache.exp                | 10 +--
 gdb/testsuite/gdb.cell/ea-standalone.exp           |  4 +-
 gdb/testsuite/gdb.cell/ea-test.exp                 |  4 +-
 gdb/testsuite/gdb.cell/f-regs.exp                  |  8 +--
 gdb/testsuite/gdb.cell/fork.exp                    |  8 +--
 gdb/testsuite/gdb.cell/gcore.exp                   |  8 +--
 gdb/testsuite/gdb.cell/mem-access.exp              |  8 +--
 gdb/testsuite/gdb.cell/ptype.exp                   |  8 +--
 gdb/testsuite/gdb.cell/registers.exp               |  8 +--
 gdb/testsuite/gdb.cell/sizeof.exp                  |  8 +--
 gdb/testsuite/gdb.cell/solib-symbol.exp            |  8 +--
 gdb/testsuite/gdb.cell/solib.exp                   |  8 +--
 gdb/testsuite/gdb.compile/compile-tls.exp          |  2 +-
 gdb/testsuite/gdb.compile/compile.exp              | 16 ++---
 gdb/testsuite/gdb.cp/arg-reference.exp             |  2 +-
 gdb/testsuite/gdb.cp/baseenum.exp                  |  2 +-
 gdb/testsuite/gdb.cp/dispcxx.exp                   |  2 +-
 gdb/testsuite/gdb.cp/exception.exp                 |  4 +-
 gdb/testsuite/gdb.cp/gdb2384.exp                   |  2 +-
 gdb/testsuite/gdb.cp/gdb2495.exp                   | 18 ++---
 gdb/testsuite/gdb.cp/local.exp                     |  4 +-
 gdb/testsuite/gdb.cp/mb-inline.exp                 |  2 +-
 gdb/testsuite/gdb.cp/mb-templates.exp              |  2 +-
 gdb/testsuite/gdb.cp/method2.exp                   |  2 +-
 gdb/testsuite/gdb.cp/nextoverthrow.exp             |  2 +-
 gdb/testsuite/gdb.cp/operator.exp                  |  2 +-
 gdb/testsuite/gdb.cp/pr10687.exp                   |  2 +-
 gdb/testsuite/gdb.cp/pr10728.exp                   |  6 +-
 gdb/testsuite/gdb.cp/pr9167.exp                    |  2 +-
 gdb/testsuite/gdb.cp/scope-err.exp                 |  2 +-
 gdb/testsuite/gdb.cp/shadow.exp                    | 10 +--
 gdb/testsuite/gdb.cp/templates.exp                 |  2 +-
 gdb/testsuite/gdb.cp/virtfunc.exp                  |  2 +-
 gdb/testsuite/gdb.disasm/am33.exp                  |  2 +-
 gdb/testsuite/gdb.disasm/h8300s.exp                |  2 +-
 gdb/testsuite/gdb.disasm/mn10300.exp               |  2 +-
 gdb/testsuite/gdb.disasm/sh3.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp     |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp      |  8 +--
 gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp     |  2 +-
 .../gdb.dwarf2/dw2-single-line-discriminators.exp  |  2 +-
 gdb/testsuite/gdb.fortran/complex.exp              |  2 +-
 gdb/testsuite/gdb.fortran/library-module.exp       |  4 +-
 gdb/testsuite/gdb.gdb/selftest.exp                 |  2 +-
 gdb/testsuite/gdb.gdb/xfullpath.exp                |  2 +-
 gdb/testsuite/gdb.go/chan.exp                      |  4 +-
 gdb/testsuite/gdb.go/hello.exp                     |  6 +-
 gdb/testsuite/gdb.go/integers.exp                  | 18 ++---
 gdb/testsuite/gdb.go/methods.exp                   |  4 +-
 gdb/testsuite/gdb.go/package.exp                   |  2 +-
 gdb/testsuite/gdb.guile/guile.exp                  |  2 +-
 gdb/testsuite/gdb.guile/scm-cmd.exp                |  2 +-
 gdb/testsuite/gdb.guile/scm-frame-inline.exp       |  2 +-
 gdb/testsuite/gdb.guile/scm-objfile.exp            |  2 +-
 gdb/testsuite/gdb.guile/scm-parameter.exp          |  8 +--
 gdb/testsuite/gdb.guile/scm-pretty-print.exp       |  2 +-
 gdb/testsuite/gdb.guile/scm-progspace.exp          |  6 +-
 gdb/testsuite/gdb.guile/scm-symbol.exp             |  2 +-
 gdb/testsuite/gdb.guile/scm-type.exp               |  2 +-
 gdb/testsuite/gdb.guile/scm-value.exp              |  8 +--
 gdb/testsuite/gdb.linespec/keywords.exp            |  2 +-
 gdb/testsuite/gdb.linespec/linespec.exp            |  2 +-
 gdb/testsuite/gdb.linespec/ls-errs.exp             |  2 +-
 gdb/testsuite/gdb.linespec/macro-relative.exp      |  2 +-
 gdb/testsuite/gdb.linespec/thread.exp              |  2 +-
 gdb/testsuite/gdb.mi/gdb701.exp                    |  2 +-
 gdb/testsuite/gdb.mi/gdb792.exp                    |  2 +-
 gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp     |  4 +-
 gdb/testsuite/gdb.mi/mi-dprintf-pending.exp        |  4 +-
 gdb/testsuite/gdb.mi/mi-dprintf.exp                |  2 +-
 gdb/testsuite/gdb.mi/mi-exit-code.exp              |  2 +-
 gdb/testsuite/gdb.mi/mi-fullname-deleted.exp       |  4 +-
 gdb/testsuite/gdb.mi/mi-logging.exp                |  8 +--
 gdb/testsuite/gdb.mi/mi-pending.exp                |  8 +--
 gdb/testsuite/gdb.mi/mi-solib.exp                  |  2 +-
 gdb/testsuite/gdb.mi/new-ui-mi-sync.exp            |  4 +-
 gdb/testsuite/gdb.mi/pr11022.exp                   |  2 +-
 .../gdb.mi/user-selected-context-sync.exp          |  6 +-
 gdb/testsuite/gdb.multi/dummy-frame-restore.exp    |  4 +-
 gdb/testsuite/gdb.multi/multi-arch-exec.exp        |  2 +-
 gdb/testsuite/gdb.multi/multi-attach.exp           |  4 +-
 gdb/testsuite/gdb.multi/remove-inferiors.exp       |  2 +-
 gdb/testsuite/gdb.multi/tids.exp                   |  2 +-
 gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp  |  2 +-
 gdb/testsuite/gdb.objc/basicclass.exp              |  8 +--
 gdb/testsuite/gdb.opencl/datatypes.exp             |  6 +-
 gdb/testsuite/gdb.opt/clobbered-registers-O2.exp   |  2 +-
 gdb/testsuite/gdb.opt/solib-intra-step.exp         |  2 +-
 gdb/testsuite/gdb.pascal/floats.exp                | 28 ++++----
 gdb/testsuite/gdb.pascal/hello.exp                 |  4 +-
 gdb/testsuite/gdb.pascal/integers.exp              | 18 ++---
 gdb/testsuite/gdb.perf/backtrace.exp               |  2 +-
 gdb/testsuite/gdb.perf/single-step.exp             |  2 +-
 gdb/testsuite/gdb.perf/skip-command.exp            |  2 +-
 gdb/testsuite/gdb.perf/skip-prologue.exp           |  2 +-
 gdb/testsuite/gdb.perf/solib.exp                   |  2 +-
 gdb/testsuite/gdb.python/lib-types.exp             |  2 +-
 gdb/testsuite/gdb.python/py-as-string.exp          |  2 +-
 gdb/testsuite/gdb.python/py-bad-printers.exp       |  2 +-
 gdb/testsuite/gdb.python/py-block.exp              | 24 +++----
 gdb/testsuite/gdb.python/py-breakpoint.exp         | 20 +++---
 gdb/testsuite/gdb.python/py-cmd.exp                |  4 +-
 gdb/testsuite/gdb.python/py-events.exp             |  4 +-
 gdb/testsuite/gdb.python/py-evsignal.exp           |  2 +-
 gdb/testsuite/gdb.python/py-evthreads.exp          |  2 +-
 gdb/testsuite/gdb.python/py-finish-breakpoint.exp  | 16 ++---
 gdb/testsuite/gdb.python/py-finish-breakpoint2.exp |  4 +-
 gdb/testsuite/gdb.python/py-frame-inline.exp       |  2 +-
 gdb/testsuite/gdb.python/py-frame.exp              |  2 +-
 .../gdb.python/py-framefilter-invalidarg.exp       |  4 +-
 gdb/testsuite/gdb.python/py-framefilter.exp        |  6 +-
 gdb/testsuite/gdb.python/py-function.exp           |  4 +-
 gdb/testsuite/gdb.python/py-inferior.exp           |  2 +-
 gdb/testsuite/gdb.python/py-infthread.exp          |  2 +-
 gdb/testsuite/gdb.python/py-linetable.exp          |  4 +-
 gdb/testsuite/gdb.python/py-mi.exp                 |  2 +-
 gdb/testsuite/gdb.python/py-objfile.exp            |  4 +-
 gdb/testsuite/gdb.python/py-parameter.exp          | 82 +++++++++++-----------
 gdb/testsuite/gdb.python/py-pp-maint.exp           |  2 +-
 gdb/testsuite/gdb.python/py-pp-registration.exp    |  2 +-
 gdb/testsuite/gdb.python/py-prettyprint.exp        |  2 +-
 gdb/testsuite/gdb.python/py-recurse-unwind.exp     |  2 +-
 gdb/testsuite/gdb.python/py-shared.exp             |  6 +-
 gdb/testsuite/gdb.python/py-symbol.exp             | 74 +++++++++----------
 gdb/testsuite/gdb.python/py-symtab.exp             | 40 +++++------
 gdb/testsuite/gdb.python/py-template.exp           |  2 +-
 gdb/testsuite/gdb.python/py-type.exp               | 60 ++++++++--------
 gdb/testsuite/gdb.python/py-unwind-maint.exp       |  2 +-
 gdb/testsuite/gdb.python/py-unwind.exp             |  2 +-
 gdb/testsuite/gdb.python/py-value.exp              | 52 +++++++-------
 gdb/testsuite/gdb.python/py-xmethods.exp           | 70 +++++++++---------
 gdb/testsuite/gdb.python/python.exp                | 70 +++++++++---------
 gdb/testsuite/gdb.reverse/break-precsave.exp       |  4 +-
 gdb/testsuite/gdb.reverse/break-reverse.exp        |  2 +-
 gdb/testsuite/gdb.reverse/consecutive-precsave.exp |  6 +-
 gdb/testsuite/gdb.reverse/consecutive-reverse.exp  |  2 +-
 gdb/testsuite/gdb.reverse/finish-precsave.exp      |  6 +-
 gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp  |  4 +-
 gdb/testsuite/gdb.reverse/finish-reverse.exp       |  2 +-
 gdb/testsuite/gdb.reverse/fstatat-reverse.exp      |  2 +-
 gdb/testsuite/gdb.reverse/getresuid-reverse.exp    |  2 +-
 gdb/testsuite/gdb.reverse/i386-precsave.exp        |  6 +-
 gdb/testsuite/gdb.reverse/i386-reverse.exp         |  2 +-
 gdb/testsuite/gdb.reverse/i386-sse-reverse.exp     |  2 +-
 gdb/testsuite/gdb.reverse/i387-stack-reverse.exp   |  2 +-
 gdb/testsuite/gdb.reverse/insn-reverse.exp         |  4 +-
 .../gdb.reverse/machinestate-precsave.exp          |  6 +-
 gdb/testsuite/gdb.reverse/machinestate.exp         |  2 +-
 .../gdb.reverse/next-reverse-bkpt-over-sr.exp      |  4 +-
 gdb/testsuite/gdb.reverse/pipe-reverse.exp         |  2 +-
 gdb/testsuite/gdb.reverse/readv-reverse.exp        |  2 +-
 gdb/testsuite/gdb.reverse/recvmsg-reverse.exp      |  2 +-
 gdb/testsuite/gdb.reverse/rerun-prec.exp           |  2 +-
 gdb/testsuite/gdb.reverse/s390-mvcle.exp           |  2 +-
 gdb/testsuite/gdb.reverse/sigall-precsave.exp      |  6 +-
 gdb/testsuite/gdb.reverse/sigall-reverse.exp       |  2 +-
 gdb/testsuite/gdb.reverse/solib-precsave.exp       | 12 ++--
 gdb/testsuite/gdb.reverse/solib-reverse.exp        |  8 +--
 gdb/testsuite/gdb.reverse/step-precsave.exp        |  6 +-
 gdb/testsuite/gdb.reverse/step-reverse.exp         |  2 +-
 gdb/testsuite/gdb.reverse/time-reverse.exp         |  2 +-
 gdb/testsuite/gdb.reverse/until-precsave.exp       |  6 +-
 gdb/testsuite/gdb.reverse/until-reverse.exp        |  2 +-
 gdb/testsuite/gdb.reverse/waitpid-reverse.exp      |  2 +-
 gdb/testsuite/gdb.reverse/watch-precsave.exp       |  6 +-
 gdb/testsuite/gdb.reverse/watch-reverse.exp        |  2 +-
 gdb/testsuite/gdb.server/ext-attach.exp            |  2 +-
 gdb/testsuite/gdb.server/ext-restart.exp           |  2 +-
 gdb/testsuite/gdb.server/ext-run.exp               |  2 +-
 gdb/testsuite/gdb.server/ext-wrapper.exp           |  2 +-
 gdb/testsuite/gdb.server/solib-list.exp            |  2 +-
 gdb/testsuite/gdb.stabs/gdb11479.exp               |  6 +-
 gdb/testsuite/gdb.stabs/weird.exp                  | 12 ++--
 .../attach-many-short-lived-threads.exp            |  2 +-
 gdb/testsuite/gdb.threads/fork-child-threads.exp   |  2 +-
 gdb/testsuite/gdb.threads/fork-plus-threads.exp    |  2 +-
 gdb/testsuite/gdb.threads/fork-thread-pending.exp  |  4 +-
 .../forking-threads-plus-breakpoint.exp            |  4 +-
 gdb/testsuite/gdb.threads/hand-call-in-threads.exp |  4 +-
 .../gdb.threads/interrupted-hand-call.exp          |  4 +-
 gdb/testsuite/gdb.threads/kill.exp                 |  2 +-
 gdb/testsuite/gdb.threads/leader-exit.exp          |  2 +-
 gdb/testsuite/gdb.threads/linux-dp.exp             |  2 +-
 .../gdb.threads/local-watch-wrong-thread.exp       |  2 +-
 .../next-while-other-thread-longjmps.exp           |  2 +-
 gdb/testsuite/gdb.threads/non-ldr-exit.exp         |  2 +-
 gdb/testsuite/gdb.threads/pending-step.exp         |  2 +-
 gdb/testsuite/gdb.threads/print-threads.exp        |  8 +--
 .../gdb.threads/process-dies-while-detaching.exp   |  6 +-
 .../gdb.threads/process-dies-while-handling-bp.exp |  2 +-
 gdb/testsuite/gdb.threads/pthreads.exp             |  8 +--
 gdb/testsuite/gdb.threads/queue-signal.exp         |  2 +-
 gdb/testsuite/gdb.threads/reconnect-signal.exp     |  4 +-
 .../gdb.threads/signal-command-handle-nopass.exp   |  2 +-
 .../signal-command-multiple-signals-pending.exp    |  2 +-
 .../gdb.threads/signal-delivered-right-thread.exp  |  2 +-
 gdb/testsuite/gdb.threads/signal-sigtrap.exp       |  2 +-
 gdb/testsuite/gdb.threads/sigthread.exp            |  2 +-
 gdb/testsuite/gdb.threads/staticthreads.exp        |  4 +-
 gdb/testsuite/gdb.threads/stepi-random-signal.exp  |  2 +-
 .../gdb.threads/thread-unwindonsignal.exp          |  4 +-
 gdb/testsuite/gdb.threads/thread_check.exp         |  2 +-
 gdb/testsuite/gdb.threads/thread_events.exp        |  2 +-
 gdb/testsuite/gdb.threads/tid-reuse.exp            |  2 +-
 gdb/testsuite/gdb.threads/tls-nodebug.exp          |  2 +-
 gdb/testsuite/gdb.threads/tls-shared.exp           |  2 +-
 gdb/testsuite/gdb.threads/tls-so_extern.exp        |  2 +-
 gdb/testsuite/gdb.threads/tls.exp                  |  8 +--
 gdb/testsuite/gdb.threads/watchpoint-fork.exp      |  4 +-
 gdb/testsuite/gdb.threads/wp-replication.exp       |  6 +-
 gdb/testsuite/gdb.trace/actions-changed.exp        |  4 +-
 gdb/testsuite/gdb.trace/actions.exp                |  8 +--
 gdb/testsuite/gdb.trace/ax.exp                     |  2 +-
 gdb/testsuite/gdb.trace/backtrace.exp              | 10 +--
 gdb/testsuite/gdb.trace/change-loc.exp             | 10 +--
 gdb/testsuite/gdb.trace/collection.exp             |  2 +-
 gdb/testsuite/gdb.trace/deltrace.exp               |  4 +-
 gdb/testsuite/gdb.trace/disconnected-tracing.exp   |  4 +-
 gdb/testsuite/gdb.trace/entry-values.exp           |  6 +-
 gdb/testsuite/gdb.trace/ftrace-lock.exp            | 10 +--
 gdb/testsuite/gdb.trace/ftrace.exp                 |  8 +--
 gdb/testsuite/gdb.trace/infotrace.exp              |  6 +-
 .../gdb.trace/mi-trace-frame-collected.exp         |  4 +-
 gdb/testsuite/gdb.trace/mi-trace-unavailable.exp   |  4 +-
 gdb/testsuite/gdb.trace/mi-traceframe-changed.exp  |  4 +-
 gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp  | 10 +--
 gdb/testsuite/gdb.trace/mi-tsv-changed.exp         | 12 ++--
 gdb/testsuite/gdb.trace/no-attach-trace.exp        |  4 +-
 gdb/testsuite/gdb.trace/packetlen.exp              |  4 +-
 gdb/testsuite/gdb.trace/passc-dyn.exp              |  4 +-
 gdb/testsuite/gdb.trace/passcount.exp              |  4 +-
 gdb/testsuite/gdb.trace/pending.exp                | 20 +++---
 gdb/testsuite/gdb.trace/pr16508.exp                |  2 +-
 gdb/testsuite/gdb.trace/qtro.exp                   |  4 +-
 gdb/testsuite/gdb.trace/range-stepping.exp         |  8 +--
 gdb/testsuite/gdb.trace/read-memory.exp            |  4 +-
 gdb/testsuite/gdb.trace/report.exp                 | 10 +--
 gdb/testsuite/gdb.trace/save-trace.exp             |  2 +-
 gdb/testsuite/gdb.trace/signal.exp                 |  4 +-
 gdb/testsuite/gdb.trace/stap-trace.exp             |  2 +-
 gdb/testsuite/gdb.trace/status-stop.exp            |  8 +--
 gdb/testsuite/gdb.trace/strace.exp                 | 14 ++--
 gdb/testsuite/gdb.trace/tfile.exp                  |  2 +-
 gdb/testsuite/gdb.trace/tfind.exp                  |  6 +-
 gdb/testsuite/gdb.trace/trace-break.exp            | 20 +++---
 gdb/testsuite/gdb.trace/trace-condition.exp        | 10 +--
 gdb/testsuite/gdb.trace/trace-enable-disable.exp   |  8 +--
 gdb/testsuite/gdb.trace/trace-mt.exp               | 14 ++--
 gdb/testsuite/gdb.trace/tracecmd.exp               | 10 +--
 gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp   |  2 +-
 gdb/testsuite/gdb.trace/tspeed.exp                 |  4 +-
 gdb/testsuite/gdb.trace/tstatus.exp                |  2 +-
 gdb/testsuite/gdb.trace/tsv.exp                    | 20 +++---
 gdb/testsuite/gdb.trace/unavailable.exp            |  2 +-
 gdb/testsuite/gdb.trace/while-dyn.exp              |  2 +-
 gdb/testsuite/gdb.trace/while-stepping.exp         |  4 +-
 gdb/testsuite/lib/gdb-guile.exp                    |  2 +-
 gdb/testsuite/lib/gdb.exp                          | 10 +--
 gdb/testsuite/lib/mi-support.exp                   |  8 +--
 gdb/testsuite/lib/pascal.exp                       |  2 +-
 gdb/testsuite/lib/perftest.exp                     |  2 +-
 gdb/testsuite/lib/prelink-support.exp              |  2 +-
 gdb/testsuite/lib/selftest-support.exp             |  2 +-
 530 files changed, 1399 insertions(+), 1401 deletions(-)

-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v2 6/8] Fix test names starting with uppercase using multi-line gdb_test_no_output
  2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
@ 2016-11-25 20:54 ` Luis Machado
  2016-11-30 20:12   ` Pedro Alves
  2016-11-25 20:54 ` [PATCH v2 7/8] Fix test names starting with uppercase using multi-line gdb_test_multiple Luis Machado
                   ` (7 subsequent siblings)
  8 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-25 20:54 UTC (permalink / raw)
  To: gdb-patches

This fixes offender testcases that have test names starting with uppercase
when using gdb_test_no_output in a multi-line construct.

gdb/testsuite/ChangeLog
2016-11-25  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names starting with uppercase throughout the files.

	* gdb/testsuite/gdb.ada/assign_1.exp
	* gdb/testsuite/gdb.ada/boolean_expr.exp
	* gdb/testsuite/gdb.base/arrayidx.exp
	* gdb/testsuite/gdb.base/del.exp
	* gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
	* gdb/testsuite/gdb.base/testenv.exp
	* gdb/testsuite/gdb.compile/compile.exp
	* gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
	* gdb/testsuite/gdb.python/py-framefilter.exp
---
 gdb/testsuite/gdb.ada/assign_1.exp                     | 2 +-
 gdb/testsuite/gdb.ada/boolean_expr.exp                 | 2 +-
 gdb/testsuite/gdb.base/arrayidx.exp                    | 4 ++--
 gdb/testsuite/gdb.base/del.exp                         | 2 +-
 gdb/testsuite/gdb.base/gcore-buffer-overflow.exp       | 2 +-
 gdb/testsuite/gdb.base/testenv.exp                     | 8 ++++----
 gdb/testsuite/gdb.compile/compile.exp                  | 6 +++---
 gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp | 4 ++--
 gdb/testsuite/gdb.python/py-framefilter.exp            | 6 +++---
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/assign_1.exp b/gdb/testsuite/gdb.ada/assign_1.exp
index 074ec42..2df028c 100644
--- a/gdb/testsuite/gdb.ada/assign_1.exp
+++ b/gdb/testsuite/gdb.ada/assign_1.exp
@@ -22,7 +22,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_no_output "set lang ada" \
-         "Changing the language to ada"
+         "changing the language to ada"
 
 gdb_test "print \$xxx := 1" \
          "= 1" \
diff --git a/gdb/testsuite/gdb.ada/boolean_expr.exp b/gdb/testsuite/gdb.ada/boolean_expr.exp
index 4b8d1d8..8b8c57c 100644
--- a/gdb/testsuite/gdb.ada/boolean_expr.exp
+++ b/gdb/testsuite/gdb.ada/boolean_expr.exp
@@ -25,7 +25,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_no_output "set lang ada" \
-         "Changing the language to ada"
+         "changing the language to ada"
 
 gdb_test "print 1 = 2" \
          "= false" \
diff --git a/gdb/testsuite/gdb.base/arrayidx.exp b/gdb/testsuite/gdb.base/arrayidx.exp
index bfd186b..c7c707a 100644
--- a/gdb/testsuite/gdb.base/arrayidx.exp
+++ b/gdb/testsuite/gdb.base/arrayidx.exp
@@ -34,7 +34,7 @@ if ![runto_main] then {
 # First, print the array without the indexes
 
 gdb_test_no_output "set print array-indexes off" \
-         "Set print array-indexes to off"
+         "set print array-indexes to off"
 
 gdb_test "print array" \
          "\\{1, 2, 3, 4\\}" \
@@ -43,7 +43,7 @@ gdb_test "print array" \
 # Second, print the same array with the indexes
 
 gdb_test_no_output "set print array-indexes on" \
-         "Set print array-indexes to on"
+         "set print array-indexes to on"
 
 gdb_test "print array" \
          "\\{\\\[0\\\] = 1, \\\[1\\\] = 2, \\\[2\\\] = 3, \\\[3\\\] = 4\\}" \
diff --git a/gdb/testsuite/gdb.base/del.exp b/gdb/testsuite/gdb.base/del.exp
index e7a8c2d..2d7e920 100644
--- a/gdb/testsuite/gdb.base/del.exp
+++ b/gdb/testsuite/gdb.base/del.exp
@@ -33,7 +33,7 @@ proc test_delete_alias { alias } {
     # First of all, remove all previous breakpoints if there were any,
     # and then verify that we do not have any breakpoint lying around.
     gdb_test_no_output "delete" \
-             "Remove all breakpoints ($alias)"
+             "remove all breakpoints ($alias)"
 
     gdb_test "info break" \
              "No breakpoints or watchpoints." \
diff --git a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
index 72f03ac..92df25f 100644
--- a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
+++ b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
@@ -32,7 +32,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 clean_restart ${binfile}
 
 gdb_test_no_output "set args ${pattern}"	\
-    "Set buffer exceeding arguments"
+    "set buffer exceeding arguments"
 
 if { ! [ runto_main ] } then {
     untested gcore-buffer-overflow.exp
diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp
index 27cfe04..9d03f91 100644
--- a/gdb/testsuite/gdb.base/testenv.exp
+++ b/gdb/testsuite/gdb.base/testenv.exp
@@ -52,7 +52,7 @@ gdb_test "continue" \
   "test no TEST_GDB var"
 
 gdb_test_no_output "set env TEST_GDB_VAR1 test1" \
-  "Set TEST_GDB_VAR1"
+  "set TEST_GDB_VAR1"
 
 runto_main
 gdb_breakpoint  $bp_line
@@ -63,7 +63,7 @@ gdb_test "continue" \
   "test with one TEST_GDB var"
 
 gdb_test_no_output "set env TEST_GDB_VAR2 test2" \
-  "Set TEST_GDB_VAR2"
+  "set TEST_GDB_VAR2"
 
 runto_main
 gdb_breakpoint  $bp_line
@@ -74,7 +74,7 @@ gdb_test "continue"  \
   "test with two TEST_GDB var"
 
 gdb_test_no_output "unset env TEST_GDB_VAR1" \
-  "Unset TEST_GDB_VAR1"
+  "unset TEST_GDB_VAR1"
 
 runto_main
 gdb_breakpoint  $bp_line
@@ -106,7 +106,7 @@ gdb_test "continue" \
   "test with TEST_GDB_GLOBAL"
 
 gdb_test_no_output "unset env TEST_GDB_GLOBAL" \
-  "Unset TEST_GDB_GLOBAL"
+  "unset TEST_GDB_GLOBAL"
 
 runto_main
 gdb_breakpoint  $bp_line
diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp
index cec44d8..93d5873 100644
--- a/gdb/testsuite/gdb.compile/compile.exp
+++ b/gdb/testsuite/gdb.compile/compile.exp
@@ -66,16 +66,16 @@ if {[skip_compile_feature_tests]} {
 #
 
 gdb_test_no_output "compile -- f = 10" \
-    "Test abbreviations and code delimiter"
+    "test abbreviations and code delimiter"
 
 gdb_test "compile f = 10;" ".*= 10;: No such file.*" \
     "Test abbreviations and code collision"
 
 gdb_test_no_output "compile -r -- void _gdb_expr(){int i = 5;}" \
-    "Test delimiter with -r"
+    "test delimiter with -r"
 
 gdb_test_no_output "compile -raw -- void _gdb_expr(){int i = 5;}" \
-    "Test delimiter with -raw"
+    "test delimiter with -raw"
 
 gdb_test "compile -- -r  void _gdb_expr(){int i = 5;}" \
     ".* error: 'r' undeclared \\(first use in this function\\).*" \
diff --git a/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp b/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
index d072adf..50fbc5b 100644
--- a/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
@@ -56,12 +56,12 @@ if ![runto_main] then {
     return
 }
 gdb_test_no_output "set python print-stack full" \
-    "Set python print-stack to full"
+    "set python print-stack to full"
 
 # Load global frame-filters
 set remote_python_file [gdb_remote_download host \
 			    ${srcdir}/${subdir}/${testfile}.py]
 gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \
-    "Load python file"
+    "load python file"
 
 gdb_test "bt" " in niam \\(argc=<error reading variable: dwarf expression stack underflow>, argv=0x\[0-9a-f\]+\\) at py-framefilter-invalidarg.c:\[0-9\]+" "bt full with filters"
diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp
index 7abf3a9..0bfecdf 100644
--- a/gdb/testsuite/gdb.python/py-framefilter.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter.exp
@@ -58,13 +58,13 @@ if ![runto_main] then {
     return
 }
 gdb_test_no_output "set python print-stack full" \
-    "Set python print-stack to full"
+    "set python print-stack to full"
 
 # Load global frame-filters
 set remote_python_file [gdb_remote_download host \
 			    ${srcdir}/${subdir}/${testfile}.py]
 gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \
-    "Load python file"
+    "load python file"
 
 gdb_breakpoint [gdb_get_line_number "Backtrace end breakpoint"]
 gdb_breakpoint [gdb_get_line_number "Inner test breakpoint"]
@@ -254,7 +254,7 @@ gdb_test_no_output "set python print-stack full" \
 set remote_python_file [gdb_remote_download host \
 			    ${srcdir}/${subdir}/${testfile}.py]
 gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \
-    "Load python file for no debuginfo tests"
+    "load python file for no debuginfo tests"
 
 # Disable Reverse
 gdb_test_no_output "disable frame-filter global Reverse" \
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v2 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages
  2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
                   ` (6 preceding siblings ...)
  2016-11-25 20:55 ` [PATCH v2 2/8] Fix test names starting with uppercase using gdb_test on a single line Luis Machado
@ 2016-11-25 20:55 ` Luis Machado
  2016-12-01 11:08   ` Pedro Alves
  2016-11-28 18:57 ` [PATCH v2 0/8] Fix gdb's testsuite test names Sergio Durigan Junior
  8 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-25 20:55 UTC (permalink / raw)
  To: gdb-patches

Changes in v2:

* Updated compilation failure message to read "failed to compile".
* Replaced all other compilation failure messages with the same standard
  message of "failed to compile", except when the original message contained
  meaningful context information. For example, "failed to compile shared library"
  or "failed to compile in C++ mode" etc.

---

Another bit of cleanup to the testsuite. We have a number of tests that are
not honoring the rule of not outputting their own name as a test name.

I fixed up all the offenders i could find with the following regular
expression:

"(xfail|kfail|kpass|fail|pass|unsupported|untested) ([A-Za-z0-9]+|\\\$(.)*testfile(.)*)\.exp$"

OK?

gdb/testsuite/ChangeLog:
2016-11-12  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names and standardize compilation error messages throughout
	the following files:

	* gdb/testsuite/gdb.ada/start.exp
	* gdb/testsuite/gdb.arch/alpha-step.exp
	* gdb/testsuite/gdb.arch/e500-prologue.exp
	* gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
	* gdb/testsuite/gdb.arch/gdb1291.exp
	* gdb/testsuite/gdb.arch/gdb1431.exp
	* gdb/testsuite/gdb.arch/gdb1558.exp
	* gdb/testsuite/gdb.arch/i386-dr3-watch.exp
	* gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
	* gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
	* gdb/testsuite/gdb.arch/pa-nullify.exp
	* gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
	* gdb/testsuite/gdb.arch/thumb-bx-pc.exp
	* gdb/testsuite/gdb.base/annota1.exp
	* gdb/testsuite/gdb.base/annota3.exp
	* gdb/testsuite/gdb.base/arrayidx.exp
	* gdb/testsuite/gdb.base/assign.exp
	* gdb/testsuite/gdb.base/attach.exp
	* gdb/testsuite/gdb.base/auxv.exp
	* gdb/testsuite/gdb.base/bang.exp
	* gdb/testsuite/gdb.base/bfp-test.exp
	* gdb/testsuite/gdb.base/bigcore.exp
	* gdb/testsuite/gdb.base/bitfields2.exp
	* gdb/testsuite/gdb.base/break-fun-addr.exp
	* gdb/testsuite/gdb.base/break-probes.exp
	* gdb/testsuite/gdb.base/call-rt-st.exp
	* gdb/testsuite/gdb.base/callexit.exp
	* gdb/testsuite/gdb.base/catch-fork-kill.exp
	* gdb/testsuite/gdb.base/charset.exp
	* gdb/testsuite/gdb.base/checkpoint.exp
	* gdb/testsuite/gdb.base/comprdebug.exp
	* gdb/testsuite/gdb.base/constvars.exp
	* gdb/testsuite/gdb.base/coredump-filter.exp
	* gdb/testsuite/gdb.base/cursal.exp
	* gdb/testsuite/gdb.base/cvexpr.exp
	* gdb/testsuite/gdb.base/detach.exp
	* gdb/testsuite/gdb.base/display.exp
	* gdb/testsuite/gdb.base/dmsym.exp
	* gdb/testsuite/gdb.base/dprintf-pending.exp
	* gdb/testsuite/gdb.base/dso2dso.exp
	* gdb/testsuite/gdb.base/dtrace-probe.exp
	* gdb/testsuite/gdb.base/dump.exp
	* gdb/testsuite/gdb.base/enum_cond.exp
	* gdb/testsuite/gdb.base/exe-lock.exp
	* gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
	* gdb/testsuite/gdb.base/execl-update-breakpoints.exp
	* gdb/testsuite/gdb.base/exprs.exp
	* gdb/testsuite/gdb.base/fileio.exp
	* gdb/testsuite/gdb.base/find.exp
	* gdb/testsuite/gdb.base/finish.exp
	* gdb/testsuite/gdb.base/fixsection.exp
	* gdb/testsuite/gdb.base/foll-vfork.exp
	* gdb/testsuite/gdb.base/frame-args.exp
	* gdb/testsuite/gdb.base/gcore.exp
	* gdb/testsuite/gdb.base/gdb1250.exp
	* gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
	* gdb/testsuite/gdb.base/gnu-ifunc.exp
	* gdb/testsuite/gdb.base/hashline1.exp
	* gdb/testsuite/gdb.base/hashline2.exp
	* gdb/testsuite/gdb.base/hashline3.exp
	* gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
	* gdb/testsuite/gdb.base/huge.exp
	* gdb/testsuite/gdb.base/infcall-input.exp
	* gdb/testsuite/gdb.base/info-fun.exp
	* gdb/testsuite/gdb.base/info-shared.exp
	* gdb/testsuite/gdb.base/jit-simple.exp
	* gdb/testsuite/gdb.base/jit-so.exp
	* gdb/testsuite/gdb.base/jit.exp
	* gdb/testsuite/gdb.base/jump.exp
	* gdb/testsuite/gdb.base/label.exp
	* gdb/testsuite/gdb.base/lineinc.exp
	* gdb/testsuite/gdb.base/logical.exp
	* gdb/testsuite/gdb.base/longjmp.exp
	* gdb/testsuite/gdb.base/macscp.exp
	* gdb/testsuite/gdb.base/miscexprs.exp
	* gdb/testsuite/gdb.base/new-ui-echo.exp
	* gdb/testsuite/gdb.base/new-ui-pending-input.exp
	* gdb/testsuite/gdb.base/new-ui.exp
	* gdb/testsuite/gdb.base/nodebug.exp
	* gdb/testsuite/gdb.base/nofield.exp
	* gdb/testsuite/gdb.base/offsets.exp
	* gdb/testsuite/gdb.base/overlays.exp
	* gdb/testsuite/gdb.base/pending.exp
	* gdb/testsuite/gdb.base/pointers.exp
	* gdb/testsuite/gdb.base/pr11022.exp
	* gdb/testsuite/gdb.base/printcmds.exp
	* gdb/testsuite/gdb.base/prologue.exp
	* gdb/testsuite/gdb.base/ptr-typedef.exp
	* gdb/testsuite/gdb.base/realname-expand.exp
	* gdb/testsuite/gdb.base/relativedebug.exp
	* gdb/testsuite/gdb.base/relocate.exp
	* gdb/testsuite/gdb.base/remote.exp
	* gdb/testsuite/gdb.base/reread.exp
	* gdb/testsuite/gdb.base/return2.exp
	* gdb/testsuite/gdb.base/savedregs.exp
	* gdb/testsuite/gdb.base/sep.exp
	* gdb/testsuite/gdb.base/sepdebug.exp
	* gdb/testsuite/gdb.base/sepsymtab.exp
	* gdb/testsuite/gdb.base/set-inferior-tty.exp
	* gdb/testsuite/gdb.base/setshow.exp
	* gdb/testsuite/gdb.base/shlib-call.exp
	* gdb/testsuite/gdb.base/sigaltstack.exp
	* gdb/testsuite/gdb.base/siginfo-addr.exp
	* gdb/testsuite/gdb.base/signals.exp
	* gdb/testsuite/gdb.base/signull.exp
	* gdb/testsuite/gdb.base/sigrepeat.exp
	* gdb/testsuite/gdb.base/so-impl-ld.exp
	* gdb/testsuite/gdb.base/solib-display.exp
	* gdb/testsuite/gdb.base/solib-overlap.exp
	* gdb/testsuite/gdb.base/solib-search.exp
	* gdb/testsuite/gdb.base/solib-symbol.exp
	* gdb/testsuite/gdb.base/structs.exp
	* gdb/testsuite/gdb.base/structs2.exp
	* gdb/testsuite/gdb.base/symtab-search-order.exp
	* gdb/testsuite/gdb.base/twice.exp
	* gdb/testsuite/gdb.base/unload.exp
	* gdb/testsuite/gdb.base/varargs.exp
	* gdb/testsuite/gdb.base/watchpoint-solib.exp
	* gdb/testsuite/gdb.base/watchpoint.exp
	* gdb/testsuite/gdb.base/whatis.exp
	* gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
	* gdb/testsuite/gdb.btrace/dlopen.exp
	* gdb/testsuite/gdb.cell/ea-standalone.exp
	* gdb/testsuite/gdb.cell/ea-test.exp
	* gdb/testsuite/gdb.cp/dispcxx.exp
	* gdb/testsuite/gdb.cp/gdb2384.exp
	* gdb/testsuite/gdb.cp/method2.exp
	* gdb/testsuite/gdb.cp/nextoverthrow.exp
	* gdb/testsuite/gdb.cp/pr10728.exp
	* gdb/testsuite/gdb.disasm/am33.exp
	* gdb/testsuite/gdb.disasm/h8300s.exp
	* gdb/testsuite/gdb.disasm/mn10300.exp
	* gdb/testsuite/gdb.disasm/sh3.exp
	* gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
	* gdb/testsuite/gdb.fortran/complex.exp
	* gdb/testsuite/gdb.fortran/library-module.exp
	* gdb/testsuite/gdb.guile/scm-pretty-print.exp
	* gdb/testsuite/gdb.guile/scm-symbol.exp
	* gdb/testsuite/gdb.guile/scm-type.exp
	* gdb/testsuite/gdb.guile/scm-value.exp
	* gdb/testsuite/gdb.linespec/linespec.exp
	* gdb/testsuite/gdb.mi/gdb701.exp
	* gdb/testsuite/gdb.mi/gdb792.exp
	* gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
	* gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
	* gdb/testsuite/gdb.mi/mi-dprintf.exp
	* gdb/testsuite/gdb.mi/mi-exit-code.exp
	* gdb/testsuite/gdb.mi/mi-pending.exp
	* gdb/testsuite/gdb.mi/mi-solib.exp
	* gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
	* gdb/testsuite/gdb.mi/pr11022.exp
	* gdb/testsuite/gdb.mi/user-selected-context-sync.exp
	* gdb/testsuite/gdb.opt/solib-intra-step.exp
	* gdb/testsuite/gdb.python/py-events.exp
	* gdb/testsuite/gdb.python/py-finish-breakpoint.exp
	* gdb/testsuite/gdb.python/py-mi.exp
	* gdb/testsuite/gdb.python/py-prettyprint.exp
	* gdb/testsuite/gdb.python/py-shared.exp
	* gdb/testsuite/gdb.python/py-symbol.exp
	* gdb/testsuite/gdb.python/py-template.exp
	* gdb/testsuite/gdb.python/py-type.exp
	* gdb/testsuite/gdb.python/py-value.exp
	* gdb/testsuite/gdb.reverse/solib-precsave.exp
	* gdb/testsuite/gdb.reverse/solib-reverse.exp
	* gdb/testsuite/gdb.server/solib-list.exp
	* gdb/testsuite/gdb.stabs/weird.exp
	* gdb/testsuite/gdb.threads/reconnect-signal.exp
	* gdb/testsuite/gdb.threads/stepi-random-signal.exp
	* gdb/testsuite/gdb.trace/actions.exp
	* gdb/testsuite/gdb.trace/ax.exp
	* gdb/testsuite/gdb.trace/backtrace.exp
	* gdb/testsuite/gdb.trace/change-loc.exp
	* gdb/testsuite/gdb.trace/deltrace.exp
	* gdb/testsuite/gdb.trace/ftrace-lock.exp
	* gdb/testsuite/gdb.trace/ftrace.exp
	* gdb/testsuite/gdb.trace/infotrace.exp
	* gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
	* gdb/testsuite/gdb.trace/packetlen.exp
	* gdb/testsuite/gdb.trace/passcount.exp
	* gdb/testsuite/gdb.trace/pending.exp
	* gdb/testsuite/gdb.trace/range-stepping.exp
	* gdb/testsuite/gdb.trace/report.exp
	* gdb/testsuite/gdb.trace/stap-trace.exp
	* gdb/testsuite/gdb.trace/tfind.exp
	* gdb/testsuite/gdb.trace/trace-break.exp
	* gdb/testsuite/gdb.trace/trace-condition.exp
	* gdb/testsuite/gdb.trace/trace-enable-disable.exp
	* gdb/testsuite/gdb.trace/trace-mt.exp
	* gdb/testsuite/gdb.trace/tracecmd.exp
	* gdb/testsuite/gdb.trace/tspeed.exp
	* gdb/testsuite/gdb.trace/tsv.exp
	* gdb/testsuite/lib/perftest.exp
---
 gdb/testsuite/gdb.ada/start.exp                      |  4 ++--
 gdb/testsuite/gdb.arch/alpha-step.exp                |  2 +-
 gdb/testsuite/gdb.arch/e500-prologue.exp             |  2 +-
 gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp         |  2 +-
 gdb/testsuite/gdb.arch/gdb1291.exp                   |  2 +-
 gdb/testsuite/gdb.arch/gdb1431.exp                   |  2 +-
 gdb/testsuite/gdb.arch/gdb1558.exp                   |  2 +-
 gdb/testsuite/gdb.arch/i386-dr3-watch.exp            |  2 +-
 gdb/testsuite/gdb.arch/i386-sse-stack-align.exp      |  2 +-
 gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp    |  2 +-
 gdb/testsuite/gdb.arch/pa-nullify.exp                |  2 +-
 gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp      |  2 +-
 gdb/testsuite/gdb.arch/thumb-bx-pc.exp               |  2 +-
 gdb/testsuite/gdb.base/annota1.exp                   |  2 +-
 gdb/testsuite/gdb.base/annota3.exp                   |  2 +-
 gdb/testsuite/gdb.base/arrayidx.exp                  |  2 +-
 gdb/testsuite/gdb.base/assign.exp                    |  2 +-
 gdb/testsuite/gdb.base/attach.exp                    |  4 ++--
 gdb/testsuite/gdb.base/auxv.exp                      |  2 +-
 gdb/testsuite/gdb.base/bang.exp                      |  2 +-
 gdb/testsuite/gdb.base/bfp-test.exp                  |  2 +-
 gdb/testsuite/gdb.base/bigcore.exp                   |  2 +-
 gdb/testsuite/gdb.base/bitfields2.exp                |  2 +-
 gdb/testsuite/gdb.base/break-fun-addr.exp            |  4 ++--
 gdb/testsuite/gdb.base/break-probes.exp              |  2 +-
 gdb/testsuite/gdb.base/call-rt-st.exp                |  2 +-
 gdb/testsuite/gdb.base/callexit.exp                  |  2 +-
 gdb/testsuite/gdb.base/catch-fork-kill.exp           |  2 +-
 gdb/testsuite/gdb.base/charset.exp                   |  2 +-
 gdb/testsuite/gdb.base/checkpoint.exp                |  2 +-
 gdb/testsuite/gdb.base/comprdebug.exp                |  4 ++--
 gdb/testsuite/gdb.base/constvars.exp                 |  2 +-
 gdb/testsuite/gdb.base/coredump-filter.exp           |  2 +-
 gdb/testsuite/gdb.base/cursal.exp                    |  2 +-
 gdb/testsuite/gdb.base/cvexpr.exp                    |  2 +-
 gdb/testsuite/gdb.base/detach.exp                    |  2 +-
 gdb/testsuite/gdb.base/display.exp                   |  2 +-
 gdb/testsuite/gdb.base/dmsym.exp                     |  4 ++--
 gdb/testsuite/gdb.base/dprintf-pending.exp           |  2 +-
 gdb/testsuite/gdb.base/dso2dso.exp                   |  4 ++--
 gdb/testsuite/gdb.base/dtrace-probe.exp              |  2 +-
 gdb/testsuite/gdb.base/dump.exp                      |  4 ++--
 gdb/testsuite/gdb.base/enum_cond.exp                 |  2 +-
 gdb/testsuite/gdb.base/exe-lock.exp                  |  2 +-
 gdb/testsuite/gdb.base/exec-invalid-sysroot.exp      |  4 ++--
 gdb/testsuite/gdb.base/execl-update-breakpoints.exp  |  2 +-
 gdb/testsuite/gdb.base/exprs.exp                     |  2 +-
 gdb/testsuite/gdb.base/fileio.exp                    |  2 +-
 gdb/testsuite/gdb.base/find.exp                      |  2 +-
 gdb/testsuite/gdb.base/finish.exp                    |  2 +-
 gdb/testsuite/gdb.base/fixsection.exp                |  2 +-
 gdb/testsuite/gdb.base/foll-vfork.exp                |  4 ++--
 gdb/testsuite/gdb.base/frame-args.exp                |  2 +-
 gdb/testsuite/gdb.base/gcore.exp                     |  4 ++--
 gdb/testsuite/gdb.base/gdb1250.exp                   |  2 +-
 gdb/testsuite/gdb.base/global-var-nested-by-dso.exp  |  4 ++--
 gdb/testsuite/gdb.base/gnu-ifunc.exp                 |  4 ++--
 gdb/testsuite/gdb.base/hashline1.exp                 |  2 +-
 gdb/testsuite/gdb.base/hashline2.exp                 |  2 +-
 gdb/testsuite/gdb.base/hashline3.exp                 |  2 +-
 gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp |  2 +-
 gdb/testsuite/gdb.base/huge.exp                      |  4 ++--
 gdb/testsuite/gdb.base/infcall-input.exp             |  2 +-
 gdb/testsuite/gdb.base/info-fun.exp                  |  2 +-
 gdb/testsuite/gdb.base/info-shared.exp               |  4 ++--
 gdb/testsuite/gdb.base/jit-simple.exp                |  4 ++--
 gdb/testsuite/gdb.base/jit-so.exp                    | 11 +++++------
 gdb/testsuite/gdb.base/jit.exp                       |  5 ++---
 gdb/testsuite/gdb.base/jump.exp                      |  2 +-
 gdb/testsuite/gdb.base/label.exp                     |  2 +-
 gdb/testsuite/gdb.base/lineinc.exp                   |  2 +-
 gdb/testsuite/gdb.base/logical.exp                   |  2 +-
 gdb/testsuite/gdb.base/longjmp.exp                   |  2 +-
 gdb/testsuite/gdb.base/macscp.exp                    |  2 +-
 gdb/testsuite/gdb.base/miscexprs.exp                 |  2 +-
 gdb/testsuite/gdb.base/new-ui-echo.exp               |  2 +-
 gdb/testsuite/gdb.base/new-ui-pending-input.exp      |  2 +-
 gdb/testsuite/gdb.base/new-ui.exp                    |  2 +-
 gdb/testsuite/gdb.base/nodebug.exp                   |  2 +-
 gdb/testsuite/gdb.base/nofield.exp                   |  2 +-
 gdb/testsuite/gdb.base/offsets.exp                   |  2 +-
 gdb/testsuite/gdb.base/overlays.exp                  |  2 +-
 gdb/testsuite/gdb.base/pending.exp                   |  2 +-
 gdb/testsuite/gdb.base/pointers.exp                  |  2 +-
 gdb/testsuite/gdb.base/pr11022.exp                   |  2 +-
 gdb/testsuite/gdb.base/printcmds.exp                 |  2 +-
 gdb/testsuite/gdb.base/prologue.exp                  |  2 +-
 gdb/testsuite/gdb.base/ptr-typedef.exp               |  2 +-
 gdb/testsuite/gdb.base/realname-expand.exp           |  2 +-
 gdb/testsuite/gdb.base/relativedebug.exp             |  2 +-
 gdb/testsuite/gdb.base/relocate.exp                  |  2 +-
 gdb/testsuite/gdb.base/remote.exp                    |  2 +-
 gdb/testsuite/gdb.base/reread.exp                    |  4 ++--
 gdb/testsuite/gdb.base/return2.exp                   |  4 ++--
 gdb/testsuite/gdb.base/savedregs.exp                 |  2 +-
 gdb/testsuite/gdb.base/sep.exp                       |  2 +-
 gdb/testsuite/gdb.base/sepdebug.exp                  |  2 +-
 gdb/testsuite/gdb.base/sepsymtab.exp                 |  2 +-
 gdb/testsuite/gdb.base/set-inferior-tty.exp          |  2 +-
 gdb/testsuite/gdb.base/setshow.exp                   |  2 +-
 gdb/testsuite/gdb.base/shlib-call.exp                |  2 +-
 gdb/testsuite/gdb.base/sigaltstack.exp               |  2 +-
 gdb/testsuite/gdb.base/siginfo-addr.exp              |  2 +-
 gdb/testsuite/gdb.base/signals.exp                   |  2 +-
 gdb/testsuite/gdb.base/signull.exp                   |  2 +-
 gdb/testsuite/gdb.base/sigrepeat.exp                 |  2 +-
 gdb/testsuite/gdb.base/so-impl-ld.exp                |  2 +-
 gdb/testsuite/gdb.base/solib-display.exp             |  2 +-
 gdb/testsuite/gdb.base/solib-overlap.exp             |  4 ++--
 gdb/testsuite/gdb.base/solib-search.exp              |  4 ++--
 gdb/testsuite/gdb.base/solib-symbol.exp              |  2 +-
 gdb/testsuite/gdb.base/structs.exp                   |  2 +-
 gdb/testsuite/gdb.base/structs2.exp                  |  2 +-
 gdb/testsuite/gdb.base/symtab-search-order.exp       |  2 +-
 gdb/testsuite/gdb.base/twice.exp                     |  2 +-
 gdb/testsuite/gdb.base/unload.exp                    |  2 +-
 gdb/testsuite/gdb.base/varargs.exp                   |  2 +-
 gdb/testsuite/gdb.base/watchpoint-solib.exp          |  2 +-
 gdb/testsuite/gdb.base/watchpoint.exp                |  2 +-
 gdb/testsuite/gdb.base/whatis.exp                    |  2 +-
 gdb/testsuite/gdb.base/wrong_frame_bt_full.exp       |  2 +-
 gdb/testsuite/gdb.btrace/dlopen.exp                  |  2 +-
 gdb/testsuite/gdb.cell/ea-standalone.exp             |  2 +-
 gdb/testsuite/gdb.cell/ea-test.exp                   |  2 +-
 gdb/testsuite/gdb.cp/dispcxx.exp                     |  2 +-
 gdb/testsuite/gdb.cp/gdb2384.exp                     |  2 +-
 gdb/testsuite/gdb.cp/method2.exp                     |  2 +-
 gdb/testsuite/gdb.cp/nextoverthrow.exp               |  2 +-
 gdb/testsuite/gdb.cp/pr10728.exp                     |  6 +++---
 gdb/testsuite/gdb.disasm/am33.exp                    |  2 +-
 gdb/testsuite/gdb.disasm/h8300s.exp                  |  2 +-
 gdb/testsuite/gdb.disasm/mn10300.exp                 |  2 +-
 gdb/testsuite/gdb.disasm/sh3.exp                     |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp       |  2 +-
 gdb/testsuite/gdb.fortran/complex.exp                |  2 +-
 gdb/testsuite/gdb.fortran/library-module.exp         |  4 ++--
 gdb/testsuite/gdb.guile/scm-pretty-print.exp         |  2 +-
 gdb/testsuite/gdb.guile/scm-symbol.exp               |  2 +-
 gdb/testsuite/gdb.guile/scm-type.exp                 |  2 +-
 gdb/testsuite/gdb.guile/scm-value.exp                |  2 +-
 gdb/testsuite/gdb.linespec/linespec.exp              |  2 +-
 gdb/testsuite/gdb.mi/gdb701.exp                      |  2 +-
 gdb/testsuite/gdb.mi/gdb792.exp                      |  2 +-
 gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp       |  4 ++--
 gdb/testsuite/gdb.mi/mi-dprintf-pending.exp          |  4 ++--
 gdb/testsuite/gdb.mi/mi-dprintf.exp                  |  2 +-
 gdb/testsuite/gdb.mi/mi-exit-code.exp                |  2 +-
 gdb/testsuite/gdb.mi/mi-pending.exp                  |  4 ++--
 gdb/testsuite/gdb.mi/mi-solib.exp                    |  2 +-
 gdb/testsuite/gdb.mi/new-ui-mi-sync.exp              |  2 +-
 gdb/testsuite/gdb.mi/pr11022.exp                     |  2 +-
 gdb/testsuite/gdb.mi/user-selected-context-sync.exp  |  2 +-
 gdb/testsuite/gdb.opt/solib-intra-step.exp           |  2 +-
 gdb/testsuite/gdb.python/py-events.exp               |  2 +-
 gdb/testsuite/gdb.python/py-finish-breakpoint.exp    |  2 +-
 gdb/testsuite/gdb.python/py-mi.exp                   |  2 +-
 gdb/testsuite/gdb.python/py-prettyprint.exp          |  2 +-
 gdb/testsuite/gdb.python/py-shared.exp               |  4 ++--
 gdb/testsuite/gdb.python/py-symbol.exp               |  2 +-
 gdb/testsuite/gdb.python/py-template.exp             |  2 +-
 gdb/testsuite/gdb.python/py-type.exp                 |  2 +-
 gdb/testsuite/gdb.python/py-value.exp                |  2 +-
 gdb/testsuite/gdb.reverse/solib-precsave.exp         |  6 +++---
 gdb/testsuite/gdb.reverse/solib-reverse.exp          |  6 +++---
 gdb/testsuite/gdb.server/solib-list.exp              |  2 +-
 gdb/testsuite/gdb.stabs/weird.exp                    |  2 +-
 gdb/testsuite/gdb.threads/reconnect-signal.exp       |  2 +-
 gdb/testsuite/gdb.threads/stepi-random-signal.exp    |  2 +-
 gdb/testsuite/gdb.trace/actions.exp                  |  2 +-
 gdb/testsuite/gdb.trace/ax.exp                       |  2 +-
 gdb/testsuite/gdb.trace/backtrace.exp                |  4 ++--
 gdb/testsuite/gdb.trace/change-loc.exp               |  2 +-
 gdb/testsuite/gdb.trace/deltrace.exp                 |  2 +-
 gdb/testsuite/gdb.trace/ftrace-lock.exp              |  4 ++--
 gdb/testsuite/gdb.trace/ftrace.exp                   |  2 +-
 gdb/testsuite/gdb.trace/infotrace.exp                |  2 +-
 gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp    |  4 ++--
 gdb/testsuite/gdb.trace/packetlen.exp                |  2 +-
 gdb/testsuite/gdb.trace/passcount.exp                |  2 +-
 gdb/testsuite/gdb.trace/pending.exp                  |  6 +++---
 gdb/testsuite/gdb.trace/range-stepping.exp           |  2 +-
 gdb/testsuite/gdb.trace/report.exp                   |  6 +++---
 gdb/testsuite/gdb.trace/stap-trace.exp               |  2 +-
 gdb/testsuite/gdb.trace/tfind.exp                    |  2 +-
 gdb/testsuite/gdb.trace/trace-break.exp              |  2 +-
 gdb/testsuite/gdb.trace/trace-condition.exp          |  2 +-
 gdb/testsuite/gdb.trace/trace-enable-disable.exp     |  4 ++--
 gdb/testsuite/gdb.trace/trace-mt.exp                 |  4 ++--
 gdb/testsuite/gdb.trace/tracecmd.exp                 |  2 +-
 gdb/testsuite/gdb.trace/tspeed.exp                   |  2 +-
 gdb/testsuite/gdb.trace/tsv.exp                      |  2 +-
 gdb/testsuite/lib/perftest.exp                       |  2 +-
 192 files changed, 236 insertions(+), 238 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/start.exp b/gdb/testsuite/gdb.ada/start.exp
index 9a55f8f..b01731e 100644
--- a/gdb/testsuite/gdb.ada/start.exp
+++ b/gdb/testsuite/gdb.ada/start.exp
@@ -20,7 +20,7 @@ if { [skip_ada_tests] } { return -1 }
 # This testcase verifies the behavior of the `start' command, which
 # does not work when we use the gdb stub...
 if [target_info exists use_gdb_stub] {
-    untested start.exp
+    untested "skipping test due to gdb stub"
     return
 }
 
@@ -34,7 +34,7 @@ clean_restart ${testfile}
 
 # Verify that "start" lands inside the right procedure.
 if { [gdb_start_cmd] < 0 } {
-    untested start
+    untested "start failed to land inside the right procedure"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/alpha-step.exp b/gdb/testsuite/gdb.arch/alpha-step.exp
index 16743fb..5395a0d 100644
--- a/gdb/testsuite/gdb.arch/alpha-step.exp
+++ b/gdb/testsuite/gdb.arch/alpha-step.exp
@@ -24,7 +24,7 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "testcase compile failed."
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/e500-prologue.exp b/gdb/testsuite/gdb.arch/e500-prologue.exp
index 68e6664..47f5d5f 100644
--- a/gdb/testsuite/gdb.arch/e500-prologue.exp
+++ b/gdb/testsuite/gdb.arch/e500-prologue.exp
@@ -27,7 +27,7 @@ set testfile "e500-prologue"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "testcase compile failed."
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
index edf767f..106261a 100644
--- a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
+++ b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
@@ -46,7 +46,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.arch/gdb1291.exp b/gdb/testsuite/gdb.arch/gdb1291.exp
index 35c9ef0..ea61b39 100644
--- a/gdb/testsuite/gdb.arch/gdb1291.exp
+++ b/gdb/testsuite/gdb.arch/gdb1291.exp
@@ -33,7 +33,7 @@ set testfile "gdb1291"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    untested gdb1291.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1431.exp b/gdb/testsuite/gdb.arch/gdb1431.exp
index c35cc5d..31bfb0a 100644
--- a/gdb/testsuite/gdb.arch/gdb1431.exp
+++ b/gdb/testsuite/gdb.arch/gdb1431.exp
@@ -35,7 +35,7 @@ set testfile "gdb1431"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    untested gdb1431.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp
index 8cea6d3..cd24bd5 100644
--- a/gdb/testsuite/gdb.arch/gdb1558.exp
+++ b/gdb/testsuite/gdb.arch/gdb1558.exp
@@ -32,7 +32,7 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 # Note we have to compile WITH optimization and WITHOUT debugging information to expose the bug.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {"additional_flags=-O2"}] != "" } {
-    untested gdb1558.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
index 80acdb4..bdab7bf 100644
--- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
+++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
@@ -26,7 +26,7 @@ if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
 standard_testfile
 
 if [prepare_for_testing ${testfile}.exp ${binfile} ${srcfile} {debug $additional_flags}] {
-    untested "failed to compile ${testfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
index 525cbd2..14ce922 100644
--- a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
@@ -31,7 +31,7 @@ if [info exists COMPILE] {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
-    unsupported "cannot compile ${srcfile}"
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
index 32367c9..60b9830 100644
--- a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
@@ -22,7 +22,7 @@ set testfile ia64-breakpoint-shadow
 set srcfile ${testfile}.S
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
index 9a98fe4..55d38f8 100644
--- a/gdb/testsuite/gdb.arch/pa-nullify.exp
+++ b/gdb/testsuite/gdb.arch/pa-nullify.exp
@@ -36,7 +36,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 set gcorefile ${objdir}/${subdir}/${testfile}.gcore
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "testcase compile failed."
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
index f028e94..ed0c4a3 100644
--- a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
@@ -27,7 +27,7 @@ set testfile "powerpc-aix-prologue"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "testcase compile failed."
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
index b00571b..0e80a90 100644
--- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
+++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
@@ -25,7 +25,7 @@ set srcfile ${testfile}.S
 set opts {}
 
 if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] {
-    untested "failed to compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index 38b594c..4d4ba29 100644
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -34,7 +34,7 @@ set breakpoints_invalid "\r\n\032\032breakpoints-invalid\r\n"
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested annota1.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index de11c4a..a472cb4 100644
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ b/gdb/testsuite/gdb.base/annota3.exp
@@ -33,7 +33,7 @@ if [is_remote target] then {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested annota3.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/arrayidx.exp b/gdb/testsuite/gdb.base/arrayidx.exp
index c7c707a..c9dc011 100644
--- a/gdb/testsuite/gdb.base/arrayidx.exp
+++ b/gdb/testsuite/gdb.base/arrayidx.exp
@@ -20,7 +20,7 @@
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/assign.exp b/gdb/testsuite/gdb.base/assign.exp
index 7f1484e..bd9afc9 100644
--- a/gdb/testsuite/gdb.base/assign.exp
+++ b/gdb/testsuite/gdb.base/assign.exp
@@ -28,7 +28,7 @@
 standard_testfile all-types.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested assign.exp
+     untested "failed to compile"
      return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index bd0760c..0e6727e 100644
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -30,14 +30,14 @@ remote_exec build "rm -f ${binfile} ${binfile2}"
 # build the first test case
 #
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested attach.exp
+    untested "failed to compile"
     return -1
 }
 
 # Build the in-system-call test
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-    untested attach.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index 484d201..6edb36d 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 		  {debug additional_flags=-DUSE_RLIMIT}] != ""
      && [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 		  {debug}] != "" } {
-    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bang.exp b/gdb/testsuite/gdb.base/bang.exp
index 26a4156..d9949cf 100644
--- a/gdb/testsuite/gdb.base/bang.exp
+++ b/gdb/testsuite/gdb.base/bang.exp
@@ -20,7 +20,7 @@ standard_testfile args.c
 
 if {[prepare_for_testing $testfile.exp ${testfile}! $srcfile \
 	 {debug nowarnings}]} {
-    untested bang.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bfp-test.exp b/gdb/testsuite/gdb.base/bfp-test.exp
index 91c7e51..2fc9877 100644
--- a/gdb/testsuite/gdb.base/bfp-test.exp
+++ b/gdb/testsuite/gdb.base/bfp-test.exp
@@ -19,7 +19,7 @@
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
index 62ca2b1..14c6d76 100644
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ b/gdb/testsuite/gdb.base/bigcore.exp
@@ -42,7 +42,7 @@ standard_testfile .c
 set corefile [standard_output_file ${binfile}.corefile]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested bigcore.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bitfields2.exp b/gdb/testsuite/gdb.base/bitfields2.exp
index 0f7b7c7..b556eb9 100644
--- a/gdb/testsuite/gdb.base/bitfields2.exp
+++ b/gdb/testsuite/gdb.base/bitfields2.exp
@@ -26,7 +26,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested bitfields2.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/break-fun-addr.exp b/gdb/testsuite/gdb.base/break-fun-addr.exp
index 938ec87..949aa80 100644
--- a/gdb/testsuite/gdb.base/break-fun-addr.exp
+++ b/gdb/testsuite/gdb.base/break-fun-addr.exp
@@ -36,7 +36,7 @@ set srcfile1 ${testfile1}.c
 set binfile1 [standard_output_file ${testfile1}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile1}"
+    untested "failed to compile"
     return -1
 }
 
@@ -65,7 +65,7 @@ set srcfile2 ${testfile2}.c
 set binfile2 [standard_output_file ${testfile2}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile2}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp
index bb8eee0..6813043 100644
--- a/gdb/testsuite/gdb.base/break-probes.exp
+++ b/gdb/testsuite/gdb.base/break-probes.exp
@@ -28,7 +28,7 @@ set probes_bp "dl_main"
 
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "could not compile $binfile_lib."
+    untested "failed to compile shared library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
index 7120b8b..4351c41 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -24,7 +24,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/callexit.exp
index e904200..c1e817a 100644
--- a/gdb/testsuite/gdb.base/callexit.exp
+++ b/gdb/testsuite/gdb.base/callexit.exp
@@ -17,7 +17,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested callexit.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/catch-fork-kill.exp b/gdb/testsuite/gdb.base/catch-fork-kill.exp
index 29d2077..a25147e 100644
--- a/gdb/testsuite/gdb.base/catch-fork-kill.exp
+++ b/gdb/testsuite/gdb.base/catch-fork-kill.exp
@@ -41,7 +41,7 @@ foreach kind {"fork" "vfork"} {
     set testfile [set testfile_$kind]
     if {[build_executable $testfile.exp $testfile ${srcfile} \
 	     ${compile_options}] == -1} {
-	untested "failed to compile $testfile"
+	untested "failed to compile"
 	return -1
     }
 }
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 5e930ef..7662937 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -146,7 +146,7 @@ gdb_expect {
 # sets: "auto" and the default.  In this situation, this set of tests
 # is pointless.
 if {[llength [array names charsets]] < 3} {
-    untested charset.exp
+    untested "fewer than 3 charsets"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index 0c52092..73ea08a 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -38,7 +38,7 @@ if {[is_remote host]} {
 
 if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \
 	 [list debug "additional_flags=-DPI_TXT=\"$pi_txt\" -DCOPY1_TXT=\"$copy1_txt\""]]} {
-     untested checkpoint.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/comprdebug.exp b/gdb/testsuite/gdb.base/comprdebug.exp
index 08d48ea..09d426c 100644
--- a/gdb/testsuite/gdb.base/comprdebug.exp
+++ b/gdb/testsuite/gdb.base/comprdebug.exp
@@ -18,7 +18,7 @@ standard_testfile average.c
 set ofile "${binfile}0.o"
 if {[gdb_compile $srcdir/$subdir/$srcfile $ofile \
 	 object {debug}] != ""} {
-    untested comprdebug.exp
+    untested "failed to compile"
     return
 }
 
@@ -30,7 +30,7 @@ verbose "result is $result"
 verbose "output is $output"
 
 if {$result == 1} {
-    untested comprdebug.exp
+    untested "failed to execute objcopy"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index d6bae74..48cebe5 100644
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ b/gdb/testsuite/gdb.base/constvars.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
-    untested constvars.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/coredump-filter.exp b/gdb/testsuite/gdb.base/coredump-filter.exp
index bf1e8a5..5749418 100644
--- a/gdb/testsuite/gdb.base/coredump-filter.exp
+++ b/gdb/testsuite/gdb.base/coredump-filter.exp
@@ -22,7 +22,7 @@ if ![istarget *-*-linux*] then {
 }
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
-    untested "could not compile test program"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/cursal.exp b/gdb/testsuite/gdb.base/cursal.exp
index efaa7c7..6834d76 100644
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ b/gdb/testsuite/gdb.base/cursal.exp
@@ -17,7 +17,7 @@
 standard_testfile
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != ""} {
-    untested "couldn't compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/cvexpr.exp b/gdb/testsuite/gdb.base/cvexpr.exp
index 4bdda762..26dd714 100644
--- a/gdb/testsuite/gdb.base/cvexpr.exp
+++ b/gdb/testsuite/gdb.base/cvexpr.exp
@@ -25,7 +25,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested cvexpr.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/detach.exp b/gdb/testsuite/gdb.base/detach.exp
index b9343ee..4095f90 100644
--- a/gdb/testsuite/gdb.base/detach.exp
+++ b/gdb/testsuite/gdb.base/detach.exp
@@ -26,7 +26,7 @@ standard_testfile attach.c
 set escapedbinfile  [string_to_regexp ${binfile}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested detach.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index 9576be54..c02fcf5 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -20,7 +20,7 @@ standard_testfile
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile \
 	 {debug nowarnings}]} {
-    untested display.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dmsym.exp b/gdb/testsuite/gdb.base/dmsym.exp
index b071424..0153b6e 100644
--- a/gdb/testsuite/gdb.base/dmsym.exp
+++ b/gdb/testsuite/gdb.base/dmsym.exp
@@ -26,7 +26,7 @@ set dmsym_o [standard_output_file dmsym.o]
 if {[gdb_compile "${srcdir}/${subdir}/dmsym.c" \
                  $dmsym_o \
                  object {}] != ""} {
-  untested dmsym.exp
+  untested "failed to compile"
   return -1
 }
 
@@ -34,7 +34,7 @@ if {[gdb_compile \
       [list ${srcdir}/${subdir}/dmsym_main.c $dmsym_o] \
       [standard_output_file ${testfile}] \
       executable {debug}] != ""} {
-    untested dmsym.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dprintf-pending.exp b/gdb/testsuite/gdb.base/dprintf-pending.exp
index 10df3fb..4a5fa93 100644
--- a/gdb/testsuite/gdb.base/dprintf-pending.exp
+++ b/gdb/testsuite/gdb.base/dprintf-pending.exp
@@ -32,7 +32,7 @@ if { [get_compiler_info] } {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "failed to compile shared library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dso2dso.exp b/gdb/testsuite/gdb.base/dso2dso.exp
index f620d2c..aacbac1 100644
--- a/gdb/testsuite/gdb.base/dso2dso.exp
+++ b/gdb/testsuite/gdb.base/dso2dso.exp
@@ -41,13 +41,13 @@ set binfile_libdso1 [standard_output_file $libdso1.so]
 
 if { [gdb_compile_shlib $srcfile_libdso2 $binfile_libdso2 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "could not compile $binfile_libdso2."
+  untested "failed to compile shared library"
   return -1
 }
 
 if { [gdb_compile_shlib $srcfile_libdso1 $binfile_libdso1 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "could not compile $binfile_libdso1."
+  untested "failed to compile shared library"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dtrace-probe.exp b/gdb/testsuite/gdb.base/dtrace-probe.exp
index c4f1a78..06a7ae0 100644
--- a/gdb/testsuite/gdb.base/dtrace-probe.exp
+++ b/gdb/testsuite/gdb.base/dtrace-probe.exp
@@ -23,7 +23,7 @@ proc dtrace_test {} {
     standard_testfile
     
     if {[dtrace_build_usdt_test_program] == -1} {
-        untested "could not compile test program"
+        untested "failed to compile"
         return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index a38f9d1..58b0121 100644
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -37,7 +37,7 @@ if {[istarget "spu*-*-*"]} then {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ${options}] != "" } {
-     untested dump.exp
+     untested "failed to compile"
      return -1
 }
 
@@ -95,7 +95,7 @@ remote_exec host "rm -f $filenames"
 # Run target program until data structs are initialized.
 
 if { ! [ runto checkpoint1 ] } then {
-    untested dump.exp
+    untested "couldn't run to checkpoint"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/enum_cond.exp b/gdb/testsuite/gdb.base/enum_cond.exp
index 4be8a8a..6626b01 100644
--- a/gdb/testsuite/gdb.base/enum_cond.exp
+++ b/gdb/testsuite/gdb.base/enum_cond.exp
@@ -21,7 +21,7 @@ standard_testfile .c
 
 set opts [list debug additional_flags=-fshort-enums]
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
-    untested "could not compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/exe-lock.exp b/gdb/testsuite/gdb.base/exe-lock.exp
index 8cb8f9d..b09609f 100644
--- a/gdb/testsuite/gdb.base/exe-lock.exp
+++ b/gdb/testsuite/gdb.base/exe-lock.exp
@@ -23,7 +23,7 @@ standard_testfile arrayidx.c
 append binfile $EXEEXT
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
index a089e89..8d94c39 100644
--- a/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
+++ b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
@@ -29,12 +29,12 @@ set compile_options debug
 
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $compile_options] != "" } {
-    untested "could not compile test program ${binfile2}"
+    untested "failed to compile"
     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $compile_options] != "" } {
-    untested "could not compile test program ${binfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
index 1c2713f..ad648f0 100644
--- a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
+++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
@@ -28,7 +28,7 @@ set exec2 ${binfile}2
 
 if { [gdb_compile [file join $srcdir $subdir $srcfile] $objfile \
 	  object [list debug]] != "" } {
-    untested "compile failed"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp
index 446f8cc..2b17270 100644
--- a/gdb/testsuite/gdb.base/exprs.exp
+++ b/gdb/testsuite/gdb.base/exprs.exp
@@ -22,7 +22,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested exprs.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index 5dd2f20..2265a15 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -32,7 +32,7 @@ if {[is_remote host]} {
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	   executable \
 	   [list debug "additional_flags=-DOUTDIR=\"$outdir/\""]] != "" } {
-    untested fileio.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/find.exp b/gdb/testsuite/gdb.base/find.exp
index c4bdfb7..b6e96af 100644
--- a/gdb/testsuite/gdb.base/find.exp
+++ b/gdb/testsuite/gdb.base/find.exp
@@ -18,7 +18,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested find.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp
index c5387bb..35294cc 100644
--- a/gdb/testsuite/gdb.base/finish.exp
+++ b/gdb/testsuite/gdb.base/finish.exp
@@ -90,7 +90,7 @@ proc finish_tests { } {
     global gdb_prompt skip_float_test
 
     if { ! [ runto_main ] } then {
-	untested finish.exp
+	untested "couldn't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/fixsection.exp b/gdb/testsuite/gdb.base/fixsection.exp
index 5b7fdf6..c000562 100644
--- a/gdb/testsuite/gdb.base/fixsection.exp
+++ b/gdb/testsuite/gdb.base/fixsection.exp
@@ -34,7 +34,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile \
 	     executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp
index 481dcb7..79918e1 100644
--- a/gdb/testsuite/gdb.base/foll-vfork.exp
+++ b/gdb/testsuite/gdb.base/foll-vfork.exp
@@ -30,7 +30,7 @@ standard_testfile
 set compile_options debug
 
 if {[build_executable $testfile.exp $testfile $srcfile $compile_options] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
@@ -38,7 +38,7 @@ set testfile2 "vforked-prog"
 set srcfile2 ${testfile2}.c
 
 if {[build_executable $testfile.exp $testfile2 $srcfile2 $compile_options] == -1} {
-    untested "failed to compile $testfile2"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/frame-args.exp b/gdb/testsuite/gdb.base/frame-args.exp
index 08eb5d8..dbda4a9 100644
--- a/gdb/testsuite/gdb.base/frame-args.exp
+++ b/gdb/testsuite/gdb.base/frame-args.exp
@@ -15,7 +15,7 @@
 
 standard_testfile .c
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index a41f8e5..9f27170 100644
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ b/gdb/testsuite/gdb.base/gcore.exp
@@ -20,12 +20,12 @@
 standard_testfile
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-    untested $testfile.exp
+    untested "failed to compile"
     return -1
 }
 
 if { ! [ runto_main ] } then {
-    untested gcore.exp
+    untested "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/gdb1250.exp b/gdb/testsuite/gdb.base/gdb1250.exp
index 1a7c8e4..3d5cf54 100644
--- a/gdb/testsuite/gdb.base/gdb1250.exp
+++ b/gdb/testsuite/gdb.base/gdb1250.exp
@@ -25,7 +25,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested gdb1250.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp b/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
index 7285962..2e01f77 100644
--- a/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
+++ b/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
@@ -29,13 +29,13 @@ set binfile_lib2 [standard_output_file $lib2name.so]
 
 if { [gdb_compile_shlib $srcfile_lib1 $binfile_lib1 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "could not compile $binfile_lib1."
+  untested "failed to compile shared library"
   return -1
 }
 
 if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "could not compile $binfile_lib2."
+  untested "failed to compile shared library"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp
index ce9e11f..4efec27 100644
--- a/gdb/testsuite/gdb.base/gnu-ifunc.exp
+++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp
@@ -52,7 +52,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/$libsrc $lib_so $lib_opts] != ""
      || [gdb_compile ${srcdir}/${subdir}/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile dynamic executable $binfile."
+    untested "failed to compile"
     return -1
 }
 
@@ -144,7 +144,7 @@ gdb_test "info sym $expect_out(1,string)" "gnu_ifunc in section .*" "info sym <g
 
 if { [gdb_compile ${srcdir}/${subdir}/$libsrc $lib_o object {}] != ""
      || [gdb_compile "${srcdir}/${subdir}/$srcfile $lib_o" $staticbinfile executable {debug}] != "" } {
-    untested "could not compile static executable $staticbinfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hashline1.exp b/gdb/testsuite/gdb.base/hashline1.exp
index c57d4a6..d0e86ce 100644
--- a/gdb/testsuite/gdb.base/hashline1.exp
+++ b/gdb/testsuite/gdb.base/hashline1.exp
@@ -33,7 +33,7 @@ close $fd
 # the bug.  Using $new_srcfile here won't trigger the bug.
 set compile_name [relative_filename $objdir $new_srcfile]
 if { [gdb_compile $compile_name "${binfile}" executable {debug}] != "" } {
-    untested hashline1.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hashline2.exp b/gdb/testsuite/gdb.base/hashline2.exp
index bbdb5bd..fce6e7e 100644
--- a/gdb/testsuite/gdb.base/hashline2.exp
+++ b/gdb/testsuite/gdb.base/hashline2.exp
@@ -30,7 +30,7 @@ puts $fd "int main () { return 0; } /* set breakpoint here */"
 close $fd
 
 if { [gdb_compile $new_srcfile "${binfile}" executable {debug}] != "" } {
-    untested hashline2.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hashline3.exp b/gdb/testsuite/gdb.base/hashline3.exp
index a2a9b3d..ace14dc 100644
--- a/gdb/testsuite/gdb.base/hashline3.exp
+++ b/gdb/testsuite/gdb.base/hashline3.exp
@@ -31,7 +31,7 @@ puts $fd "int main () { return 0; } /* set breakpoint here */"
 close $fd
 
 if { [gdb_compile $new_srcfile "${binfile}" executable {debug}] != "" } {
-    untested hashline3.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
index 28ab3d6..dee3bca 100644
--- a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
+++ b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib_src} ${lib_so} $lib_opts] != ""
      || [gdb_compile ${srcdir}/${subdir}/${main_src} ${binfile} executable $exec_opts] != ""} {
-    untested "could not compile ${subdir}/$lib_src or ${subdir}/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp
index 4dca89b..e95acd5 100644
--- a/gdb/testsuite/gdb.base/huge.exp
+++ b/gdb/testsuite/gdb.base/huge.exp
@@ -31,7 +31,7 @@ for { set size [expr 2 * 1024 * 1024] } { $size > 10 } { set size [expr $size /
       == "" } break
 }
 if { $size < 10 } {
-     untested huge.exp
+     untested "size less than 10"
      return -1
 }
 
@@ -43,7 +43,7 @@ set prev_timeout $timeout
 set timeout 30
 
 if { ! [ runto_main ] } then {
-    untested huge.exp
+    untested "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.base/infcall-input.exp
index c970c0e..5e764f0 100644
--- a/gdb/testsuite/gdb.base/infcall-input.exp
+++ b/gdb/testsuite/gdb.base/infcall-input.exp
@@ -24,7 +24,7 @@ if [target_info exists gdb,cannot_call_functions] {
 }
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-    untested "compile failed"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp
index 2eec698..a5503e2 100644
--- a/gdb/testsuite/gdb.base/info-fun.exp
+++ b/gdb/testsuite/gdb.base/info-fun.exp
@@ -40,7 +40,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $sep_lib_flags] != ""
 	 || [gdb_compile $srcdir/$subdir/${srcfile} ${binfile} \
 		 executable $bin_flags] != "" } {
-      untested "could not compile $binfile_lib or $binfile."
+      untested "failed to compile"
       return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/info-shared.exp b/gdb/testsuite/gdb.base/info-shared.exp
index 57aa1d0..05b71d1 100644
--- a/gdb/testsuite/gdb.base/info-shared.exp
+++ b/gdb/testsuite/gdb.base/info-shared.exp
@@ -31,13 +31,13 @@ set define2 -DSHLIB2_NAME=\"$binfile_lib2\"
 
 if { [gdb_compile_shlib $srcfile_lib1 $binfile_lib1 \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "could not compile $binfile_lib1."
+    untested "failed to compile shared library"
     return -1
 }
 
 if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "could not compile $binfile_lib2."
+    untested "failed to compile shared library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/jit-simple.exp b/gdb/testsuite/gdb.base/jit-simple.exp
index c1a079a..63f7526 100644
--- a/gdb/testsuite/gdb.base/jit-simple.exp
+++ b/gdb/testsuite/gdb.base/jit-simple.exp
@@ -64,12 +64,12 @@ proc build_shared_jit {{options ""}} {
 }
 
 if {[build_standalone_jit] == -1} {
-    untested "could not compile $binfile"
+    untested "failed to compile"
     return
 }
 
 if {[build_shared_jit] == -1} {
-    untested "could not compile $binfile_lib"
+    untested "failed to compile"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/jit-so.exp b/gdb/testsuite/gdb.base/jit-so.exp
index b2e2955..6da3374 100644
--- a/gdb/testsuite/gdb.base/jit-so.exp
+++ b/gdb/testsuite/gdb.base/jit-so.exp
@@ -17,13 +17,12 @@
 # library.
 
 if {[skip_shlib_tests]} {
-    untested jit-so.exp
+    untested "skipping shared library tests"
     return -1
 }
 
 if {[get_compiler_info]} {
-    warning "Could not get compiler info"
-    untested jit-so.exp
+    untested "could not get compiler info"
     return 1
 }
 
@@ -35,7 +34,7 @@ set testfile jit-dlmain
 set srcfile ${testfile}.c
 set binfile [standard_output_file ${testfile}]
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } {
-    untested jit-so.exp
+    untested "failed to compile"
     return -1
 }
 
@@ -44,7 +43,7 @@ set srcfile2 ${testfile2}.c
 set binfile2 [standard_output_file ${testfile2}.so]
 set binfile2_dlopen [shlib_target_file ${testfile2}.so]
 if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug additional_flags="-DMAIN=jit_dl_main"}] != "" } {
-    untested jit.exp
+    untested "failed to compile shared library"
     return -1
 }
 
@@ -57,7 +56,7 @@ set solib_binfile_test_msg "SHLIBDIR/${solib_testfile}.so"
 # renaming by munging on its symbol table, and that wouldn't work for .debug
 # sections.  Also, output for "info function" changes when debug info is resent.
 if { [gdb_compile_shlib ${solib_srcfile} ${solib_binfile} {}] != "" } {
-    untested jit-so.exp
+    untested "failed to compile shared library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/jit.exp b/gdb/testsuite/gdb.base/jit.exp
index 528c330..689bc27 100644
--- a/gdb/testsuite/gdb.base/jit.exp
+++ b/gdb/testsuite/gdb.base/jit.exp
@@ -14,13 +14,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if {[skip_shlib_tests]} {
-    untested jit.exp
+    untested "skipping shared library tests"
     return -1
 }
 
 if {[get_compiler_info]} {
-    warning "Could not get compiler info"
-    untested jit.exp
+    untested "could not get compiler info"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.base/jump.exp b/gdb/testsuite/gdb.base/jump.exp
index 7e03d90..37f56dd 100644
--- a/gdb/testsuite/gdb.base/jump.exp
+++ b/gdb/testsuite/gdb.base/jump.exp
@@ -20,7 +20,7 @@ standard_testfile .c
 
 # Build the test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested jump.exp
+     untested "failed to compile"
      return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/label.exp b/gdb/testsuite/gdb.base/label.exp
index 18b6f83..2901c33 100644
--- a/gdb/testsuite/gdb.base/label.exp
+++ b/gdb/testsuite/gdb.base/label.exp
@@ -26,7 +26,7 @@ if [is_remote target] then {
 standard_testfile .c
 
 if { [prepare_for_testing ${testfile}.exp $testfile ${srcfile} debug] } {
-    untested label.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/lineinc.exp b/gdb/testsuite/gdb.base/lineinc.exp
index 4070f4e..97b61d4 100644
--- a/gdb/testsuite/gdb.base/lineinc.exp
+++ b/gdb/testsuite/gdb.base/lineinc.exp
@@ -81,7 +81,7 @@
 standard_testfile .c
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" ${binfile} executable {debug}] != ""} {
-    untested lineinc.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp
index 1efc5f6..99e7a86 100644
--- a/gdb/testsuite/gdb.base/logical.exp
+++ b/gdb/testsuite/gdb.base/logical.exp
@@ -28,7 +28,7 @@
 standard_testfile int-type.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested logical.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/longjmp.exp b/gdb/testsuite/gdb.base/longjmp.exp
index b8d67fd..e0e47a7 100644
--- a/gdb/testsuite/gdb.base/longjmp.exp
+++ b/gdb/testsuite/gdb.base/longjmp.exp
@@ -21,7 +21,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested longjmp.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index aec18fb..a3246c5 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -30,7 +30,7 @@ if [test_compiler_info gcc*] {
 if  {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${objfile}" \
 	  object $options] != "" 
      || [gdb_compile "${objfile}" "${binfile}" executable $options] != "" } {
-    untested macscp.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index 059c434..297f792 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -40,7 +40,7 @@ set additional_flags "additional_flags=${storage}"
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ${additional_flags} nowarnings]] != "" } {
-    untested miscexprs.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/new-ui-echo.exp b/gdb/testsuite/gdb.base/new-ui-echo.exp
index c182445..ab923da 100644
--- a/gdb/testsuite/gdb.base/new-ui-echo.exp
+++ b/gdb/testsuite/gdb.base/new-ui-echo.exp
@@ -24,7 +24,7 @@ standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
index 325c30f..c51d878 100644
--- a/gdb/testsuite/gdb.base/new-ui-pending-input.exp
+++ b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
@@ -21,7 +21,7 @@ standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/new-ui.exp b/gdb/testsuite/gdb.base/new-ui.exp
index 22e8b79..52b81ec 100644
--- a/gdb/testsuite/gdb.base/new-ui.exp
+++ b/gdb/testsuite/gdb.base/new-ui.exp
@@ -17,7 +17,7 @@ standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp
index e0dd0e1..ff69c04 100644
--- a/gdb/testsuite/gdb.base/nodebug.exp
+++ b/gdb/testsuite/gdb.base/nodebug.exp
@@ -31,7 +31,7 @@ if [test_compiler_info "xlc-*"] {
 }
 
 if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "couldn't compile $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/nofield.exp b/gdb/testsuite/gdb.base/nofield.exp
index 9b06ba1..b8837b7 100644
--- a/gdb/testsuite/gdb.base/nofield.exp
+++ b/gdb/testsuite/gdb.base/nofield.exp
@@ -16,7 +16,7 @@
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/offsets.exp b/gdb/testsuite/gdb.base/offsets.exp
index b65fac7..9637eab 100644
--- a/gdb/testsuite/gdb.base/offsets.exp
+++ b/gdb/testsuite/gdb.base/offsets.exp
@@ -19,7 +19,7 @@ standard_testfile offsets.c
 
 if { [prepare_for_testing "failed to prepare for testing large offsets" \
 	  ${testfile} ${srcfile}] } {
-    untested offsets.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp
index b76f445..6b02bdf 100644
--- a/gdb/testsuite/gdb.base/overlays.exp
+++ b/gdb/testsuite/gdb.base/overlays.exp
@@ -42,7 +42,7 @@ standard_testfile overlays.c ovlymgr.c foo.c bar.c baz.c grbx.c
 if {[build_executable $testfile.exp $testfile \
 	 [list $srcfile $srcfile2 $srcfile3 $srcfile4 $srcfile5 $srcfile6] \
 	 {debug ldscript=-Wl,-T$linker_script}] == -1} {
-     untested overlays.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index e89f4a9..26f95a0 100644
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -37,7 +37,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
index fa1fe3e..03e70ee 100644
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ b/gdb/testsuite/gdb.base/pointers.exp
@@ -28,7 +28,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested pointers.exp
+     untested "failed to compile"
      return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/pr11022.exp b/gdb/testsuite/gdb.base/pr11022.exp
index c8b4be8..d6b6150 100644
--- a/gdb/testsuite/gdb.base/pr11022.exp
+++ b/gdb/testsuite/gdb.base/pr11022.exp
@@ -20,7 +20,7 @@ if {[skip_hw_watchpoint_tests]} {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested pr11022.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index bdddde6..c0cfeb4 100644
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -23,7 +23,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested printcmds.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/prologue.exp b/gdb/testsuite/gdb.base/prologue.exp
index efd7e0c..f2412f1 100644
--- a/gdb/testsuite/gdb.base/prologue.exp
+++ b/gdb/testsuite/gdb.base/prologue.exp
@@ -19,7 +19,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested prologue.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/ptr-typedef.exp b/gdb/testsuite/gdb.base/ptr-typedef.exp
index e9f925d..212b338 100644
--- a/gdb/testsuite/gdb.base/ptr-typedef.exp
+++ b/gdb/testsuite/gdb.base/ptr-typedef.exp
@@ -16,7 +16,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/realname-expand.exp b/gdb/testsuite/gdb.base/realname-expand.exp
index d21a403..3d6bf47 100644
--- a/gdb/testsuite/gdb.base/realname-expand.exp
+++ b/gdb/testsuite/gdb.base/realname-expand.exp
@@ -32,7 +32,7 @@ if { [file type $srcfilelink] != "link" } {
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcfilelink}" "${binfile}" \
 		  executable {debug}] != "" } {
-    untested "cannot compile ${srcdir}/${subdir}/${srcfile} and ${srcfilelink}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/relativedebug.exp b/gdb/testsuite/gdb.base/relativedebug.exp
index 9563576..677b301 100644
--- a/gdb/testsuite/gdb.base/relativedebug.exp
+++ b/gdb/testsuite/gdb.base/relativedebug.exp
@@ -21,7 +21,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/relocate.exp
index 52fc3ce..62012c4 100644
--- a/gdb/testsuite/gdb.base/relocate.exp
+++ b/gdb/testsuite/gdb.base/relocate.exp
@@ -21,7 +21,7 @@ append binfile .o
 
 remote_exec build "rm -f ${binfile}"
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } {
-     untested relocate.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index b75540a..7bc54c3 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -26,7 +26,7 @@ gdb_start
 
 set result [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}]
 if {$result != "" } then {
-    untested remote.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp
index 3116dbf..2e01a86 100644
--- a/gdb/testsuite/gdb.base/reread.exp
+++ b/gdb/testsuite/gdb.base/reread.exp
@@ -23,7 +23,7 @@ set srcfile1 ${testfile1}.c
 set binfile1 [standard_output_file ${testfile1}$EXEEXT]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable {debug nowarnings}] != "" } {
-    untested reread.exp
+    untested "failed to compile"
     return -1
 }
 
@@ -35,7 +35,7 @@ set binfile2 [standard_output_file ${testfile2}$EXEEXT]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug nowarnings}] != ""
       && [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug nowarnings additional_flags=-DNO_SECTIONS}] != ""} {
-    untested reread.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/return2.exp b/gdb/testsuite/gdb.base/return2.exp
index 77be75e..520d685 100644
--- a/gdb/testsuite/gdb.base/return2.exp
+++ b/gdb/testsuite/gdb.base/return2.exp
@@ -19,7 +19,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested return2.exp
+     untested "failed to compile"
      return -1
 }
 
@@ -82,7 +82,7 @@ proc return2_tests { } {
     global gdb_prompt skip_float_test
 
     if { ! [ runto_main ] } then {
-	untested return2.exp
+	untested "couldn't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp
index 45174a5..b461782 100644
--- a/gdb/testsuite/gdb.base/savedregs.exp
+++ b/gdb/testsuite/gdb.base/savedregs.exp
@@ -33,7 +33,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sep.exp b/gdb/testsuite/gdb.base/sep.exp
index dc860f6..3c96bb5 100644
--- a/gdb/testsuite/gdb.base/sep.exp
+++ b/gdb/testsuite/gdb.base/sep.exp
@@ -16,7 +16,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested sep.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index 2fc7a5d..878e85e 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -32,7 +32,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested sepdebug.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sepsymtab.exp b/gdb/testsuite/gdb.base/sepsymtab.exp
index 4f9a682..7d72896 100644
--- a/gdb/testsuite/gdb.base/sepsymtab.exp
+++ b/gdb/testsuite/gdb.base/sepsymtab.exp
@@ -21,7 +21,7 @@ standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	  executable {debug}] != "" } {
-    untested sepsymtab.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/set-inferior-tty.exp b/gdb/testsuite/gdb.base/set-inferior-tty.exp
index 1a5f49c..97d2bc6 100644
--- a/gdb/testsuite/gdb.base/set-inferior-tty.exp
+++ b/gdb/testsuite/gdb.base/set-inferior-tty.exp
@@ -17,7 +17,7 @@ standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp
index 93dd926..7db3c93 100644
--- a/gdb/testsuite/gdb.base/setshow.exp
+++ b/gdb/testsuite/gdb.base/setshow.exp
@@ -19,7 +19,7 @@
 standard_testfile .c
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug}] != "" } {
-     untested setshow.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp
index fff1471..762a3f3 100644
--- a/gdb/testsuite/gdb.base/shlib-call.exp
+++ b/gdb/testsuite/gdb.base/shlib-call.exp
@@ -50,7 +50,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib ${lib1src} ${lib1} $lib_opts] != ""
      || [gdb_compile_shlib ${lib2src} ${lib2} $lib_opts] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $exec_opts] != ""} {
-    untested "could not compile $lib1, $lib2, or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp
index 23373fc..1384642 100644
--- a/gdb/testsuite/gdb.base/sigaltstack.exp
+++ b/gdb/testsuite/gdb.base/sigaltstack.exp
@@ -31,7 +31,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}.c"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp
index 480110e..70900d4 100644
--- a/gdb/testsuite/gdb.base/siginfo-addr.exp
+++ b/gdb/testsuite/gdb.base/siginfo-addr.exp
@@ -28,7 +28,7 @@ if [target_info exists gdb,nosignals] {
 
 standard_testfile
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-    untested "couldn't compile ${srcfile}.c"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index 677e77f..5d7fdd1 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -22,7 +22,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested signals.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp
index 5a14bff..7822510 100644
--- a/gdb/testsuite/gdb.base/signull.exp
+++ b/gdb/testsuite/gdb.base/signull.exp
@@ -36,7 +36,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested signull.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp
index 82a9e0b..d7dd791 100644
--- a/gdb/testsuite/gdb.base/sigrepeat.exp
+++ b/gdb/testsuite/gdb.base/sigrepeat.exp
@@ -28,7 +28,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp
index 875242d..6c95c87 100644
--- a/gdb/testsuite/gdb.base/so-impl-ld.exp
+++ b/gdb/testsuite/gdb.base/so-impl-ld.exp
@@ -33,7 +33,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile \
 	     executable $exec_opts] != ""} {
-    untested "couldn't compile $libsrc or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp
index f4d6bb8..bc6cfa1 100644
--- a/gdb/testsuite/gdb.base/solib-display.exp
+++ b/gdb/testsuite/gdb.base/solib-display.exp
@@ -74,7 +74,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     }
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $sep_lib_flags] != ""
 	 || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-      untested "could not compile $binfile_lib or $binfile."
+      untested "failed to compile"
       return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/solib-overlap.exp b/gdb/testsuite/gdb.base/solib-overlap.exp
index 5b90894..dec00be 100644
--- a/gdb/testsuite/gdb.base/solib-overlap.exp
+++ b/gdb/testsuite/gdb.base/solib-overlap.exp
@@ -70,7 +70,7 @@ foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix "$prelink_lib1"
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
 	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""
 	 || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-	untested "could not compile ${binfile_lib1_test_msg}, ${binfile_lib2_test_msg} or ${binfile_test_msg}."
+	untested "failed to compile"
 	return -1
     }
 
@@ -92,7 +92,7 @@ foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix "$prelink_lib1"
 
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
 	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""} {
-	untested "could not recompile ${binfile_lib1_test_msg} or ${binfile_lib2_test_msg}."
+	untested "failed to compile shared library"
 	kill_wait_spawned_process $test_spawn_id
 	return -1
     }
diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp
index 9acd347..a080f2b 100644
--- a/gdb/testsuite/gdb.base/solib-search.exp
+++ b/gdb/testsuite/gdb.base/solib-search.exp
@@ -69,7 +69,7 @@ if { [gdb_compile_shlib ${srcfile1_lib} ${wrong_binfile1_lib} $wrong_lib_flags]
      || [gdb_compile_shlib ${srcfile2_lib} ${wrong_binfile2_lib} $wrong_lib_flags] != ""
      || [gdb_compile_shlib ${srcfile1_lib} ${right_binfile1_lib} $right_lib_flags] != ""
      || [gdb_compile_shlib ${srcfile2_lib} ${right_binfile2_lib} $right_lib_flags] != "" } {
-    untested "could not compile libs."
+    untested "failed to compile shared library"
     return -1
 }
 
@@ -78,7 +78,7 @@ remote_exec build "ln -sf ${right_lib_subdir}/${libname1}.so ${binfile1_lib}"
 remote_exec build "ln -sf ${right_lib_subdir}/${libname2}.so ${binfile2_lib}"
 if { [gdb_compile $srcdir/$subdir/${srcfile} ${binfile} \
 	  executable $bin_flags] != "" } {
-    untested "could not compile $binfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp
index 2d5631f..f74b90f 100644
--- a/gdb/testsuite/gdb.base/solib-symbol.exp
+++ b/gdb/testsuite/gdb.base/solib-symbol.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-  untested "could not compile $binfile_lib or $binfile."
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 912eb82..505894f 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -70,7 +70,7 @@ proc start_structs_test { types } {
 	# built the second test case since we can't use prototypes
 	warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES"
 	if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "${flags} additional_flags=-DNO_PROTOTYPES"] != "" } {
-	    untested structs.exp
+	    untested "failed to compile"
 	    return -1
 	}
     }
diff --git a/gdb/testsuite/gdb.base/structs2.exp b/gdb/testsuite/gdb.base/structs2.exp
index 5eaf936..fb20cd0 100644
--- a/gdb/testsuite/gdb.base/structs2.exp
+++ b/gdb/testsuite/gdb.base/structs2.exp
@@ -27,7 +27,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     # built the second test case since we can't use prototypes
     warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES"
     if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DNO_PROTOTYPES}] != "" } {
-	untested structs2.exp
+	untested "failed to compile"
 	return -1
     }
     set prototypes 0
diff --git a/gdb/testsuite/gdb.base/symtab-search-order.exp b/gdb/testsuite/gdb.base/symtab-search-order.exp
index c8d058a..d4cf731 100644
--- a/gdb/testsuite/gdb.base/symtab-search-order.exp
+++ b/gdb/testsuite/gdb.base/symtab-search-order.exp
@@ -33,7 +33,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib $lib1src $lib1 $lib_opts] != ""
      || [gdb_compile [list $srcfile $srcfile2] $binfile executable \
 	     $exec_opts] != ""} {
-    untested "could not compile $lib1, or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/twice.exp b/gdb/testsuite/gdb.base/twice.exp
index c0e8318..cd5b2ef 100644
--- a/gdb/testsuite/gdb.base/twice.exp
+++ b/gdb/testsuite/gdb.base/twice.exp
@@ -26,7 +26,7 @@ close $fileid
 gdb_remote_download host ${srcdir}/${subdir}/twice.c
 
 if  { [gdb_compile $local_srcfile "${binfile}" executable $options] != "" } {
-     untested twice.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/unload.exp b/gdb/testsuite/gdb.base/unload.exp
index aa25697..6644724 100644
--- a/gdb/testsuite/gdb.base/unload.exp
+++ b/gdb/testsuite/gdb.base/unload.exp
@@ -52,7 +52,7 @@ set exec_opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${lib_dlope
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""
      || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "couldn't compile $libsrc or $libsrc2 or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp
index 36b0107..33e6b0e 100644
--- a/gdb/testsuite/gdb.base/varargs.exp
+++ b/gdb/testsuite/gdb.base/varargs.exp
@@ -47,7 +47,7 @@ if [support_complex_tests] {
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	   executable ${additional_flags}] != "" } {
-     untested varargs.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/watchpoint-solib.exp b/gdb/testsuite/gdb.base/watchpoint-solib.exp
index 1ae972f..5626975 100644
--- a/gdb/testsuite/gdb.base/watchpoint-solib.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-solib.exp
@@ -42,7 +42,7 @@ set exec_opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${lib_dlope
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "couldn't compile $libsrc or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index fb20a0a..f8d20e0 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -23,7 +23,7 @@ if [get_compiler_info] {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested watchpoint.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index 0cdcf5b..9971968 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -28,7 +28,7 @@ if [target_info exists no_long_long] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $exec_opts] != "" } {
-     untested whatis.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp b/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
index cc4d879..589ed55 100644
--- a/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
+++ b/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
@@ -28,7 +28,7 @@ set opaque_objfile [standard_output_file "$opaque_testfile.o"]
 if {[gdb_compile "${srcdir}/${subdir}/$opaque_testfile.c" \
                  $opaque_objfile \
                  object {}] != ""} {
-  untested "failed to compile $opaque_testfile.c"
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp
index 05354f5..1e5b4f1 100644
--- a/gdb/testsuite/gdb.btrace/dlopen.exp
+++ b/gdb/testsuite/gdb.btrace/dlopen.exp
@@ -26,7 +26,7 @@ set binfile_lib [standard_output_file $basename_lib.so]
 
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "could not compile $binfile_lib."
+    untested "failed to compile shared library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cell/ea-standalone.exp b/gdb/testsuite/gdb.cell/ea-standalone.exp
index 9f8f81c..7bd37ff 100644
--- a/gdb/testsuite/gdb.cell/ea-standalone.exp
+++ b/gdb/testsuite/gdb.cell/ea-standalone.exp
@@ -30,7 +30,7 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $srcfile $binary executable {debug}]  != "" } {
-  unsupported "compile spu binary failed, so all tests in this file will automatically fail."
+  unsupported "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.cell/ea-test.exp b/gdb/testsuite/gdb.cell/ea-test.exp
index 57ed9e2..853e492 100644
--- a/gdb/testsuite/gdb.cell/ea-test.exp
+++ b/gdb/testsuite/gdb.cell/ea-test.exp
@@ -30,7 +30,7 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $source $binary executable {debug}]  != "" } {
-  unsupported "compile spu binary failed, so all tests in this file will automatically fail."
+  unsupported "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/dispcxx.exp b/gdb/testsuite/gdb.cp/dispcxx.exp
index 3ca4c2b..0be6b78 100644
--- a/gdb/testsuite/gdb.cp/dispcxx.exp
+++ b/gdb/testsuite/gdb.cp/dispcxx.exp
@@ -18,7 +18,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 
 if [get_compiler_info "c++"] {
-    untested dispcxx.exp
+    untested "couldn't find a valid c++ compiler"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/gdb2384.exp b/gdb/testsuite/gdb.cp/gdb2384.exp
index 66c6cb1..75ee14b 100644
--- a/gdb/testsuite/gdb.cp/gdb2384.exp
+++ b/gdb/testsuite/gdb.cp/gdb2384.exp
@@ -36,7 +36,7 @@ if [get_compiler_info "c++"] {
 
 if { [gdb_compile_shlib $srcdir/$subdir/$srcfile2 $sofile {debug c++}] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug "c++" shlib=${sofile}]] != ""} {
-    untested gdb2384.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/method2.exp b/gdb/testsuite/gdb.cp/method2.exp
index a163b0c..5204a39 100644
--- a/gdb/testsuite/gdb.cp/method2.exp
+++ b/gdb/testsuite/gdb.cp/method2.exp
@@ -23,7 +23,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 
 if  {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
-     untested method2.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp
index 0a9973d..6d36c3f 100644
--- a/gdb/testsuite/gdb.cp/nextoverthrow.exp
+++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp
@@ -21,7 +21,7 @@ standard_testfile .cc
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info "c++"] {
-    untested nextoverthrow.exp
+    untested "couldn't find a valid c++ compiler"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/pr10728.exp b/gdb/testsuite/gdb.cp/pr10728.exp
index 39d1140..320ab76 100644
--- a/gdb/testsuite/gdb.cp/pr10728.exp
+++ b/gdb/testsuite/gdb.cp/pr10728.exp
@@ -26,17 +26,17 @@ set tfx [standard_output_file pr10728-x.o]
 set tfy [standard_output_file pr10728-y.o]
 
 if  { [gdb_compile "${srcdir}/${subdir}/$srcfile2" "${tfy}.o" object {c++}] != "" } {
-     untested pr10728.exp
+     untested "failed to compile"
      return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/$srcfile" "${tfx}.o" object {debug c++}] != "" } {
-     untested pr10728.exp
+     untested "failed to compile"
      return -1
 }
 
 if  { [gdb_compile "${tfx}.o ${tfy}.o" ${binfile} executable {debug c++}] != "" } {
-     untested pr10728.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/am33.exp b/gdb/testsuite/gdb.disasm/am33.exp
index 73ad07f..7bc6d1b 100644
--- a/gdb/testsuite/gdb.disasm/am33.exp
+++ b/gdb/testsuite/gdb.disasm/am33.exp
@@ -27,7 +27,7 @@ set testfile "am33"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     untested am33.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/h8300s.exp b/gdb/testsuite/gdb.disasm/h8300s.exp
index 2d2c3d5..ee9cea4 100644
--- a/gdb/testsuite/gdb.disasm/h8300s.exp
+++ b/gdb/testsuite/gdb.disasm/h8300s.exp
@@ -25,7 +25,7 @@ set testfile "h8300s"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable {debug additional_flags=-ms}] != "" } {
-     untested h8300s.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/mn10300.exp b/gdb/testsuite/gdb.disasm/mn10300.exp
index 477211b..3e99d6d 100644
--- a/gdb/testsuite/gdb.disasm/mn10300.exp
+++ b/gdb/testsuite/gdb.disasm/mn10300.exp
@@ -27,7 +27,7 @@ set testfile "mn10300"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     untested mn10300.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/sh3.exp b/gdb/testsuite/gdb.disasm/sh3.exp
index 9e6e9f1..1f5ff64 100644
--- a/gdb/testsuite/gdb.disasm/sh3.exp
+++ b/gdb/testsuite/gdb.disasm/sh3.exp
@@ -25,7 +25,7 @@ set testfile "sh3"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     untested sh3.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
index 313b56f..2d1223e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
@@ -327,7 +327,7 @@ lappend opts "additional_flags=-DFDIR=\"fdir\""
 lappend opts "additional_flags=-DFILE=\"${srctmpfile}\""
 
 if { [gdb_compile "${asmsrcfile} ${srcdir}/${subdir}/$srcfile" "${binfile}" executable $opts] != "" } {
-    untested "cannot compile ${asmsrcfile} or $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fortran/complex.exp
index 7046ba2..961e427 100644
--- a/gdb/testsuite/gdb.fortran/complex.exp
+++ b/gdb/testsuite/gdb.fortran/complex.exp
@@ -16,7 +16,7 @@
 standard_testfile .f
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90 quiet}]} {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/gdb.fortran/library-module.exp
index e2f03c3..a38b5a9 100644
--- a/gdb/testsuite/gdb.fortran/library-module.exp
+++ b/gdb/testsuite/gdb.fortran/library-module.exp
@@ -24,7 +24,7 @@ if [get_compiler_info] {
 }
 
 if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90}] != "" } {
-    untested "couldn't compile ${srclibfile}"
+    untested "failed to compile"
     return -1
 }
 
@@ -33,7 +33,7 @@ if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90
 # warnings on ignored $libfile abort the process.
 
 if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug f90 shlib=$libfile]] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-pretty-print.exp b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
index f17d827..2f7438d 100644
--- a/gdb/testsuite/gdb.guile/scm-pretty-print.exp
+++ b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
@@ -30,7 +30,7 @@ if { [skip_guile_tests] } { continue }
 proc run_lang_tests {exefile lang} {
     global srcdir subdir srcfile testfile hex
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "couldn't compile ${srcfile} in $lang mode"
+	untested "failed to compile in $lang mode"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.guile/scm-symbol.exp b/gdb/testsuite/gdb.guile/scm-symbol.exp
index e143045..3a7476d 100644
--- a/gdb/testsuite/gdb.guile/scm-symbol.exp
+++ b/gdb/testsuite/gdb.guile/scm-symbol.exp
@@ -138,7 +138,7 @@ gdb_test "guile (print (symbol-symtab t))" "= #<gdb:symtab .*gdb.guile/scm-symbo
 # C++ tests
 # Recompile binary.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "debug c++"] != "" } {
-    untested "couldn't compile ${srcfile} in c++ mode"
+    untested "failed to compile in C++ mode"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-type.exp b/gdb/testsuite/gdb.guile/scm-type.exp
index 455d948..604cf45 100644
--- a/gdb/testsuite/gdb.guile/scm-type.exp
+++ b/gdb/testsuite/gdb.guile/scm-type.exp
@@ -30,7 +30,7 @@ proc build_inferior {exefile lang} {
     global srcdir subdir srcfile
 
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "couldn't compile ${srcfile} in $lang mode"
+	untested "failed to compile in $lang mode"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
index 76ec990..062f2d1 100644
--- a/gdb/testsuite/gdb.guile/scm-value.exp
+++ b/gdb/testsuite/gdb.guile/scm-value.exp
@@ -39,7 +39,7 @@ proc build_inferior {exefile lang} {
 
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object "debug $lang"] != ""
 	 || [gdb_compile "${objfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "couldn't compile ${srcfile} in $lang mode"
+	untested "failed to compile in $lang mode"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.linespec/linespec.exp b/gdb/testsuite/gdb.linespec/linespec.exp
index 2fe4312..223d7d7 100644
--- a/gdb/testsuite/gdb.linespec/linespec.exp
+++ b/gdb/testsuite/gdb.linespec/linespec.exp
@@ -23,7 +23,7 @@ set baseone base/one/thefile.cc
 set basetwo base/two/thefile.cc
 
 if {[skip_cplus_tests]} {
-    unsupported linespec.exp
+    unsupported "skipping c++ tests"
     return
 }
 
diff --git a/gdb/testsuite/gdb.mi/gdb701.exp b/gdb/testsuite/gdb.mi/gdb701.exp
index be1fb85..65f6686 100644
--- a/gdb/testsuite/gdb.mi/gdb701.exp
+++ b/gdb/testsuite/gdb.mi/gdb701.exp
@@ -28,7 +28,7 @@ if [mi_gdb_start] {
 standard_testfile
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable debug] != ""} {
-  untested gdb701.exp
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/gdb792.exp b/gdb/testsuite/gdb.mi/gdb792.exp
index 7dfd08a..e723800 100644
--- a/gdb/testsuite/gdb.mi/gdb792.exp
+++ b/gdb/testsuite/gdb.mi/gdb792.exp
@@ -34,7 +34,7 @@ if [get_compiler_info "c++"] {
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} {
-  untested gdb792.exp
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
index dc42720..c49c5c8 100644
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
@@ -31,7 +31,7 @@ set lib_opts "debug"
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "could not compile either $libsrc1 or $libsrc2"
+    untested "failed to compile shared library"
     return -1
 }
 
@@ -39,7 +39,7 @@ set MIFLAGS "-i=mi"
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "failed to compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
index b1c870e..2f556d8 100644
--- a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
@@ -36,12 +36,12 @@ if {[get_compiler_info]} {
 }
 
 if {[gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""} {
-    untested "could not compile $libsrc1"
+    untested "failed to compile shared library"
     return -1
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile $srcdir/$subdir/$srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-dprintf.exp b/gdb/testsuite/gdb.mi/mi-dprintf.exp
index 760c756..4a3429f 100644
--- a/gdb/testsuite/gdb.mi/mi-dprintf.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf.exp
@@ -25,7 +25,7 @@ if [mi_gdb_start] {
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-exit-code.exp b/gdb/testsuite/gdb.mi/mi-exit-code.exp
index 2700c0a..dbbdbb4 100644
--- a/gdb/testsuite/gdb.mi/mi-exit-code.exp
+++ b/gdb/testsuite/gdb.mi/mi-exit-code.exp
@@ -24,7 +24,7 @@ if [mi_gdb_start] {
 standard_testfile
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 1a27733..f10fd4d 100644
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -41,12 +41,12 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "could not compile either $libsrc1 or $libsrc2"
+    untested "failed to compile shared library"
     return -1
 }
 
 if { [gdb_compile_pthreads $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile  $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp
index 6ac8c3a..e4936c4 100644
--- a/gdb/testsuite/gdb.mi/mi-solib.exp
+++ b/gdb/testsuite/gdb.mi/mi-solib.exp
@@ -42,7 +42,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile_main} ${binfile} executable $bin_flags] != "" } {
-  untested "could not compile $binfile_lib or $binfile."
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
index b0f6c31..89c9a92 100644
--- a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
+++ b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
@@ -25,7 +25,7 @@ load_lib mi-support.exp
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile ${srcfile} "debug"] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/pr11022.exp b/gdb/testsuite/gdb.mi/pr11022.exp
index 6f6902b..d59fa68 100644
--- a/gdb/testsuite/gdb.mi/pr11022.exp
+++ b/gdb/testsuite/gdb.mi/pr11022.exp
@@ -23,7 +23,7 @@ set MIFLAGS "-i=mi"
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested pr11022.exp
+     untested "failed to compile"
      return
 }
 
diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index 6b6ec2d..8c9e4e0 100644
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -42,7 +42,7 @@ if [use_gdb_stub] {
 
 set compile_options "debug pthreads"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp
index d6ec632..8453324 100644
--- a/gdb/testsuite/gdb.opt/solib-intra-step.exp
+++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-  untested "could not compile $binfile_lib or $binfile."
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index 144cc4b..449062f 100644
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -34,7 +34,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
index 218baed..03341f5 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
@@ -37,7 +37,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp
index 6bbc510..3272f21 100644
--- a/gdb/testsuite/gdb.python/py-mi.exp
+++ b/gdb/testsuite/gdb.python/py-mi.exp
@@ -321,7 +321,7 @@ mi_gdb_test "-var-update c" \
 gdb_exit
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" \
 	   executable {debug c++ additional_flags=-DMI}] != "" } {
-    untested "couldn't compile ${srcfile} in c++ mode"
+    untested "failed to compile in C++ mode"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp
index 86491e4..9a1ed1f 100644
--- a/gdb/testsuite/gdb.python/py-prettyprint.exp
+++ b/gdb/testsuite/gdb.python/py-prettyprint.exp
@@ -30,7 +30,7 @@ if { [skip_python_tests] } { continue }
 proc run_lang_tests {exefile lang} {
     global srcdir subdir srcfile testfile hex
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "couldn't compile ${srcfile} in $lang mode"
+	untested "failed to compile in $lang mode"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp
index 3e049b3..d3ac906 100644
--- a/gdb/testsuite/gdb.python/py-shared.exp
+++ b/gdb/testsuite/gdb.python/py-shared.exp
@@ -28,14 +28,14 @@ set libsrc   ${libfile}.c
 set library  [standard_output_file ${libfile}.sl]
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${libsrc} ${library} "debug"] != "" } {
-    untested "could not compile shared library."
+    untested "failed to compile shared library"
     return -1
 }
 
 set exec_opts [list debug shlib=${library}]
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
-    untested "could not compile $binfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
index c4b3f2e..79abe64 100644
--- a/gdb/testsuite/gdb.python/py-symbol.exp
+++ b/gdb/testsuite/gdb.python/py-symbol.exp
@@ -127,7 +127,7 @@ gdb_test "python print (t\[0\].symtab)" "${py_symbol_c}" "get symtab"
 # C++ tests
 # Recompile binary.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "debug c++"] != "" } {
-    untested "couldn't compile ${srcfile} in c++ mode"
+    untested "failed to compile in C++ mode"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-template.exp b/gdb/testsuite/gdb.python/py-template.exp
index 28a5177..63f0bdd 100644
--- a/gdb/testsuite/gdb.python/py-template.exp
+++ b/gdb/testsuite/gdb.python/py-template.exp
@@ -21,7 +21,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 	  {debug c++}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index 782bd43..4a63f73 100644
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -29,7 +29,7 @@ proc build_inferior {exefile lang} {
   global srcdir subdir srcfile testfile hex
 
   if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-      untested "couldn't compile ${srcfile} in $lang mode"
+      untested "failed to compile in $lang mode"
       return -1
   }
 
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index fb489e1..0585f8c 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -39,7 +39,7 @@ proc build_inferior {exefile lang} {
 
   if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object "debug $lang"] != ""
        || [gdb_compile "${objfile}" "${exefile}" executable "debug $lang"] != "" } {
-      untested "couldn't compile ${srcfile} in $lang mode"
+      untested "failed to compile in $lang mode"
       return -1
   }
   return 0
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 1db4f3f..ea36331 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -40,12 +40,12 @@ if [get_compiler_info] {
 # Compile the first without debug info so that
 # stepping and reverse stepping doesn't end up inside them.
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib1src} ${library1} ""] != "" } {
-    untested "could not compile shared library1."
+    untested "failed to compile shared library"
     return -1
 }
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib2src} ${library2} "debug"] != "" } {
-    untested "could not compile shared library2."
+    untested "failed to compile shared library"
     return -1
 }
 
@@ -58,7 +58,7 @@ set exec_opts [list debug shlib=${library1} shlib=${library2}]
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable \
 		     [concat $exec_opts additional_flags=-Wl,-z,norelro]] != ""
      && [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
-    untested "could not compile $binfile."
+    untested "failed to compile"
     return -1
 }
      
diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp
index 61c76d3..cd3f844 100644
--- a/gdb/testsuite/gdb.reverse/solib-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp
@@ -38,19 +38,19 @@ if [get_compiler_info] {
 # Compile the first without debug info so that
 # stepping and reverse stepping doesn't end up inside them.
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib1src} ${library1} ""] != "" } {
-    untested "could not compile shared library1."
+    untested "failed to compile shared library"
     return -1
 }
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib2src} ${library2} "debug"] != "" } {
-    untested "could not compile shared library2."
+    untested "failed to compile shared library"
     return -1
 }
 
 set exec_opts [list debug shlib=${library1} shlib=${library2}]
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
-    untested "could not compile $binfile."
+    untested "failed to compile"
     return -1
 }
      
diff --git a/gdb/testsuite/gdb.server/solib-list.exp b/gdb/testsuite/gdb.server/solib-list.exp
index 57647e1..50edf6f 100644
--- a/gdb/testsuite/gdb.server/solib-list.exp
+++ b/gdb/testsuite/gdb.server/solib-list.exp
@@ -34,7 +34,7 @@ set binlibfile [standard_output_file ${testfile}.so]
 if { [get_compiler_info]
      || [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" "${binlibfile}" {debug}] != ""
      || [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "shlib=${binlibfile}"] != "" } {
-    untested "could not compile sources"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index b8c72da..af51252 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -271,7 +271,7 @@ if { [lindex $exec_output 0] != 0 } {
 }
 
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     untested weird.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/reconnect-signal.exp b/gdb/testsuite/gdb.threads/reconnect-signal.exp
index 1d134e2..0a3c17d 100644
--- a/gdb/testsuite/gdb.threads/reconnect-signal.exp
+++ b/gdb/testsuite/gdb.threads/reconnect-signal.exp
@@ -27,7 +27,7 @@ if { [gdb_compile_pthreads \
 	  "${srcdir}/${subdir}/${srcfile}" \
 	  "${binfile}" \
 	  executable {debug}] != "" } {
-    untested "couldn't compile test program."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/stepi-random-signal.exp b/gdb/testsuite/gdb.threads/stepi-random-signal.exp
index 5e558dd..2e28209 100644
--- a/gdb/testsuite/gdb.threads/stepi-random-signal.exp
+++ b/gdb/testsuite/gdb.threads/stepi-random-signal.exp
@@ -20,7 +20,7 @@ if { [gdb_compile_pthreads \
 	  "${srcdir}/${subdir}/${srcfile}" \
 	  "${binfile}" \
 	  executable {debug}] != "" } {
-    untested "couldn't compile test program."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index 46890f5..cd23cb4 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested actions.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp
index 5e9783f..979a5f3 100644
--- a/gdb/testsuite/gdb.trace/ax.exp
+++ b/gdb/testsuite/gdb.trace/ax.exp
@@ -26,7 +26,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested ax.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index 44a7657..bdebc2e 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -91,13 +91,13 @@ gdb_test_multiple "list $baseline, +12" "all tests in this module will fail" {
     }
     -re ".*$gdb_prompt $" {
 	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    untested backtrace.exp
+	    untested "unexpected testline values"
 	    set return_me 1
 all tests in this module will fail."
 	}
     }
     default {
-	    untested backtrace.exp
+	    untested "couldn't match pattern"
 	    set return_me 1
 all tests in this module will fail."
     }
diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index 118060a..e579301 100644
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -39,7 +39,7 @@ set additional_flags [list debug shlib=$lib_sl1 shlib_load [gdb_target_symbol_pr
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $additional_flags] != ""} {
-    untested "could not compile either $libsrc1 or $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index bffd575..04e7f5a 100644
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested deltrace.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
index b48d969..e92f2c4 100644
--- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
+++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
@@ -30,7 +30,7 @@ set options [list debug [gdb_target_symbol_prefix_flags] \
 
 # Check that the target supports trace.
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
@@ -53,7 +53,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 lappend options shlib=$libipa
 
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "couldn't compile test program with in-process agent library"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index 8b720d4..97dff8c 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -46,7 +46,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 1561ead..be78d4c 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested infotrace.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
index 43b34c9..370c89f 100644
--- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
@@ -32,13 +32,13 @@ set lib_opts [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "could not compile either $libsrc1 or $libsrc2"
+    untested "failed to compile shared library"
     return -1
 }
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "failed to compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index a790063..25b7355 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested packetlen.exp
+    untested "failed to compile"
     return -1
 }
 gdb_load $binfile
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index df7e39d..0774a4e 100644
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -23,7 +23,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested passcount.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
index 28ffc28..73e875d 100644
--- a/gdb/testsuite/gdb.trace/pending.exp
+++ b/gdb/testsuite/gdb.trace/pending.exp
@@ -31,13 +31,13 @@ set lib_opts [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "could not compile either $libsrc1 or $libsrc2"
+    untested "failed to compile shared library"
     return -1
 }
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "failed to compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
@@ -508,7 +508,7 @@ gdb_load_shlib $libipa
 lappend exec_opts "shlib=$libipa"
 
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "failed to compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp
index 81da27d..88aa3ff 100644
--- a/gdb/testsuite/gdb.trace/range-stepping.exp
+++ b/gdb/testsuite/gdb.trace/range-stepping.exp
@@ -71,7 +71,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug nowarnings shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index f487ec6..ef7ef62 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested report.exp
+    untested "failed to compile"
     return -1
 }
 gdb_load $binfile
@@ -97,13 +97,13 @@ gdb_test_multiple "list $gdb_recursion_test_baseline, +12" "" {
     }
     -re ".*$gdb_prompt $" {
 	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    untested report.exp
+	    untested "unexpected testline values"
 	    set return_me 1
 all tests in this module will fail."
 	}
     }
     default {
-	    untested report.exp
+	    untested "couldn't match pattern"
 	    set return_me 1
 all tests in this module will fail."
     } 
diff --git a/gdb/testsuite/gdb.trace/stap-trace.exp b/gdb/testsuite/gdb.trace/stap-trace.exp
index 4cb05d5..44583d1 100644
--- a/gdb/testsuite/gdb.trace/stap-trace.exp
+++ b/gdb/testsuite/gdb.trace/stap-trace.exp
@@ -42,7 +42,7 @@ proc compile_stap_bin {exec_name {arg ""}} {
     if { [gdb_compile "$srcdir/$subdir/$srcfile" \
 	      [standard_output_file $exec_name] \
 	      executable [concat $arg debug nowarnings]] != "" } {
-	untested "could not compile ${srcfile}"
+	untested "failed to compile"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index cfd7db3..39c54a1 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -25,7 +25,7 @@ standard_testfile actions.c
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
 	  executable {debug nowarnings}] != "" } {
-    untested tfind.exp
+    untested "failed to compile"
     return -1
 }
 gdb_load $binfile
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index b7b2ea1..facf061 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -357,7 +357,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp
index 0e93e51..02a0c0c 100644
--- a/gdb/testsuite/gdb.trace/trace-condition.exp
+++ b/gdb/testsuite/gdb.trace/trace-condition.exp
@@ -46,7 +46,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
index 43891fa..4125469 100644
--- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp
+++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
@@ -23,7 +23,7 @@ set options [list debug [gdb_target_symbol_prefix_flags]]
 
 # Check that the target supports trace.
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
@@ -46,7 +46,7 @@ gdb_load_shlib $libipa
 lappend options shlib=$libipa
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "couldn't compile test program with in-process agent library"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index bab2a61..75c255c 100644
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -23,7 +23,7 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags] ] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
@@ -112,7 +112,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 # Compile test case again with IPA.
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 7ad6c91..6266e27 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -23,7 +23,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested tracecmd.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index 885fe23..8a9917c 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -22,7 +22,7 @@ set ipalib [get_in_proc_agent]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [concat {debug nowarnings c} shlib=$ipalib]] != "" } {
-    untested tspeed.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index a976480..a2e808a 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -21,7 +21,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested tsv.exp
+    untested "failed to compile"
     return -1
 }
 gdb_load $binfile
diff --git a/gdb/testsuite/lib/perftest.exp b/gdb/testsuite/lib/perftest.exp
index 2f8da14..082c10d 100644
--- a/gdb/testsuite/lib/perftest.exp
+++ b/gdb/testsuite/lib/perftest.exp
@@ -90,7 +90,7 @@ namespace eval PerfTest {
 
 	if { [string compare $GDB_PERFTEST_MODE "run"] != 0 } {
 	    if { [eval compile {$compile}] } {
-		untested "could not compile source files."
+		untested "failed to compile"
 		return
 	    }
 	}
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v2 1/8] Fix test names starting with uppercase output by basic functions
  2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
                   ` (2 preceding siblings ...)
  2016-11-25 20:54 ` [PATCH v2 3/8] Fix test names starting with uppercase using gdb_test_no_output Luis Machado
@ 2016-11-25 20:55 ` Luis Machado
  2016-11-29 21:37   ` Yao Qi
  2016-11-25 20:55 ` [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple Luis Machado
                   ` (4 subsequent siblings)
  8 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-25 20:55 UTC (permalink / raw)
  To: gdb-patches

The following patch is based on the previous patch i sent and handles cases of
test names that start with an uppercase letter. Test names should start with
lowercase unless it starts with the name of a technology, architecture, ISA
etc.

This first patch addresses cases of test names output explicitly via xfail,
kfail, kpass, fail, pass, unsupported, untested and also names set with the
pattern "set test" and "set testname".

gdb/testsuite/ChangeLog:
2016-11-25  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names starting with uppercase throughout all the files below.

	* gdb/testsuite/gdb.ada/array_return.exp
	* gdb/testsuite/gdb.ada/catch_ex.exp
	* gdb/testsuite/gdb.ada/info_exc.exp
	* gdb/testsuite/gdb.ada/mi_catch_ex.exp
	* gdb/testsuite/gdb.ada/mi_dyn_arr.exp
	* gdb/testsuite/gdb.ada/mi_ex_cond.exp
	* gdb/testsuite/gdb.ada/mi_exc_info.exp
	* gdb/testsuite/gdb.ada/mi_interface.exp
	* gdb/testsuite/gdb.ada/mi_task_arg.exp
	* gdb/testsuite/gdb.ada/mi_task_info.exp
	* gdb/testsuite/gdb.ada/mi_var_array.exp
	* gdb/testsuite/gdb.arch/alpha-step.exp
	* gdb/testsuite/gdb.arch/amd64-disp-step.exp
	* gdb/testsuite/gdb.arch/arm-disp-step.exp
	* gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
	* gdb/testsuite/gdb.arch/e500-prologue.exp
	* gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
	* gdb/testsuite/gdb.arch/gdb1558.exp
	* gdb/testsuite/gdb.arch/i386-bp_permanent.exp
	* gdb/testsuite/gdb.arch/i386-disp-step.exp
	* gdb/testsuite/gdb.arch/i386-float.exp
	* gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
	* gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
	* gdb/testsuite/gdb.arch/mips16-thunks.exp
	* gdb/testsuite/gdb.arch/pa-nullify.exp
	* gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
	* gdb/testsuite/gdb.arch/powerpc-power.exp
	* gdb/testsuite/gdb.arch/ppc-dfp.exp
	* gdb/testsuite/gdb.arch/s390-tdbregs.exp
	* gdb/testsuite/gdb.arch/spu-info.exp
	* gdb/testsuite/gdb.arch/spu-ls.exp
	* gdb/testsuite/gdb.arch/thumb-bx-pc.exp
	* gdb/testsuite/gdb.base/advance.exp
	* gdb/testsuite/gdb.base/annota-input-while-running.exp
	* gdb/testsuite/gdb.base/arrayidx.exp
	* gdb/testsuite/gdb.base/asmlabel.exp
	* gdb/testsuite/gdb.base/async.exp
	* gdb/testsuite/gdb.base/attach-wait-input.exp
	* gdb/testsuite/gdb.base/auto-connect-native-target.exp
	* gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
	* gdb/testsuite/gdb.base/bfp-test.exp
	* gdb/testsuite/gdb.base/bigcore.exp
	* gdb/testsuite/gdb.base/bp-permanent.exp
	* gdb/testsuite/gdb.base/break-always.exp
	* gdb/testsuite/gdb.base/break-fun-addr.exp
	* gdb/testsuite/gdb.base/break-idempotent.exp
	* gdb/testsuite/gdb.base/break-main-file-remove-fail.exp
	* gdb/testsuite/gdb.base/break-probes.exp
	* gdb/testsuite/gdb.base/break-unload-file.exp
	* gdb/testsuite/gdb.base/break.exp
	* gdb/testsuite/gdb.base/call-ar-st.exp
	* gdb/testsuite/gdb.base/call-rt-st.exp
	* gdb/testsuite/gdb.base/call-sc.exp
	* gdb/testsuite/gdb.base/call-signal-resume.exp
	* gdb/testsuite/gdb.base/call-strs.exp
	* gdb/testsuite/gdb.base/callexit.exp
	* gdb/testsuite/gdb.base/callfuncs.exp
	* gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
	* gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
	* gdb/testsuite/gdb.base/catch-syscall.exp
	* gdb/testsuite/gdb.base/compare-sections.exp
	* gdb/testsuite/gdb.base/cond-eval-mode.exp
	* gdb/testsuite/gdb.base/condbreak-call-false.exp
	* gdb/testsuite/gdb.base/consecutive-step-over.exp
	* gdb/testsuite/gdb.base/cursal.exp
	* gdb/testsuite/gdb.base/disabled-location.exp
	* gdb/testsuite/gdb.base/disasm-end-cu.exp
	* gdb/testsuite/gdb.base/display.exp
	* gdb/testsuite/gdb.base/double-prompt-target-event-error.exp
	* gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
	* gdb/testsuite/gdb.base/dprintf-detach.exp
	* gdb/testsuite/gdb.base/dprintf-next.exp
	* gdb/testsuite/gdb.base/dprintf-non-stop.exp
	* gdb/testsuite/gdb.base/dprintf-pending.exp
	* gdb/testsuite/gdb.base/dso2dso.exp
	* gdb/testsuite/gdb.base/ending-run.exp
	* gdb/testsuite/gdb.base/enum_cond.exp
	* gdb/testsuite/gdb.base/examine-backward.exp
	* gdb/testsuite/gdb.base/exe-lock.exp
	* gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
	* gdb/testsuite/gdb.base/execl-update-breakpoints.exp
	* gdb/testsuite/gdb.base/execution-termios.exp
	* gdb/testsuite/gdb.base/fileio.exp
	* gdb/testsuite/gdb.base/fixsection.exp
	* gdb/testsuite/gdb.base/foll-exec-mode.exp
	* gdb/testsuite/gdb.base/foll-exec.exp
	* gdb/testsuite/gdb.base/fork-running-state.exp
	* gdb/testsuite/gdb.base/frame-args.exp
	* gdb/testsuite/gdb.base/fullpath-expand.exp
	* gdb/testsuite/gdb.base/func-ptr.exp
	* gdb/testsuite/gdb.base/gcore-relro-pie.exp
	* gdb/testsuite/gdb.base/gdb1090.exp
	* gdb/testsuite/gdb.base/gdb1555.exp
	* gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
	* gdb/testsuite/gdb.base/gnu-ifunc.exp
	* gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
	* gdb/testsuite/gdb.base/hbreak-unmapped.exp
	* gdb/testsuite/gdb.base/hook-stop.exp
	* gdb/testsuite/gdb.base/infcall-input.exp
	* gdb/testsuite/gdb.base/info-fun.exp
	* gdb/testsuite/gdb.base/info-shared.exp
	* gdb/testsuite/gdb.base/interrupt-noterm.exp
	* gdb/testsuite/gdb.base/jit-so.exp
	* gdb/testsuite/gdb.base/jit.exp
	* gdb/testsuite/gdb.base/line-symtabs.exp
	* gdb/testsuite/gdb.base/list.exp
	* gdb/testsuite/gdb.base/longjmp.exp
	* gdb/testsuite/gdb.base/macscp.exp
	* gdb/testsuite/gdb.base/max-value-size.exp
	* gdb/testsuite/gdb.base/nodebug.exp
	* gdb/testsuite/gdb.base/nofield.exp
	* gdb/testsuite/gdb.base/overlays.exp
	* gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp
	* gdb/testsuite/gdb.base/paginate-bg-execution.exp
	* gdb/testsuite/gdb.base/paginate-inferior-exit.exp
	* gdb/testsuite/gdb.base/pending.exp
	* gdb/testsuite/gdb.base/pr11022.exp
	* gdb/testsuite/gdb.base/printcmds.exp
	* gdb/testsuite/gdb.base/ptr-typedef.exp
	* gdb/testsuite/gdb.base/ptype.exp
	* gdb/testsuite/gdb.base/randomize.exp
	* gdb/testsuite/gdb.base/range-stepping.exp
	* gdb/testsuite/gdb.base/realname-expand.exp
	* gdb/testsuite/gdb.base/relativedebug.exp
	* gdb/testsuite/gdb.base/remote.exp
	* gdb/testsuite/gdb.base/savedregs.exp
	* gdb/testsuite/gdb.base/sepdebug.exp
	* gdb/testsuite/gdb.base/set-noassign.exp
	* gdb/testsuite/gdb.base/shlib-call.exp
	* gdb/testsuite/gdb.base/shreloc.exp
	* gdb/testsuite/gdb.base/sigaltstack.exp
	* gdb/testsuite/gdb.base/sigbpt.exp
	* gdb/testsuite/gdb.base/siginfo-addr.exp
	* gdb/testsuite/gdb.base/siginfo-obj.exp
	* gdb/testsuite/gdb.base/siginfo-thread.exp
	* gdb/testsuite/gdb.base/signest.exp
	* gdb/testsuite/gdb.base/signull.exp
	* gdb/testsuite/gdb.base/sigrepeat.exp
	* gdb/testsuite/gdb.base/skip.exp
	* gdb/testsuite/gdb.base/so-impl-ld.exp
	* gdb/testsuite/gdb.base/solib-corrupted.exp
	* gdb/testsuite/gdb.base/solib-disc.exp
	* gdb/testsuite/gdb.base/solib-display.exp
	* gdb/testsuite/gdb.base/solib-overlap.exp
	* gdb/testsuite/gdb.base/solib-search.exp
	* gdb/testsuite/gdb.base/solib-symbol.exp
	* gdb/testsuite/gdb.base/source-execution.exp
	* gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp
	* gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp
	* gdb/testsuite/gdb.base/stack-checking.exp
	* gdb/testsuite/gdb.base/stale-infcall.exp
	* gdb/testsuite/gdb.base/step-break.exp
	* gdb/testsuite/gdb.base/step-line.exp
	* gdb/testsuite/gdb.base/step-over-exit.exp
	* gdb/testsuite/gdb.base/step-test.exp
	* gdb/testsuite/gdb.base/structs.exp
	* gdb/testsuite/gdb.base/sym-file.exp
	* gdb/testsuite/gdb.base/symtab-search-order.exp
	* gdb/testsuite/gdb.base/term.exp
	* gdb/testsuite/gdb.base/type-opaque.exp
	* gdb/testsuite/gdb.base/unload.exp
	* gdb/testsuite/gdb.base/until-nodebug.exp
	* gdb/testsuite/gdb.base/until.exp
	* gdb/testsuite/gdb.base/unwindonsignal.exp
	* gdb/testsuite/gdb.base/watch-cond.exp
	* gdb/testsuite/gdb.base/watch-non-mem.exp
	* gdb/testsuite/gdb.base/watch_thread_num.exp
	* gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp
	* gdb/testsuite/gdb.base/watchpoint-solib.exp
	* gdb/testsuite/gdb.base/watchpoint.exp
	* gdb/testsuite/gdb.btrace/dlopen.exp
	* gdb/testsuite/gdb.cell/arch.exp
	* gdb/testsuite/gdb.cell/break.exp
	* gdb/testsuite/gdb.cell/bt.exp
	* gdb/testsuite/gdb.cell/core.exp
	* gdb/testsuite/gdb.cell/data.exp
	* gdb/testsuite/gdb.cell/dwarfaddr.exp
	* gdb/testsuite/gdb.cell/ea-cache.exp
	* gdb/testsuite/gdb.cell/ea-standalone.exp
	* gdb/testsuite/gdb.cell/ea-test.exp
	* gdb/testsuite/gdb.cell/f-regs.exp
	* gdb/testsuite/gdb.cell/fork.exp
	* gdb/testsuite/gdb.cell/gcore.exp
	* gdb/testsuite/gdb.cell/mem-access.exp
	* gdb/testsuite/gdb.cell/ptype.exp
	* gdb/testsuite/gdb.cell/registers.exp
	* gdb/testsuite/gdb.cell/sizeof.exp
	* gdb/testsuite/gdb.cell/solib-symbol.exp
	* gdb/testsuite/gdb.cell/solib.exp
	* gdb/testsuite/gdb.compile/compile-tls.exp
	* gdb/testsuite/gdb.cp/exception.exp
	* gdb/testsuite/gdb.cp/gdb2495.exp
	* gdb/testsuite/gdb.cp/local.exp
	* gdb/testsuite/gdb.cp/mb-inline.exp
	* gdb/testsuite/gdb.cp/mb-templates.exp
	* gdb/testsuite/gdb.cp/pr10687.exp
	* gdb/testsuite/gdb.cp/pr9167.exp
	* gdb/testsuite/gdb.cp/scope-err.exp
	* gdb/testsuite/gdb.cp/templates.exp
	* gdb/testsuite/gdb.cp/virtfunc.exp
	* gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
	* gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
	* gdb/testsuite/gdb.fortran/complex.exp
	* gdb/testsuite/gdb.fortran/library-module.exp
	* gdb/testsuite/gdb.guile/guile.exp
	* gdb/testsuite/gdb.guile/scm-cmd.exp
	* gdb/testsuite/gdb.guile/scm-frame-inline.exp
	* gdb/testsuite/gdb.guile/scm-objfile.exp
	* gdb/testsuite/gdb.guile/scm-pretty-print.exp
	* gdb/testsuite/gdb.guile/scm-symbol.exp
	* gdb/testsuite/gdb.guile/scm-type.exp
	* gdb/testsuite/gdb.guile/scm-value.exp
	* gdb/testsuite/gdb.linespec/keywords.exp
	* gdb/testsuite/gdb.linespec/ls-errs.exp
	* gdb/testsuite/gdb.linespec/macro-relative.exp
	* gdb/testsuite/gdb.linespec/thread.exp
	* gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
	* gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
	* gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
	* gdb/testsuite/gdb.mi/mi-logging.exp
	* gdb/testsuite/gdb.mi/mi-pending.exp
	* gdb/testsuite/gdb.mi/mi-solib.exp
	* gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
	* gdb/testsuite/gdb.mi/user-selected-context-sync.exp
	* gdb/testsuite/gdb.multi/dummy-frame-restore.exp
	* gdb/testsuite/gdb.multi/multi-arch-exec.exp
	* gdb/testsuite/gdb.multi/remove-inferiors.exp
	* gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
	* gdb/testsuite/gdb.opt/solib-intra-step.exp
	* gdb/testsuite/gdb.perf/backtrace.exp
	* gdb/testsuite/gdb.perf/single-step.exp
	* gdb/testsuite/gdb.perf/skip-command.exp
	* gdb/testsuite/gdb.perf/skip-prologue.exp
	* gdb/testsuite/gdb.perf/solib.exp
	* gdb/testsuite/gdb.python/lib-types.exp
	* gdb/testsuite/gdb.python/py-as-string.exp
	* gdb/testsuite/gdb.python/py-bad-printers.exp
	* gdb/testsuite/gdb.python/py-block.exp
	* gdb/testsuite/gdb.python/py-breakpoint.exp
	* gdb/testsuite/gdb.python/py-cmd.exp
	* gdb/testsuite/gdb.python/py-events.exp
	* gdb/testsuite/gdb.python/py-evthreads.exp
	* gdb/testsuite/gdb.python/py-finish-breakpoint.exp
	* gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
	* gdb/testsuite/gdb.python/py-frame-inline.exp
	* gdb/testsuite/gdb.python/py-frame.exp
	* gdb/testsuite/gdb.python/py-inferior.exp
	* gdb/testsuite/gdb.python/py-infthread.exp
	* gdb/testsuite/gdb.python/py-mi.exp
	* gdb/testsuite/gdb.python/py-objfile.exp
	* gdb/testsuite/gdb.python/py-pp-maint.exp
	* gdb/testsuite/gdb.python/py-pp-registration.exp
	* gdb/testsuite/gdb.python/py-prettyprint.exp
	* gdb/testsuite/gdb.python/py-recurse-unwind.exp
	* gdb/testsuite/gdb.python/py-shared.exp
	* gdb/testsuite/gdb.python/py-symbol.exp
	* gdb/testsuite/gdb.python/py-symtab.exp
	* gdb/testsuite/gdb.python/py-template.exp
	* gdb/testsuite/gdb.python/py-type.exp
	* gdb/testsuite/gdb.python/py-unwind-maint.exp
	* gdb/testsuite/gdb.python/py-unwind.exp
	* gdb/testsuite/gdb.python/py-value.exp
	* gdb/testsuite/gdb.python/python.exp
	* gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
	* gdb/testsuite/gdb.reverse/insn-reverse.exp
	* gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
	* gdb/testsuite/gdb.reverse/solib-precsave.exp
	* gdb/testsuite/gdb.reverse/solib-reverse.exp
	* gdb/testsuite/gdb.stabs/gdb11479.exp
	* gdb/testsuite/gdb.stabs/weird.exp
	* gdb/testsuite/gdb.threads/fork-child-threads.exp
	* gdb/testsuite/gdb.threads/fork-plus-threads.exp
	* gdb/testsuite/gdb.threads/fork-thread-pending.exp
	* gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
	* gdb/testsuite/gdb.threads/hand-call-in-threads.exp
	* gdb/testsuite/gdb.threads/interrupted-hand-call.exp
	* gdb/testsuite/gdb.threads/linux-dp.exp
	* gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
	* gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
	* gdb/testsuite/gdb.threads/non-ldr-exit.exp
	* gdb/testsuite/gdb.threads/pending-step.exp
	* gdb/testsuite/gdb.threads/print-threads.exp
	* gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
	* gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
	* gdb/testsuite/gdb.threads/pthreads.exp
	* gdb/testsuite/gdb.threads/queue-signal.exp
	* gdb/testsuite/gdb.threads/reconnect-signal.exp
	* gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
	* gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
	* gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
	* gdb/testsuite/gdb.threads/signal-sigtrap.exp
	* gdb/testsuite/gdb.threads/sigthread.exp
	* gdb/testsuite/gdb.threads/staticthreads.exp
	* gdb/testsuite/gdb.threads/stepi-random-signal.exp
	* gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
	* gdb/testsuite/gdb.threads/thread_check.exp
	* gdb/testsuite/gdb.threads/thread_events.exp
	* gdb/testsuite/gdb.threads/tid-reuse.exp
	* gdb/testsuite/gdb.threads/tls-nodebug.exp
	* gdb/testsuite/gdb.threads/tls-shared.exp
	* gdb/testsuite/gdb.threads/tls-so_extern.exp
	* gdb/testsuite/gdb.threads/tls.exp
	* gdb/testsuite/gdb.threads/wp-replication.exp
	* gdb/testsuite/gdb.trace/actions-changed.exp
	* gdb/testsuite/gdb.trace/actions.exp
	* gdb/testsuite/gdb.trace/backtrace.exp
	* gdb/testsuite/gdb.trace/change-loc.exp
	* gdb/testsuite/gdb.trace/collection.exp
	* gdb/testsuite/gdb.trace/deltrace.exp
	* gdb/testsuite/gdb.trace/disconnected-tracing.exp
	* gdb/testsuite/gdb.trace/entry-values.exp
	* gdb/testsuite/gdb.trace/ftrace-lock.exp
	* gdb/testsuite/gdb.trace/ftrace.exp
	* gdb/testsuite/gdb.trace/infotrace.exp
	* gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
	* gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
	* gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
	* gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
	* gdb/testsuite/gdb.trace/mi-tsv-changed.exp
	* gdb/testsuite/gdb.trace/no-attach-trace.exp
	* gdb/testsuite/gdb.trace/packetlen.exp
	* gdb/testsuite/gdb.trace/passc-dyn.exp
	* gdb/testsuite/gdb.trace/passcount.exp
	* gdb/testsuite/gdb.trace/pending.exp
	* gdb/testsuite/gdb.trace/pr16508.exp
	* gdb/testsuite/gdb.trace/qtro.exp
	* gdb/testsuite/gdb.trace/range-stepping.exp
	* gdb/testsuite/gdb.trace/read-memory.exp
	* gdb/testsuite/gdb.trace/report.exp
	* gdb/testsuite/gdb.trace/save-trace.exp
	* gdb/testsuite/gdb.trace/signal.exp
	* gdb/testsuite/gdb.trace/stap-trace.exp
	* gdb/testsuite/gdb.trace/status-stop.exp
	* gdb/testsuite/gdb.trace/strace.exp
	* gdb/testsuite/gdb.trace/tfile.exp
	* gdb/testsuite/gdb.trace/tfind.exp
	* gdb/testsuite/gdb.trace/trace-break.exp
	* gdb/testsuite/gdb.trace/trace-condition.exp
	* gdb/testsuite/gdb.trace/trace-enable-disable.exp
	* gdb/testsuite/gdb.trace/trace-mt.exp
	* gdb/testsuite/gdb.trace/tracecmd.exp
	* gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
	* gdb/testsuite/gdb.trace/tspeed.exp
	* gdb/testsuite/gdb.trace/tstatus.exp
	* gdb/testsuite/gdb.trace/tsv.exp
	* gdb/testsuite/gdb.trace/unavailable.exp
	* gdb/testsuite/gdb.trace/while-dyn.exp
	* gdb/testsuite/gdb.trace/while-stepping.exp
	* gdb/testsuite/lib/gdb-guile.exp
	* gdb/testsuite/lib/gdb.exp
	* gdb/testsuite/lib/mi-support.exp
	* gdb/testsuite/lib/pascal.exp
	* gdb/testsuite/lib/perftest.exp
	* gdb/testsuite/lib/prelink-support.exp
	* gdb/testsuite/lib/selftest-support.exp
---
 gdb/testsuite/gdb.ada/array_return.exp               |  2 +-
 gdb/testsuite/gdb.ada/catch_ex.exp                   |  6 +++---
 gdb/testsuite/gdb.ada/info_exc.exp                   |  2 +-
 gdb/testsuite/gdb.ada/mi_catch_ex.exp                |  6 +++---
 gdb/testsuite/gdb.ada/mi_dyn_arr.exp                 |  2 +-
 gdb/testsuite/gdb.ada/mi_ex_cond.exp                 |  2 +-
 gdb/testsuite/gdb.ada/mi_exc_info.exp                |  2 +-
 gdb/testsuite/gdb.ada/mi_interface.exp               |  2 +-
 gdb/testsuite/gdb.ada/mi_task_arg.exp                |  2 +-
 gdb/testsuite/gdb.ada/mi_task_info.exp               |  2 +-
 gdb/testsuite/gdb.ada/mi_var_array.exp               |  2 +-
 gdb/testsuite/gdb.arch/alpha-step.exp                |  4 ++--
 gdb/testsuite/gdb.arch/amd64-disp-step.exp           |  2 +-
 gdb/testsuite/gdb.arch/arm-disp-step.exp             |  2 +-
 gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp      |  4 ++--
 gdb/testsuite/gdb.arch/e500-prologue.exp             |  2 +-
 gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp         |  8 ++++----
 gdb/testsuite/gdb.arch/gdb1558.exp                   |  2 +-
 gdb/testsuite/gdb.arch/i386-bp_permanent.exp         |  2 +-
 gdb/testsuite/gdb.arch/i386-disp-step.exp            |  2 +-
 gdb/testsuite/gdb.arch/i386-float.exp                |  2 +-
 gdb/testsuite/gdb.arch/i386-gnu-cfi.exp              |  6 +++---
 gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp    |  2 +-
 gdb/testsuite/gdb.arch/mips16-thunks.exp             | 10 +++++-----
 gdb/testsuite/gdb.arch/pa-nullify.exp                |  2 +-
 gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp      |  2 +-
 gdb/testsuite/gdb.arch/powerpc-power.exp             |  2 +-
 gdb/testsuite/gdb.arch/ppc-dfp.exp                   |  4 ++--
 gdb/testsuite/gdb.arch/s390-tdbregs.exp              |  4 ++--
 gdb/testsuite/gdb.arch/spu-info.exp                  |  2 +-
 gdb/testsuite/gdb.arch/spu-ls.exp                    |  2 +-
 gdb/testsuite/gdb.arch/thumb-bx-pc.exp               |  2 +-
 gdb/testsuite/gdb.base/advance.exp                   |  2 +-
 .../gdb.base/annota-input-while-running.exp          |  2 +-
 gdb/testsuite/gdb.base/arrayidx.exp                  |  2 +-
 gdb/testsuite/gdb.base/asmlabel.exp                  |  2 +-
 gdb/testsuite/gdb.base/async.exp                     |  2 +-
 gdb/testsuite/gdb.base/attach-wait-input.exp         |  2 +-
 .../gdb.base/auto-connect-native-target.exp          |  8 ++++----
 .../gdb.base/batch-preserve-term-settings.exp        |  2 +-
 gdb/testsuite/gdb.base/bfp-test.exp                  |  2 +-
 gdb/testsuite/gdb.base/bigcore.exp                   |  6 +++---
 gdb/testsuite/gdb.base/bp-permanent.exp              |  2 +-
 gdb/testsuite/gdb.base/break-always.exp              |  2 +-
 gdb/testsuite/gdb.base/break-fun-addr.exp            |  4 ++--
 gdb/testsuite/gdb.base/break-idempotent.exp          |  4 ++--
 .../gdb.base/break-main-file-remove-fail.exp         |  2 +-
 gdb/testsuite/gdb.base/break-probes.exp              |  2 +-
 gdb/testsuite/gdb.base/break-unload-file.exp         |  2 +-
 gdb/testsuite/gdb.base/break.exp                     |  8 ++++----
 gdb/testsuite/gdb.base/call-ar-st.exp                |  2 +-
 gdb/testsuite/gdb.base/call-rt-st.exp                |  2 +-
 gdb/testsuite/gdb.base/call-sc.exp                   |  2 +-
 gdb/testsuite/gdb.base/call-signal-resume.exp        |  4 ++--
 gdb/testsuite/gdb.base/call-strs.exp                 |  2 +-
 gdb/testsuite/gdb.base/callexit.exp                  |  4 ++--
 gdb/testsuite/gdb.base/callfuncs.exp                 |  2 +-
 gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp  |  2 +-
 gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp |  2 +-
 gdb/testsuite/gdb.base/catch-syscall.exp             |  2 +-
 gdb/testsuite/gdb.base/compare-sections.exp          |  2 +-
 gdb/testsuite/gdb.base/cond-eval-mode.exp            |  2 +-
 gdb/testsuite/gdb.base/condbreak-call-false.exp      |  2 +-
 gdb/testsuite/gdb.base/consecutive-step-over.exp     |  2 +-
 gdb/testsuite/gdb.base/cursal.exp                    |  2 +-
 gdb/testsuite/gdb.base/disabled-location.exp         |  2 +-
 gdb/testsuite/gdb.base/disasm-end-cu.exp             |  8 ++++----
 gdb/testsuite/gdb.base/display.exp                   |  2 +-
 .../gdb.base/double-prompt-target-event-error.exp    |  2 +-
 gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp      |  2 +-
 gdb/testsuite/gdb.base/dprintf-detach.exp            |  2 +-
 gdb/testsuite/gdb.base/dprintf-next.exp              |  2 +-
 gdb/testsuite/gdb.base/dprintf-non-stop.exp          |  4 ++--
 gdb/testsuite/gdb.base/dprintf-pending.exp           |  2 +-
 gdb/testsuite/gdb.base/dso2dso.exp                   |  4 ++--
 gdb/testsuite/gdb.base/ending-run.exp                |  2 +-
 gdb/testsuite/gdb.base/enum_cond.exp                 |  2 +-
 gdb/testsuite/gdb.base/examine-backward.exp          |  2 +-
 gdb/testsuite/gdb.base/exe-lock.exp                  |  2 +-
 gdb/testsuite/gdb.base/exec-invalid-sysroot.exp      |  2 +-
 gdb/testsuite/gdb.base/execl-update-breakpoints.exp  |  6 +++---
 gdb/testsuite/gdb.base/execution-termios.exp         |  2 +-
 gdb/testsuite/gdb.base/fileio.exp                    |  2 +-
 gdb/testsuite/gdb.base/fixsection.exp                |  4 ++--
 gdb/testsuite/gdb.base/foll-exec-mode.exp            |  4 ++--
 gdb/testsuite/gdb.base/foll-exec.exp                 | 12 ++++++------
 gdb/testsuite/gdb.base/fork-running-state.exp        |  2 +-
 gdb/testsuite/gdb.base/frame-args.exp                |  2 +-
 gdb/testsuite/gdb.base/fullpath-expand.exp           |  2 +-
 gdb/testsuite/gdb.base/func-ptr.exp                  |  2 +-
 gdb/testsuite/gdb.base/gcore-relro-pie.exp           |  2 +-
 gdb/testsuite/gdb.base/gdb1090.exp                   |  2 +-
 gdb/testsuite/gdb.base/gdb1555.exp                   |  2 +-
 gdb/testsuite/gdb.base/global-var-nested-by-dso.exp  |  4 ++--
 gdb/testsuite/gdb.base/gnu-ifunc.exp                 |  6 +++---
 gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp |  4 ++--
 gdb/testsuite/gdb.base/hbreak-unmapped.exp           |  4 ++--
 gdb/testsuite/gdb.base/hook-stop.exp                 |  2 +-
 gdb/testsuite/gdb.base/infcall-input.exp             |  2 +-
 gdb/testsuite/gdb.base/info-fun.exp                  |  6 +++---
 gdb/testsuite/gdb.base/info-shared.exp               |  4 ++--
 gdb/testsuite/gdb.base/interrupt-noterm.exp          |  2 +-
 gdb/testsuite/gdb.base/jit-so.exp                    |  2 +-
 gdb/testsuite/gdb.base/jit.exp                       |  2 +-
 gdb/testsuite/gdb.base/line-symtabs.exp              |  2 +-
 gdb/testsuite/gdb.base/list.exp                      |  2 +-
 gdb/testsuite/gdb.base/longjmp.exp                   |  2 +-
 gdb/testsuite/gdb.base/macscp.exp                    |  2 +-
 gdb/testsuite/gdb.base/max-value-size.exp            |  2 +-
 gdb/testsuite/gdb.base/nodebug.exp                   |  2 +-
 gdb/testsuite/gdb.base/nofield.exp                   |  2 +-
 gdb/testsuite/gdb.base/overlays.exp                  |  2 +-
 .../gdb.base/paginate-after-ctrl-c-running.exp       |  2 +-
 gdb/testsuite/gdb.base/paginate-bg-execution.exp     |  4 ++--
 gdb/testsuite/gdb.base/paginate-inferior-exit.exp    |  2 +-
 gdb/testsuite/gdb.base/pending.exp                   |  2 +-
 gdb/testsuite/gdb.base/pr11022.exp                   |  2 +-
 gdb/testsuite/gdb.base/printcmds.exp                 |  6 +++---
 gdb/testsuite/gdb.base/ptr-typedef.exp               |  4 ++--
 gdb/testsuite/gdb.base/ptype.exp                     |  2 +-
 gdb/testsuite/gdb.base/randomize.exp                 |  6 +++---
 gdb/testsuite/gdb.base/range-stepping.exp            |  2 +-
 gdb/testsuite/gdb.base/realname-expand.exp           |  2 +-
 gdb/testsuite/gdb.base/relativedebug.exp             |  2 +-
 gdb/testsuite/gdb.base/remote.exp                    |  2 +-
 gdb/testsuite/gdb.base/savedregs.exp                 |  4 ++--
 gdb/testsuite/gdb.base/sepdebug.exp                  |  4 ++--
 gdb/testsuite/gdb.base/set-noassign.exp              |  2 +-
 gdb/testsuite/gdb.base/shlib-call.exp                |  2 +-
 gdb/testsuite/gdb.base/shreloc.exp                   | 12 ++++++------
 gdb/testsuite/gdb.base/sigaltstack.exp               |  2 +-
 gdb/testsuite/gdb.base/sigbpt.exp                    |  4 ++--
 gdb/testsuite/gdb.base/siginfo-addr.exp              |  2 +-
 gdb/testsuite/gdb.base/siginfo-obj.exp               | 10 +++++-----
 gdb/testsuite/gdb.base/siginfo-thread.exp            |  8 ++++----
 gdb/testsuite/gdb.base/signest.exp                   |  2 +-
 gdb/testsuite/gdb.base/signull.exp                   |  2 +-
 gdb/testsuite/gdb.base/sigrepeat.exp                 |  2 +-
 gdb/testsuite/gdb.base/skip.exp                      | 20 ++++++++++----------
 gdb/testsuite/gdb.base/so-impl-ld.exp                |  2 +-
 gdb/testsuite/gdb.base/solib-corrupted.exp           |  2 +-
 gdb/testsuite/gdb.base/solib-disc.exp                |  2 +-
 gdb/testsuite/gdb.base/solib-display.exp             | 14 +++++++-------
 gdb/testsuite/gdb.base/solib-overlap.exp             |  6 +++---
 gdb/testsuite/gdb.base/solib-search.exp              |  6 +++---
 gdb/testsuite/gdb.base/solib-symbol.exp              |  4 ++--
 gdb/testsuite/gdb.base/source-execution.exp          |  2 +-
 gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp       |  2 +-
 gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp         |  2 +-
 gdb/testsuite/gdb.base/stack-checking.exp            |  2 +-
 gdb/testsuite/gdb.base/stale-infcall.exp             |  2 +-
 gdb/testsuite/gdb.base/step-break.exp                |  2 +-
 gdb/testsuite/gdb.base/step-line.exp                 |  2 +-
 gdb/testsuite/gdb.base/step-over-exit.exp            |  2 +-
 gdb/testsuite/gdb.base/step-test.exp                 |  2 +-
 gdb/testsuite/gdb.base/structs.exp                   |  2 +-
 gdb/testsuite/gdb.base/sym-file.exp                  |  2 +-
 gdb/testsuite/gdb.base/symtab-search-order.exp       |  4 ++--
 gdb/testsuite/gdb.base/term.exp                      |  2 +-
 gdb/testsuite/gdb.base/type-opaque.exp               |  2 +-
 gdb/testsuite/gdb.base/unload.exp                    |  2 +-
 gdb/testsuite/gdb.base/until-nodebug.exp             |  2 +-
 gdb/testsuite/gdb.base/until.exp                     |  2 +-
 gdb/testsuite/gdb.base/unwindonsignal.exp            |  4 ++--
 gdb/testsuite/gdb.base/watch-cond.exp                |  6 +++---
 gdb/testsuite/gdb.base/watch-non-mem.exp             |  2 +-
 gdb/testsuite/gdb.base/watch_thread_num.exp          |  2 +-
 gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp     |  2 +-
 gdb/testsuite/gdb.base/watchpoint-solib.exp          |  2 +-
 gdb/testsuite/gdb.base/watchpoint.exp                |  2 +-
 gdb/testsuite/gdb.btrace/dlopen.exp                  |  2 +-
 gdb/testsuite/gdb.cell/arch.exp                      | 14 +++++++-------
 gdb/testsuite/gdb.cell/break.exp                     | 10 +++++-----
 gdb/testsuite/gdb.cell/bt.exp                        | 12 ++++++------
 gdb/testsuite/gdb.cell/core.exp                      |  6 +++---
 gdb/testsuite/gdb.cell/data.exp                      |  8 ++++----
 gdb/testsuite/gdb.cell/dwarfaddr.exp                 |  4 ++--
 gdb/testsuite/gdb.cell/ea-cache.exp                  |  8 ++++----
 gdb/testsuite/gdb.cell/ea-standalone.exp             |  4 ++--
 gdb/testsuite/gdb.cell/ea-test.exp                   |  4 ++--
 gdb/testsuite/gdb.cell/f-regs.exp                    |  8 ++++----
 gdb/testsuite/gdb.cell/fork.exp                      |  8 ++++----
 gdb/testsuite/gdb.cell/gcore.exp                     |  8 ++++----
 gdb/testsuite/gdb.cell/mem-access.exp                |  8 ++++----
 gdb/testsuite/gdb.cell/ptype.exp                     |  8 ++++----
 gdb/testsuite/gdb.cell/registers.exp                 |  8 ++++----
 gdb/testsuite/gdb.cell/sizeof.exp                    |  8 ++++----
 gdb/testsuite/gdb.cell/solib-symbol.exp              |  8 ++++----
 gdb/testsuite/gdb.cell/solib.exp                     |  8 ++++----
 gdb/testsuite/gdb.compile/compile-tls.exp            |  2 +-
 gdb/testsuite/gdb.cp/exception.exp                   |  2 +-
 gdb/testsuite/gdb.cp/gdb2495.exp                     |  2 +-
 gdb/testsuite/gdb.cp/local.exp                       |  2 +-
 gdb/testsuite/gdb.cp/mb-inline.exp                   |  2 +-
 gdb/testsuite/gdb.cp/mb-templates.exp                |  2 +-
 gdb/testsuite/gdb.cp/pr10687.exp                     |  2 +-
 gdb/testsuite/gdb.cp/pr9167.exp                      |  2 +-
 gdb/testsuite/gdb.cp/scope-err.exp                   |  2 +-
 gdb/testsuite/gdb.cp/templates.exp                   |  2 +-
 gdb/testsuite/gdb.cp/virtfunc.exp                    |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp       |  2 +-
 .../gdb.dwarf2/dw2-single-line-discriminators.exp    |  2 +-
 gdb/testsuite/gdb.fortran/complex.exp                |  2 +-
 gdb/testsuite/gdb.fortran/library-module.exp         |  4 ++--
 gdb/testsuite/gdb.guile/guile.exp                    |  2 +-
 gdb/testsuite/gdb.guile/scm-cmd.exp                  |  2 +-
 gdb/testsuite/gdb.guile/scm-frame-inline.exp         |  2 +-
 gdb/testsuite/gdb.guile/scm-objfile.exp              |  2 +-
 gdb/testsuite/gdb.guile/scm-pretty-print.exp         |  2 +-
 gdb/testsuite/gdb.guile/scm-symbol.exp               |  2 +-
 gdb/testsuite/gdb.guile/scm-type.exp                 |  2 +-
 gdb/testsuite/gdb.guile/scm-value.exp                |  6 +++---
 gdb/testsuite/gdb.linespec/keywords.exp              |  2 +-
 gdb/testsuite/gdb.linespec/ls-errs.exp               |  2 +-
 gdb/testsuite/gdb.linespec/macro-relative.exp        |  2 +-
 gdb/testsuite/gdb.linespec/thread.exp                |  2 +-
 gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp       |  4 ++--
 gdb/testsuite/gdb.mi/mi-dprintf-pending.exp          |  4 ++--
 gdb/testsuite/gdb.mi/mi-fullname-deleted.exp         |  4 ++--
 gdb/testsuite/gdb.mi/mi-logging.exp                  |  8 ++++----
 gdb/testsuite/gdb.mi/mi-pending.exp                  |  6 +++---
 gdb/testsuite/gdb.mi/mi-solib.exp                    |  2 +-
 gdb/testsuite/gdb.mi/new-ui-mi-sync.exp              |  2 +-
 gdb/testsuite/gdb.mi/user-selected-context-sync.exp  |  2 +-
 gdb/testsuite/gdb.multi/dummy-frame-restore.exp      |  4 ++--
 gdb/testsuite/gdb.multi/multi-arch-exec.exp          |  2 +-
 gdb/testsuite/gdb.multi/remove-inferiors.exp         |  2 +-
 gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp    |  2 +-
 gdb/testsuite/gdb.opt/solib-intra-step.exp           |  2 +-
 gdb/testsuite/gdb.perf/backtrace.exp                 |  2 +-
 gdb/testsuite/gdb.perf/single-step.exp               |  2 +-
 gdb/testsuite/gdb.perf/skip-command.exp              |  2 +-
 gdb/testsuite/gdb.perf/skip-prologue.exp             |  2 +-
 gdb/testsuite/gdb.perf/solib.exp                     |  2 +-
 gdb/testsuite/gdb.python/lib-types.exp               |  2 +-
 gdb/testsuite/gdb.python/py-as-string.exp            |  2 +-
 gdb/testsuite/gdb.python/py-bad-printers.exp         |  2 +-
 gdb/testsuite/gdb.python/py-block.exp                |  2 +-
 gdb/testsuite/gdb.python/py-breakpoint.exp           | 16 ++++++++--------
 gdb/testsuite/gdb.python/py-cmd.exp                  |  2 +-
 gdb/testsuite/gdb.python/py-events.exp               |  2 +-
 gdb/testsuite/gdb.python/py-evthreads.exp            |  2 +-
 gdb/testsuite/gdb.python/py-finish-breakpoint.exp    | 16 ++++++++--------
 gdb/testsuite/gdb.python/py-finish-breakpoint2.exp   |  2 +-
 gdb/testsuite/gdb.python/py-frame-inline.exp         |  2 +-
 gdb/testsuite/gdb.python/py-frame.exp                |  2 +-
 gdb/testsuite/gdb.python/py-inferior.exp             |  2 +-
 gdb/testsuite/gdb.python/py-infthread.exp            |  2 +-
 gdb/testsuite/gdb.python/py-mi.exp                   |  2 +-
 gdb/testsuite/gdb.python/py-objfile.exp              |  4 ++--
 gdb/testsuite/gdb.python/py-pp-maint.exp             |  2 +-
 gdb/testsuite/gdb.python/py-pp-registration.exp      |  2 +-
 gdb/testsuite/gdb.python/py-prettyprint.exp          |  2 +-
 gdb/testsuite/gdb.python/py-recurse-unwind.exp       |  2 +-
 gdb/testsuite/gdb.python/py-shared.exp               |  6 +++---
 gdb/testsuite/gdb.python/py-symbol.exp               |  8 ++++----
 gdb/testsuite/gdb.python/py-symtab.exp               |  2 +-
 gdb/testsuite/gdb.python/py-template.exp             |  2 +-
 gdb/testsuite/gdb.python/py-type.exp                 |  2 +-
 gdb/testsuite/gdb.python/py-unwind-maint.exp         |  2 +-
 gdb/testsuite/gdb.python/py-unwind.exp               |  2 +-
 gdb/testsuite/gdb.python/py-value.exp                |  4 ++--
 gdb/testsuite/gdb.python/python.exp                  |  8 ++++----
 gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp    |  2 +-
 gdb/testsuite/gdb.reverse/insn-reverse.exp           |  2 +-
 .../gdb.reverse/next-reverse-bkpt-over-sr.exp        |  2 +-
 gdb/testsuite/gdb.reverse/solib-precsave.exp         |  6 +++---
 gdb/testsuite/gdb.reverse/solib-reverse.exp          |  6 +++---
 gdb/testsuite/gdb.stabs/gdb11479.exp                 |  2 +-
 gdb/testsuite/gdb.stabs/weird.exp                    |  2 +-
 gdb/testsuite/gdb.threads/fork-child-threads.exp     |  2 +-
 gdb/testsuite/gdb.threads/fork-plus-threads.exp      |  2 +-
 gdb/testsuite/gdb.threads/fork-thread-pending.exp    |  4 ++--
 .../gdb.threads/forking-threads-plus-breakpoint.exp  |  4 ++--
 gdb/testsuite/gdb.threads/hand-call-in-threads.exp   |  4 ++--
 gdb/testsuite/gdb.threads/interrupted-hand-call.exp  |  4 ++--
 gdb/testsuite/gdb.threads/linux-dp.exp               |  2 +-
 .../gdb.threads/local-watch-wrong-thread.exp         |  2 +-
 .../gdb.threads/next-while-other-thread-longjmps.exp |  2 +-
 gdb/testsuite/gdb.threads/non-ldr-exit.exp           |  2 +-
 gdb/testsuite/gdb.threads/pending-step.exp           |  2 +-
 gdb/testsuite/gdb.threads/print-threads.exp          |  8 ++++----
 .../gdb.threads/process-dies-while-detaching.exp     |  6 +++---
 .../gdb.threads/process-dies-while-handling-bp.exp   |  2 +-
 gdb/testsuite/gdb.threads/pthreads.exp               |  6 +++---
 gdb/testsuite/gdb.threads/queue-signal.exp           |  2 +-
 gdb/testsuite/gdb.threads/reconnect-signal.exp       |  4 ++--
 .../gdb.threads/signal-command-handle-nopass.exp     |  2 +-
 .../signal-command-multiple-signals-pending.exp      |  2 +-
 .../gdb.threads/signal-delivered-right-thread.exp    |  2 +-
 gdb/testsuite/gdb.threads/signal-sigtrap.exp         |  2 +-
 gdb/testsuite/gdb.threads/sigthread.exp              |  2 +-
 gdb/testsuite/gdb.threads/staticthreads.exp          |  4 ++--
 gdb/testsuite/gdb.threads/stepi-random-signal.exp    |  2 +-
 gdb/testsuite/gdb.threads/thread-unwindonsignal.exp  |  4 ++--
 gdb/testsuite/gdb.threads/thread_check.exp           |  2 +-
 gdb/testsuite/gdb.threads/thread_events.exp          |  2 +-
 gdb/testsuite/gdb.threads/tid-reuse.exp              |  2 +-
 gdb/testsuite/gdb.threads/tls-nodebug.exp            |  2 +-
 gdb/testsuite/gdb.threads/tls-shared.exp             |  2 +-
 gdb/testsuite/gdb.threads/tls-so_extern.exp          |  2 +-
 gdb/testsuite/gdb.threads/tls.exp                    |  8 ++++----
 gdb/testsuite/gdb.threads/wp-replication.exp         |  4 ++--
 gdb/testsuite/gdb.trace/actions-changed.exp          |  4 ++--
 gdb/testsuite/gdb.trace/actions.exp                  |  4 ++--
 gdb/testsuite/gdb.trace/backtrace.exp                |  6 +++---
 gdb/testsuite/gdb.trace/change-loc.exp               | 10 +++++-----
 gdb/testsuite/gdb.trace/collection.exp               |  2 +-
 gdb/testsuite/gdb.trace/deltrace.exp                 |  2 +-
 gdb/testsuite/gdb.trace/disconnected-tracing.exp     |  4 ++--
 gdb/testsuite/gdb.trace/entry-values.exp             |  6 +++---
 gdb/testsuite/gdb.trace/ftrace-lock.exp              | 10 +++++-----
 gdb/testsuite/gdb.trace/ftrace.exp                   |  6 +++---
 gdb/testsuite/gdb.trace/infotrace.exp                |  4 ++--
 gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp |  4 ++--
 gdb/testsuite/gdb.trace/mi-trace-unavailable.exp     |  4 ++--
 gdb/testsuite/gdb.trace/mi-traceframe-changed.exp    |  4 ++--
 gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp    | 10 +++++-----
 gdb/testsuite/gdb.trace/mi-tsv-changed.exp           | 10 +++++-----
 gdb/testsuite/gdb.trace/no-attach-trace.exp          |  4 ++--
 gdb/testsuite/gdb.trace/packetlen.exp                |  2 +-
 gdb/testsuite/gdb.trace/passc-dyn.exp                |  4 ++--
 gdb/testsuite/gdb.trace/passcount.exp                |  2 +-
 gdb/testsuite/gdb.trace/pending.exp                  | 20 ++++++++++----------
 gdb/testsuite/gdb.trace/pr16508.exp                  |  2 +-
 gdb/testsuite/gdb.trace/qtro.exp                     |  4 ++--
 gdb/testsuite/gdb.trace/range-stepping.exp           |  6 +++---
 gdb/testsuite/gdb.trace/read-memory.exp              |  4 ++--
 gdb/testsuite/gdb.trace/report.exp                   |  4 ++--
 gdb/testsuite/gdb.trace/save-trace.exp               |  2 +-
 gdb/testsuite/gdb.trace/signal.exp                   |  4 ++--
 gdb/testsuite/gdb.trace/stap-trace.exp               |  2 +-
 gdb/testsuite/gdb.trace/status-stop.exp              |  8 ++++----
 gdb/testsuite/gdb.trace/strace.exp                   | 14 +++++++-------
 gdb/testsuite/gdb.trace/tfile.exp                    |  2 +-
 gdb/testsuite/gdb.trace/tfind.exp                    |  4 ++--
 gdb/testsuite/gdb.trace/trace-break.exp              | 18 +++++++++---------
 gdb/testsuite/gdb.trace/trace-condition.exp          |  8 ++++----
 gdb/testsuite/gdb.trace/trace-enable-disable.exp     |  8 ++++----
 gdb/testsuite/gdb.trace/trace-mt.exp                 | 12 ++++++------
 gdb/testsuite/gdb.trace/tracecmd.exp                 |  6 +++---
 gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp     |  2 +-
 gdb/testsuite/gdb.trace/tspeed.exp                   |  2 +-
 gdb/testsuite/gdb.trace/tstatus.exp                  |  2 +-
 gdb/testsuite/gdb.trace/tsv.exp                      |  4 ++--
 gdb/testsuite/gdb.trace/unavailable.exp              |  2 +-
 gdb/testsuite/gdb.trace/while-dyn.exp                |  2 +-
 gdb/testsuite/gdb.trace/while-stepping.exp           |  4 ++--
 gdb/testsuite/lib/gdb-guile.exp                      |  2 +-
 gdb/testsuite/lib/gdb.exp                            | 10 +++++-----
 gdb/testsuite/lib/mi-support.exp                     |  8 ++++----
 gdb/testsuite/lib/pascal.exp                         |  2 +-
 gdb/testsuite/lib/perftest.exp                       |  2 +-
 gdb/testsuite/lib/prelink-support.exp                |  2 +-
 gdb/testsuite/lib/selftest-support.exp               |  2 +-
 355 files changed, 648 insertions(+), 648 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/array_return.exp b/gdb/testsuite/gdb.ada/array_return.exp
index 6e6d35f..f4dae48 100644
--- a/gdb/testsuite/gdb.ada/array_return.exp
+++ b/gdb/testsuite/gdb.ada/array_return.exp
@@ -28,7 +28,7 @@ clean_restart ${testfile}
 # Start the inferior
 
 if ![runto_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp
index 00089a9..5ffcdf1 100644
--- a/gdb/testsuite/gdb.ada/catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/catch_ex.exp
@@ -39,7 +39,7 @@ set catch_exception_info \
 ####################################
 
 if ![runto_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -88,7 +88,7 @@ gdb_test "continue" \
 #  - continue, the program exits.
 
 if ![runto_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -149,7 +149,7 @@ gdb_test "continue" \
 #     the program.
 
 if ![runto_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp
index db95aee..e3cfdb5 100644
--- a/gdb/testsuite/gdb.ada/info_exc.exp
+++ b/gdb/testsuite/gdb.ada/info_exc.exp
@@ -24,7 +24,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
 clean_restart ${testfile}
 
 if ![runto_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
index 288a065..6ec0609 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
@@ -33,7 +33,7 @@ set eol "\[\r\n\]+"
 clean_restart ${testfile}
 
 if ![runto_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -70,7 +70,7 @@ mi_gdb_load ${binfile}
 ####################################
 
 if ![mi_run_to_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -126,7 +126,7 @@ continue_to_exception \
 #  - continue, the program exits.
 
 if ![mi_run_to_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
index cf30437..9a7da6e 100644
--- a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
+++ b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
@@ -34,7 +34,7 @@ mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
 if ![mi_run_to_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_ex_cond.exp b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
index 31e039e..a228244 100644
--- a/gdb/testsuite/gdb.ada/mi_ex_cond.exp
+++ b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
@@ -33,7 +33,7 @@ set eol "\[\r\n\]+"
 clean_restart ${testfile}
 
 if ![runto_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_exc_info.exp b/gdb/testsuite/gdb.ada/mi_exc_info.exp
index 8f7434f..6026a3f 100644
--- a/gdb/testsuite/gdb.ada/mi_exc_info.exp
+++ b/gdb/testsuite/gdb.ada/mi_exc_info.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 }
 
 if ![mi_run_to_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_interface.exp b/gdb/testsuite/gdb.ada/mi_interface.exp
index 6000ec8..764236a 100644
--- a/gdb/testsuite/gdb.ada/mi_interface.exp
+++ b/gdb/testsuite/gdb.ada/mi_interface.exp
@@ -34,7 +34,7 @@ mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
 if ![mi_run_to_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp
index ecc29f0..6897936 100644
--- a/gdb/testsuite/gdb.ada/mi_task_arg.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp
@@ -37,7 +37,7 @@ mi_gdb_load ${binfile}
 mi_gdb_test "-gdb-set debug-file-directory \"\"" ".*"
 
 if ![mi_runto "task_switch.break_me"] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_task_info.exp b/gdb/testsuite/gdb.ada/mi_task_info.exp
index 936d69a..dc82c57 100644
--- a/gdb/testsuite/gdb.ada/mi_task_info.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_info.exp
@@ -38,7 +38,7 @@ mi_gdb_load ${binfile}
 ####################################
 
 if ![mi_runto "task_switch.break_me"] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_var_array.exp b/gdb/testsuite/gdb.ada/mi_var_array.exp
index c648e7e..3c7073f 100644
--- a/gdb/testsuite/gdb.ada/mi_var_array.exp
+++ b/gdb/testsuite/gdb.ada/mi_var_array.exp
@@ -34,7 +34,7 @@ mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
 if ![mi_run_to_main] then {
-   fail "Cannot run to main, testcase aborted"
+   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/alpha-step.exp b/gdb/testsuite/gdb.arch/alpha-step.exp
index 3e681f1..e45ad97 100644
--- a/gdb/testsuite/gdb.arch/alpha-step.exp
+++ b/gdb/testsuite/gdb.arch/alpha-step.exp
@@ -24,7 +24,7 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "Testcase compile failed."
+    unsupported "testcase compile failed."
     return -1
 }
 
@@ -38,7 +38,7 @@ proc test_stepi {function } {
     # of the previous tests, this makes sure that it doesn't affect
     # this series of tests.
     if ![runto_main] then {
-        fail "Can't run to main"
+        fail "can't run to main"
         return 0
     }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step.exp b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
index 7765546..ba75b46 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
@@ -45,7 +45,7 @@ gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp
index f6bef79..c038551 100644
--- a/gdb/testsuite/gdb.arch/arm-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp
@@ -413,7 +413,7 @@ proc test_add_rn_pc {} {
 gdb_test_no_output "set displaced-stepping off"
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
index a6ceb0b..d995676 100644
--- a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
+++ b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
@@ -31,7 +31,7 @@ if [prepare_for_testing $expfile $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
@@ -53,7 +53,7 @@ proc read_testcase { n } {
 
 set n_testcases [get_integer_valueof "n_testcases" 0]
 if { ${n_testcases} == 0 } {
-    untested "No instruction relocation to test"
+    untested "no instruction relocation to test"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.arch/e500-prologue.exp b/gdb/testsuite/gdb.arch/e500-prologue.exp
index 3019b3e..68e6664 100644
--- a/gdb/testsuite/gdb.arch/e500-prologue.exp
+++ b/gdb/testsuite/gdb.arch/e500-prologue.exp
@@ -27,7 +27,7 @@ set testfile "e500-prologue"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "Testcase compile failed."
+    unsupported "testcase compile failed."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
index 44d1957..edf767f 100644
--- a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
+++ b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
@@ -28,7 +28,7 @@ if [prepare_for_testing $expfile $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -52,14 +52,14 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "Can't run to main for ftrace tests"
+    fail "can't run to main for ftrace tests"
     return 0
 }
 
 gdb_reinitialize_dir $srcdir/$subdir
 
 if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
-    untested "Could not find IPA lib loaded"
+    untested "could not find IPA lib loaded"
     return 1
 }
 
@@ -82,7 +82,7 @@ proc read_testcase { n } {
 set n_testcases [gdb_readexpr "n_testcases"]
 
 if { ${n_testcases} == 0 } {
-    untested "No instruction relocation to test"
+    untested "no instruction relocation to test"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp
index d96ad87..8cea6d3 100644
--- a/gdb/testsuite/gdb.arch/gdb1558.exp
+++ b/gdb/testsuite/gdb.arch/gdb1558.exp
@@ -50,7 +50,7 @@ gdb_test "b sub2" "Breakpoint 3.*" "set breakpoint at sub2"
 
 gdb_run_cmd
 
-set test "Hits breakpoint at main after function called from main"
+set test "hits breakpoint at main after function called from main"
 gdb_test_multiple "" $test {
     -re "Breakpoint 1.*main .*$gdb_prompt $" {
 	pass $test
diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
index ba2db2a..005d1fc 100644
--- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
+++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
@@ -59,7 +59,7 @@ set retcode [gdb_test_multiple "disassemble $function" "Disassemble function '$f
 }]
 
 if {$retcode != 0} {
-  fail "Disassemble failed, skipping entire test."
+  fail "disassemble failed, skipping entire test."
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-disp-step.exp b/gdb/testsuite/gdb.arch/i386-disp-step.exp
index f0815aa..7be606a 100644
--- a/gdb/testsuite/gdb.arch/i386-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/i386-disp-step.exp
@@ -43,7 +43,7 @@ gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-float.exp b/gdb/testsuite/gdb.arch/i386-float.exp
index d643bee..2a869e8 100644
--- a/gdb/testsuite/gdb.arch/i386-float.exp
+++ b/gdb/testsuite/gdb.arch/i386-float.exp
@@ -33,7 +33,7 @@ if { [prepare_for_testing break.exp $testfile $srcfile [list debug $additional_f
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index b569139..9c05cab 100644
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -73,11 +73,11 @@ gdb_test "up 3" \
 
 gdb_test_multiple "info frame" "Existence of the CFI inserted register" {
     -re "Stack level 3, frame at (0x\[0-9a-f\]+):.*Saved registers:.* ecx at (0x\[0-9a-f\]+),.*" {
-	pass "Existence of the CFI inserted register"
+	pass "existence of the CFI inserted register"
 	if { [string compare $expect_out(1,string) $expect_out(2,string)] } then {
-	    fail "Value of the CFI inserted register"
+	    fail "value of the CFI inserted register"
 	} else {
-	    pass "Value of the CFI inserted register"
+	    pass "value of the CFI inserted register"
 	}
     }
 }
diff --git a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
index 0c1c3a6..32367c9 100644
--- a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
@@ -22,7 +22,7 @@ set testfile ia64-breakpoint-shadow
 set srcfile ${testfile}.S
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile test program"
+    untested "couldn't compile test program"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/mips16-thunks.exp b/gdb/testsuite/gdb.arch/mips16-thunks.exp
index 15ebad3..37190d0 100644
--- a/gdb/testsuite/gdb.arch/mips16-thunks.exp
+++ b/gdb/testsuite/gdb.arch/mips16-thunks.exp
@@ -62,7 +62,7 @@ gdb_compile ${srcfile} ${objfile} object ${options}
 set binfile [standard_output_file ${testname}]
 set options [list debug nowarnings]
 if { [gdb_compile ${objfiles} ${binfile} executable ${options}] != "" } then {
-    unsupported "No MIPS16 support in the toolchain."
+    unsupported "no MIPS16 support in the toolchain."
     return
 }
 clean_restart ${testname}
@@ -76,21 +76,21 @@ gdb_test_multiple "" "check for MIPS16 support in the processor" {
 		verbose "MIPS16 support check successful."
 	    }
 	    -re "$gdb_prompt $" {
-		unsupported "No MIPS16 support in the processor."
+		unsupported "no MIPS16 support in the processor."
 		return
 	    }
 	    default {
-		unsupported "No MIPS16 support in the processor."
+		unsupported "no MIPS16 support in the processor."
 		return
 	    }
 	}
     }
     -re "$gdb_prompt $" {
-	unsupported "No MIPS16 support in the processor."
+	unsupported "no MIPS16 support in the processor."
 	return
     }
     default {
-	unsupported "No MIPS16 support in the processor."
+	unsupported "no MIPS16 support in the processor."
 	return
     }
 }
diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
index 6689569..cbc66bf 100644
--- a/gdb/testsuite/gdb.arch/pa-nullify.exp
+++ b/gdb/testsuite/gdb.arch/pa-nullify.exp
@@ -36,7 +36,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 set gcorefile ${objdir}/${subdir}/${testfile}.gcore
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "Testcase compile failed."
+    unsupported "testcase compile failed."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
index d82c4de..f028e94 100644
--- a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
@@ -27,7 +27,7 @@ set testfile "powerpc-aix-prologue"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "Testcase compile failed."
+    unsupported "testcase compile failed."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-power.exp b/gdb/testsuite/gdb.arch/powerpc-power.exp
index 8594ad5..c647787 100644
--- a/gdb/testsuite/gdb.arch/powerpc-power.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-power.exp
@@ -49,7 +49,7 @@ proc instr_to_patt {offset instr} {
 proc func_check {offset instr} {
     global func
 
-    set test "Found $offset: $instr"
+    set test "found $offset: $instr"
     if [regexp -nocase -line [instr_to_patt $offset $instr] $func] {
 	pass $test
     } else {
diff --git a/gdb/testsuite/gdb.arch/ppc-dfp.exp b/gdb/testsuite/gdb.arch/ppc-dfp.exp
index 6f77d18..b7f1905 100644
--- a/gdb/testsuite/gdb.arch/ppc-dfp.exp
+++ b/gdb/testsuite/gdb.arch/ppc-dfp.exp
@@ -35,7 +35,7 @@ if ![test_compiler_info gcc*] {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {quiet debug}] != "" } {
-    unsupported "This machine doesn't support Decimal Floating Point."
+    unsupported "this machine doesn't support Decimal Floating Point."
     return -1
 }
 
@@ -54,7 +54,7 @@ gdb_run_cmd
 # Unless the program bails out after checking AT_HWCAP.
 gdb_expect {
   -re "$inferior_exited_re with code 01.\[\r\n\]+$gdb_prompt $" {
-    unsupported "This machine doesn't support Decimal Floating Point."
+    unsupported "this machine doesn't support Decimal Floating Point."
     return -1
   }
 
diff --git a/gdb/testsuite/gdb.arch/s390-tdbregs.exp b/gdb/testsuite/gdb.arch/s390-tdbregs.exp
index a377668..ba2dd72 100644
--- a/gdb/testsuite/gdb.arch/s390-tdbregs.exp
+++ b/gdb/testsuite/gdb.arch/s390-tdbregs.exp
@@ -36,14 +36,14 @@ if { ![runto_main] } then {
 
 gdb_test_multiple "next" "check for TE support" {
     -re "Program received signal SIGILL,.*\r\n$gdb_prompt $" {
-	unsupported "No TE support."
+	unsupported "no TE support."
 	return
     }
     -re "\[0-9\]+.*\r\n$gdb_prompt $" {
 	pass "TE support available"
     }
     -re "$gdb_prompt $" {
-	unsupported "No TE support (unknown error)."
+	unsupported "no TE support (unknown error)."
 	return
     }
 }
diff --git a/gdb/testsuite/gdb.arch/spu-info.exp b/gdb/testsuite/gdb.arch/spu-info.exp
index dc4f356..2110f83 100644
--- a/gdb/testsuite/gdb.arch/spu-info.exp
+++ b/gdb/testsuite/gdb.arch/spu-info.exp
@@ -53,7 +53,7 @@ proc c_to { marker } {
 
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/spu-ls.exp b/gdb/testsuite/gdb.arch/spu-ls.exp
index 6619ede..78104a4 100644
--- a/gdb/testsuite/gdb.arch/spu-ls.exp
+++ b/gdb/testsuite/gdb.arch/spu-ls.exp
@@ -38,7 +38,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
index 843a01a..b00571b 100644
--- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
+++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
@@ -25,7 +25,7 @@ set srcfile ${testfile}.S
 set opts {}
 
 if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] {
-    untested "Failed to compile $srcfile"
+    untested "failed to compile $srcfile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp
index 1dceb0d..ce8a98c 100644
--- a/gdb/testsuite/gdb.base/advance.exp
+++ b/gdb/testsuite/gdb.base/advance.exp
@@ -23,7 +23,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/annota-input-while-running.exp b/gdb/testsuite/gdb.base/annota-input-while-running.exp
index fc2e608..2c9b675 100644
--- a/gdb/testsuite/gdb.base/annota-input-while-running.exp
+++ b/gdb/testsuite/gdb.base/annota-input-while-running.exp
@@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug] == -1} {
 # Because runto_main doesn't know how to handle the prompt with annotations,
 # run to main before we set the annotation level.
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 1
 }
 
diff --git a/gdb/testsuite/gdb.base/arrayidx.exp b/gdb/testsuite/gdb.base/arrayidx.exp
index 3f244d0..a2253e9 100644
--- a/gdb/testsuite/gdb.base/arrayidx.exp
+++ b/gdb/testsuite/gdb.base/arrayidx.exp
@@ -20,7 +20,7 @@
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/asmlabel.exp b/gdb/testsuite/gdb.base/asmlabel.exp
index 09ea845..6d9a681 100644
--- a/gdb/testsuite/gdb.base/asmlabel.exp
+++ b/gdb/testsuite/gdb.base/asmlabel.exp
@@ -38,7 +38,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp
index f688423..3adb156 100644
--- a/gdb/testsuite/gdb.base/async.exp
+++ b/gdb/testsuite/gdb.base/async.exp
@@ -63,7 +63,7 @@ proc test_background {command before_prompt after_prompt {message ""}} {
 	    fail "$message"
 	}
 	-re ".*Asynchronous execution not supported on this target\..*" {
-	    unsupported "Asynchronous execution not supported: $message"
+	    unsupported "asynchronous execution not supported: $message"
 	}
 	timeout  {
 	    fail "$message (timeout)"
diff --git a/gdb/testsuite/gdb.base/attach-wait-input.exp b/gdb/testsuite/gdb.base/attach-wait-input.exp
index 394c293..07142af 100644
--- a/gdb/testsuite/gdb.base/attach-wait-input.exp
+++ b/gdb/testsuite/gdb.base/attach-wait-input.exp
@@ -48,7 +48,7 @@ proc start_program {binfile} {
     clean_restart $binfile
 
     if ![runto setup_done] then {
-	fail "Can't run to setup_done"
+	fail "can't run to setup_done"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.base/auto-connect-native-target.exp b/gdb/testsuite/gdb.base/auto-connect-native-target.exp
index 191f85c..504708c 100644
--- a/gdb/testsuite/gdb.base/auto-connect-native-target.exp
+++ b/gdb/testsuite/gdb.base/auto-connect-native-target.exp
@@ -36,7 +36,7 @@ gdb_test_multiple $test $test {
 }
 
 if { !$have_native } {
-    unsupported "No \"target native\" support."
+    unsupported "no \"target native\" support."
     return
 }
 
@@ -62,14 +62,14 @@ set topmost [get_topmost_target "check whether a target is already connected"]
 
 # Testing against the extended-remote board, for example?
 if { $topmost != "exec" } {
-    unsupported "Already connected to target $topmost."
+    unsupported "already connected to target $topmost."
     return
 }
 
 # Check which target this board connects to.  If testing with a native
 # target board, this should cause the native target to auto connect.
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
@@ -94,7 +94,7 @@ proc check_native_target {test} {
 
 # Testing against a remote board, for example?
 if { ![check_native_target "check whether board tests the native target"] } {
-    unsupported "Not testing the native target."
+    unsupported "not testing the native target."
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
index a2de2c0..e7e3d7e 100644
--- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
+++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
@@ -37,7 +37,7 @@ proc spawn_shell {} {
 
     set res [remote_spawn host "/bin/sh"]
     if { $res < 0 || $res == "" } {
-	unsupported "Spawning shell failed."
+	unsupported "spawning shell failed."
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.base/bfp-test.exp b/gdb/testsuite/gdb.base/bfp-test.exp
index 9725331..4b39d39 100644
--- a/gdb/testsuite/gdb.base/bfp-test.exp
+++ b/gdb/testsuite/gdb.base/bfp-test.exp
@@ -19,7 +19,7 @@
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
index ae00d0a..62ca2b1 100644
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ b/gdb/testsuite/gdb.base/bigcore.exp
@@ -21,7 +21,7 @@
 # mechanism that would let it efficiently access a remote corefile.
 
 if ![isnative] then {
-    untested "Remote system"
+    untested "remote system"
     return
 }
 
@@ -34,7 +34,7 @@ if { [istarget "*-*-*bsd*"]
      || [istarget "*-*-solaris*"] 
      || [istarget "*-*-darwin*"] 
      || [istarget "*-*-cygwin*"] } {
-    untested "Kernel lacks sparse corefile support (PR gdb/1551)"
+    untested "kernel lacks sparse corefile support (PR gdb/1551)"
     return
 }
 
@@ -146,7 +146,7 @@ foreach pat [list core.${inferior_pid} ${testfile}.core core] {
 }
 
 if { $file == "" } {
-    untested "Can't generate a core file"
+    untested "can't generate a core file"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/bp-permanent.exp b/gdb/testsuite/gdb.base/bp-permanent.exp
index 57e36ed..64d0171 100644
--- a/gdb/testsuite/gdb.base/bp-permanent.exp
+++ b/gdb/testsuite/gdb.base/bp-permanent.exp
@@ -110,7 +110,7 @@ proc test {always_inserted sw_watchpoint} {
 		    # Some targets (QEMU for one) will disallow writes to the
 		    # .text section under certain circumstances.  It is no use
 		    # continuing with the test at this point.  Just return.
-		    unsupported "Cannot modify memory"
+		    unsupported "cannot modify memory"
 		    return
 		}
 		-re " = .*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/break-always.exp b/gdb/testsuite/gdb.base/break-always.exp
index 409fdcc..a1a4165 100644
--- a/gdb/testsuite/gdb.base/break-always.exp
+++ b/gdb/testsuite/gdb.base/break-always.exp
@@ -77,7 +77,7 @@ foreach test_value {0 1} {
 
 	    # Some targets do not allow manually writing a breakpoint to a
 	    # certain memory address, like QEMU.  In that case, just bail out.
-	    unsupported "Cannot write to address $bp_address"
+	    unsupported "cannot write to address $bp_address"
 	    return -1
 	}
 	-re " = .*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/break-fun-addr.exp b/gdb/testsuite/gdb.base/break-fun-addr.exp
index e8bed3f..938ec87 100644
--- a/gdb/testsuite/gdb.base/break-fun-addr.exp
+++ b/gdb/testsuite/gdb.base/break-fun-addr.exp
@@ -36,7 +36,7 @@ set srcfile1 ${testfile1}.c
 set binfile1 [standard_output_file ${testfile1}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile1}"
+    untested "couldn't compile ${srcfile1}"
     return -1
 }
 
@@ -65,7 +65,7 @@ set srcfile2 ${testfile2}.c
 set binfile2 [standard_output_file ${testfile2}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile2}"
+    untested "couldn't compile ${srcfile2}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/break-idempotent.exp b/gdb/testsuite/gdb.base/break-idempotent.exp
index 5f25fe0..eab03c4 100644
--- a/gdb/testsuite/gdb.base/break-idempotent.exp
+++ b/gdb/testsuite/gdb.base/break-idempotent.exp
@@ -41,7 +41,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
@@ -127,7 +127,7 @@ proc test_break { always_inserted break_command } {
 	delete_breakpoints
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp
index f21bbc3..2fe6676 100644
--- a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp
+++ b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp
@@ -56,7 +56,7 @@ proc test_remove_bp { initial_load } {
 	set GDBFLAGS $saved_gdbflags
 
 	if ![runto start] {
-	    fail "Can't run to start"
+	    fail "can't run to start"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp
index ddadc8b..bb8eee0 100644
--- a/gdb/testsuite/gdb.base/break-probes.exp
+++ b/gdb/testsuite/gdb.base/break-probes.exp
@@ -28,7 +28,7 @@ set probes_bp "dl_main"
 
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "Could not compile $binfile_lib."
+    untested "could not compile $binfile_lib."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/break-unload-file.exp b/gdb/testsuite/gdb.base/break-unload-file.exp
index 68690c0..a395cde 100644
--- a/gdb/testsuite/gdb.base/break-unload-file.exp
+++ b/gdb/testsuite/gdb.base/break-unload-file.exp
@@ -60,7 +60,7 @@ proc test_break { initial_load always_inserted break_command } {
 	set GDBFLAGS $saved_gdbflags
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index 2b4587e..f111d58 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -35,13 +35,13 @@ gdb_expect {
 	    send_gdb "y\n"
 	    gdb_expect {
 		-re "$gdb_prompt $" {
-		    fail "Delete all breakpoints when none (unexpected prompt)"
+		    fail "delete all breakpoints when none (unexpected prompt)"
 		}
-		timeout	{ fail "Delete all breakpoints when none (timeout after unexpected prompt)" }
+		timeout	{ fail "delete all breakpoints when none (timeout after unexpected prompt)" }
 	    }
 	}
-     -re ".*$gdb_prompt $"       { pass "Delete all breakpoints when none" }
-    timeout	            { fail "Delete all breakpoints when none (timeout)" }
+     -re ".*$gdb_prompt $"       { pass "delete all breakpoints when none" }
+    timeout	            { fail "delete all breakpoints when none (timeout)" }
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index c63935a..0e10453 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -22,7 +22,7 @@ standard_testfile
 # Some targets can't call functions, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
index a92ba9e..7120b8b 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -40,7 +40,7 @@ if [get_compiler_info] {
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
index 89065e1..a5405df 100644
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -23,7 +23,7 @@
 # test.
 
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp
index a6b07cf..5dd580c 100644
--- a/gdb/testsuite/gdb.base/call-signal-resume.exp
+++ b/gdb/testsuite/gdb.base/call-signal-resume.exp
@@ -36,7 +36,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
@@ -56,7 +56,7 @@ proc get_dummy_frame_number { } {
 clean_restart ${binfile}
 
 if { ![runto_main] } {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index 7a310d4..ac1bf6d 100644
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -28,7 +28,7 @@ standard_testfile
 # Some targets can't call functions, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/callexit.exp
index 219c9a4..e904200 100644
--- a/gdb/testsuite/gdb.base/callexit.exp
+++ b/gdb/testsuite/gdb.base/callexit.exp
@@ -24,7 +24,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
@@ -33,7 +33,7 @@ if [target_info exists gdb,cannot_call_functions] {
 clean_restart ${binfile}
 
 if { ![runto_main] } {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index b108952..8fa016a 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -26,7 +26,7 @@ if [support_complex_tests] {
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
diff --git a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
index 31fa1b8..63c3292 100644
--- a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
+++ b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
@@ -36,7 +36,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if ![runto_main] {
-    fail "Can't run to main to make the tests"
+    fail "can't run to main to make the tests"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
index 7fabfd6..7cc848c 100644
--- a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
+++ b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
@@ -42,7 +42,7 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {debug}] }
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp
index a739c46..4bec7a6 100644
--- a/gdb/testsuite/gdb.base/catch-syscall.exp
+++ b/gdb/testsuite/gdb.base/catch-syscall.exp
@@ -29,7 +29,7 @@ if  { [prepare_for_testing ${testfile}.exp $testfile ${testfile}.c] } {
 # Check target supports catch syscall or not.
 clean_restart $binfile
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/compare-sections.exp b/gdb/testsuite/gdb.base/compare-sections.exp
index 9fa42e0..09fde65 100644
--- a/gdb/testsuite/gdb.base/compare-sections.exp
+++ b/gdb/testsuite/gdb.base/compare-sections.exp
@@ -78,7 +78,7 @@ gdb_test_multiple $command $test {
 
 # Now get past startup code.
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/cond-eval-mode.exp b/gdb/testsuite/gdb.base/cond-eval-mode.exp
index 400c883..4816ddc 100644
--- a/gdb/testsuite/gdb.base/cond-eval-mode.exp
+++ b/gdb/testsuite/gdb.base/cond-eval-mode.exp
@@ -22,7 +22,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/condbreak-call-false.exp b/gdb/testsuite/gdb.base/condbreak-call-false.exp
index f0054c3..d51ff63 100644
--- a/gdb/testsuite/gdb.base/condbreak-call-false.exp
+++ b/gdb/testsuite/gdb.base/condbreak-call-false.exp
@@ -23,7 +23,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/consecutive-step-over.exp b/gdb/testsuite/gdb.base/consecutive-step-over.exp
index 5fb0319..9a05aeb 100644
--- a/gdb/testsuite/gdb.base/consecutive-step-over.exp
+++ b/gdb/testsuite/gdb.base/consecutive-step-over.exp
@@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/cursal.exp b/gdb/testsuite/gdb.base/cursal.exp
index bf12faa..efaa7c7 100644
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ b/gdb/testsuite/gdb.base/cursal.exp
@@ -17,7 +17,7 @@
 standard_testfile
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != ""} {
-    untested "Couldn't compile $srcfile"
+    untested "couldn't compile $srcfile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/disabled-location.exp b/gdb/testsuite/gdb.base/disabled-location.exp
index 0c49466..10e5121 100644
--- a/gdb/testsuite/gdb.base/disabled-location.exp
+++ b/gdb/testsuite/gdb.base/disabled-location.exp
@@ -20,7 +20,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile}] } {
 }
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/disasm-end-cu.exp b/gdb/testsuite/gdb.base/disasm-end-cu.exp
index 681cb76..81b153f 100644
--- a/gdb/testsuite/gdb.base/disasm-end-cu.exp
+++ b/gdb/testsuite/gdb.base/disasm-end-cu.exp
@@ -29,21 +29,21 @@ set main_addr [get_hexadecimal_valueof "&main" "0"]
 set dummy_3_addr [get_hexadecimal_valueof "&dummy_3" "0"]
 
 if {$main_addr == 0 || $dummy_3_addr == 0 || $dummy_3_addr <= $main_addr} {
-    fail "Unable to extract required addresses, or addresses out of order"
+    fail "unable to extract required addresses, or addresses out of order"
     return -1
 }
 
 gdb_test_multiple "disassemble /m ${main_addr},${dummy_3_addr}" "Disassemble address range with source" {
     -re "Dump of assembler code from ${main_addr} to ${dummy_3_addr}:\r\nEnd of assembler dump\." {
-        fail "No output from the disassemble command"
+        fail "no output from the disassemble command"
     }
     -re "Line number 0 out of range;.* has $decimal lines\." {
-        fail "The disassemble command failed"
+        fail "the disassemble command failed"
     }
     -re "Dump of assembler code from ${main_addr} to ${dummy_3_addr}:\r\n.*main.*End of assembler dump\." {
         pass "disassemble command returned some output"
     }
     -re ".*$gdb_prompt $" {
-        fail "Unexpected output from disassemble command"
+        fail "unexpected output from disassemble command"
     }
 }
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index 040110a..9576be54 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -53,7 +53,7 @@ if !$use_gdb_stub {
 # Ok, on to real life
 #
 if ![runto_main] then {
-    fail "Could not run to main - other tests will fail."
+    fail "could not run to main - other tests will fail."
     continue
 }
 
diff --git a/gdb/testsuite/gdb.base/double-prompt-target-event-error.exp b/gdb/testsuite/gdb.base/double-prompt-target-event-error.exp
index ebf2231..16567fa 100644
--- a/gdb/testsuite/gdb.base/double-prompt-target-event-error.exp
+++ b/gdb/testsuite/gdb.base/double-prompt-target-event-error.exp
@@ -41,7 +41,7 @@ proc cancel_pagination_in_target_event { command } {
 	clean_restart $binfile
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
index b6b5955..004dc2b 100644
--- a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
+++ b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
@@ -31,7 +31,7 @@ proc test { style } {
 	clean_restart $binfile
 
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.base/dprintf-detach.exp
index 798bf9f..a0be2cd 100644
--- a/gdb/testsuite/gdb.base/dprintf-detach.exp
+++ b/gdb/testsuite/gdb.base/dprintf-detach.exp
@@ -46,7 +46,7 @@ proc dprintf_detach_test { breakpoint_always_inserted dprintf_style disconnected
 	gdb_test_no_output "set disconnected-dprintf ${disconnected_dprintf}"
 
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.base/dprintf-next.exp b/gdb/testsuite/gdb.base/dprintf-next.exp
index e8da9be..7a36278 100644
--- a/gdb/testsuite/gdb.base/dprintf-next.exp
+++ b/gdb/testsuite/gdb.base/dprintf-next.exp
@@ -25,7 +25,7 @@ if [prepare_for_testing "failed to prepare for dprintf with next" \
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dprintf-non-stop.exp b/gdb/testsuite/gdb.base/dprintf-non-stop.exp
index 1787f6f..94f97d8 100644
--- a/gdb/testsuite/gdb.base/dprintf-non-stop.exp
+++ b/gdb/testsuite/gdb.base/dprintf-non-stop.exp
@@ -15,7 +15,7 @@
 
 if [is_remote target] then {
     # Testing with remote/non-stop is racy at the moment.
-    unsupported "Testing dprintf with remote/non-stop is not supported."
+    unsupported "testing dprintf with remote/non-stop is not supported."
     return 0
 }
 
@@ -33,7 +33,7 @@ save_vars { GDBFLAGS } {
 }
 
 if ![runto main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dprintf-pending.exp b/gdb/testsuite/gdb.base/dprintf-pending.exp
index 5758c1b..10df3fb 100644
--- a/gdb/testsuite/gdb.base/dprintf-pending.exp
+++ b/gdb/testsuite/gdb.base/dprintf-pending.exp
@@ -32,7 +32,7 @@ if { [get_compiler_info] } {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dso2dso.exp b/gdb/testsuite/gdb.base/dso2dso.exp
index 336d46a..f620d2c 100644
--- a/gdb/testsuite/gdb.base/dso2dso.exp
+++ b/gdb/testsuite/gdb.base/dso2dso.exp
@@ -41,13 +41,13 @@ set binfile_libdso1 [standard_output_file $libdso1.so]
 
 if { [gdb_compile_shlib $srcfile_libdso2 $binfile_libdso2 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "Could not compile $binfile_libdso2."
+  untested "could not compile $binfile_libdso2."
   return -1
 }
 
 if { [gdb_compile_shlib $srcfile_libdso1 $binfile_libdso1 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "Could not compile $binfile_libdso1."
+  untested "could not compile $binfile_libdso1."
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 945e835..37bb39e 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -270,7 +270,7 @@ if {!$use_gdb_stub
     set exec_output [remote_exec host "ls core"]
 
     if [ regexp "core not found" $exec_output]  {
-	pass "No core dumped on quit"
+	pass "no core dumped on quit"
     } else {
 	if [ regexp "No such file or directory" $exec_output] {
 	    pass "ls: core (No core dumped on quit)"
diff --git a/gdb/testsuite/gdb.base/enum_cond.exp b/gdb/testsuite/gdb.base/enum_cond.exp
index bb3cf59..4be8a8a 100644
--- a/gdb/testsuite/gdb.base/enum_cond.exp
+++ b/gdb/testsuite/gdb.base/enum_cond.exp
@@ -21,7 +21,7 @@ standard_testfile .c
 
 set opts [list debug additional_flags=-fshort-enums]
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
-    untested "Could not compile ${srcfile}"
+    untested "could not compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/examine-backward.exp b/gdb/testsuite/gdb.base/examine-backward.exp
index e03cbfd..f39056e 100644
--- a/gdb/testsuite/gdb.base/examine-backward.exp
+++ b/gdb/testsuite/gdb.base/examine-backward.exp
@@ -36,7 +36,7 @@ proc get_first_mapped_address {} {
             set addr $expect_out(1,string)
         }
         -re "$gdb_prompt $" {
-            unsupported "Current target does not support 'info proc mappings'"
+            unsupported "current target does not support 'info proc mappings'"
         }
     }
     return ${addr}
diff --git a/gdb/testsuite/gdb.base/exe-lock.exp b/gdb/testsuite/gdb.base/exe-lock.exp
index 66eae02..8cb8f9d 100644
--- a/gdb/testsuite/gdb.base/exe-lock.exp
+++ b/gdb/testsuite/gdb.base/exe-lock.exp
@@ -23,7 +23,7 @@ standard_testfile arrayidx.c
 append binfile $EXEEXT
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
index 9665b5f..a089e89 100644
--- a/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
+++ b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
@@ -47,7 +47,7 @@ proc do_exec_sysroot_test {} {
     # Start the program running, and stop at main.
     #
     if ![runto_main] then {
-	fail "Couldn't run ${testfile}"
+	fail "couldn't run ${testfile}"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
index 47a848e..1c2713f 100644
--- a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
+++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
@@ -55,7 +55,7 @@ if { [gdb_compile $objfile $exec1 executable $opts1_ld] != "" } {
 
 clean_restart ${exec1}
 if ![runto_main] then {
-    fail "Couldn't run to main"
+    fail "couldn't run to main"
     return -1
 }
 
@@ -70,7 +70,7 @@ gdb_test_multiple "p/x &main" $test {
 
 clean_restart ${exec2}
 if ![runto_main] then {
-    fail "Couldn't run to main"
+    fail "couldn't run to main"
     return -1
 }
 
@@ -103,7 +103,7 @@ proc test { always_inserted } {
     gdb_test_no_output "set breakpoint always-inserted $always_inserted"
 
     if ![runto_main] then {
-	fail "Couldn't run to main"
+	fail "couldn't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/execution-termios.exp b/gdb/testsuite/gdb.base/execution-termios.exp
index 4abdeb8..02b674c 100644
--- a/gdb/testsuite/gdb.base/execution-termios.exp
+++ b/gdb/testsuite/gdb.base/execution-termios.exp
@@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 proc test { prefix body } {
     with_test_prefix $prefix {
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 	uplevel 1 $body
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index d83bbb4..5dd2f20 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -225,7 +225,7 @@ gdb_test continue \
 "Continuing\\..*rename 2:.*EISDIR$stop_msg" \
 "Renaming a file to existing directory returns EISDIR"
 
-set test "Renaming a directory to a non-empty directory returns ENOTEMPTY or EEXIST"
+set test "renaming a directory to a non-empty directory returns ENOTEMPTY or EEXIST"
 gdb_test_multiple continue "${test}" {
     -re "Continuing\\..*rename 3:.*(ENOTEMPTY|EEXIST)$stop_msg$gdb_prompt $" {
 	pass "${test}"
diff --git a/gdb/testsuite/gdb.base/fixsection.exp b/gdb/testsuite/gdb.base/fixsection.exp
index 07b7bb5..5b7fdf6 100644
--- a/gdb/testsuite/gdb.base/fixsection.exp
+++ b/gdb/testsuite/gdb.base/fixsection.exp
@@ -34,7 +34,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile \
 	     executable $exec_opts] != ""} {
-    untested "Could not compile either $libsrc or $srcfile."
+    untested "could not compile either $libsrc or $srcfile."
     return -1
 }
 
@@ -47,7 +47,7 @@ gdb_load ${binfile}
 gdb_load_shlib ${lib_sl}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp
index aa7b4143..af417ca 100644
--- a/gdb/testsuite/gdb.base/foll-exec-mode.exp
+++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp
@@ -69,7 +69,7 @@ proc do_catch_exec_test { } {
     # Start the program running, and stop at main.
     #
     if ![runto_main] then {
-	fail "Couldn't run ${testfile}"
+	fail "couldn't run ${testfile}"
 	return
     }
 
@@ -109,7 +109,7 @@ proc do_follow_exec_mode_tests { mode cmd infswitch } {
 	# Start the program running, and stop at main.
 	#
 	if ![runto_main] then {
-	    fail "Couldn't run ${testfile}"
+	    fail "couldn't run ${testfile}"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp
index f496cca..ed86c0f 100644
--- a/gdb/testsuite/gdb.base/foll-exec.exp
+++ b/gdb/testsuite/gdb.base/foll-exec.exp
@@ -48,7 +48,7 @@ proc do_exec_tests {} {
    # Start the program running, and stop at main.
    #
    if ![runto_main] then {
-     fail "Couldn't run ${testfile}"
+     fail "couldn't run ${testfile}"
      return
    }
 
@@ -75,7 +75,7 @@ proc do_exec_tests {} {
    # Start the program running, and stop at main.
    #
    if ![runto_main] then {
-     fail "Couldn't run ${testfile}"
+     fail "couldn't run ${testfile}"
      return
    }
    # Execute the code setting up variable PROG.
@@ -162,7 +162,7 @@ proc do_exec_tests {} {
    # Start the program running, and stop at main.
    #
    if ![runto_main] then {
-     fail "Couldn't run ${testfile} (2nd try)"
+     fail "couldn't run ${testfile} (2nd try)"
      return
    }
 
@@ -231,7 +231,7 @@ proc do_exec_tests {} {
    # Start the program running, and stop at main.
    #
    if ![runto_main] then {
-     fail "Couldn't run ${testfile} (3rd try)"
+     fail "couldn't run ${testfile} (3rd try)"
      return
    }
    # Execute the code setting up variable PROG.
@@ -296,7 +296,7 @@ proc do_exec_tests {} {
    # Start the program running, and stop at main.
    #
    if ![runto_main] then {
-     fail "Couldn't run ${testfile} (4th try)"
+     fail "couldn't run ${testfile} (4th try)"
      return
    }
    # Execute the code setting up variable PROG.
@@ -355,7 +355,7 @@ proc do_exec_tests {} {
    # Start the program running, and stop at main.
    #
    if ![runto_main] then {
-     fail "Couldn't run ${testfile} (5th try)"
+     fail "couldn't run ${testfile} (5th try)"
      return
    }
 
diff --git a/gdb/testsuite/gdb.base/fork-running-state.exp b/gdb/testsuite/gdb.base/fork-running-state.exp
index be81be6..7a54ada 100644
--- a/gdb/testsuite/gdb.base/fork-running-state.exp
+++ b/gdb/testsuite/gdb.base/fork-running-state.exp
@@ -36,7 +36,7 @@ proc do_test { detach_on_fork follow_fork non_stop schedule_multiple } {
     }
 
     if ![runto_main] then {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.base/frame-args.exp b/gdb/testsuite/gdb.base/frame-args.exp
index 037967b..08eb5d8 100644
--- a/gdb/testsuite/gdb.base/frame-args.exp
+++ b/gdb/testsuite/gdb.base/frame-args.exp
@@ -15,7 +15,7 @@
 
 standard_testfile .c
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/fullpath-expand.exp b/gdb/testsuite/gdb.base/fullpath-expand.exp
index 4e572e5..1b1c5e7 100644
--- a/gdb/testsuite/gdb.base/fullpath-expand.exp
+++ b/gdb/testsuite/gdb.base/fullpath-expand.exp
@@ -16,7 +16,7 @@
 standard_testfile .c fullpath-expand-func.c
 
 if [is_remote host] {
-    unsupported "Compiling on a remote host does not support a filename with directory."
+    unsupported "compiling on a remote host does not support a filename with directory."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/func-ptr.exp b/gdb/testsuite/gdb.base/func-ptr.exp
index 1a56cb8..cda2e9d 100644
--- a/gdb/testsuite/gdb.base/func-ptr.exp
+++ b/gdb/testsuite/gdb.base/func-ptr.exp
@@ -22,7 +22,7 @@ if { [prepare_for_testing func-ptr.exp "func-ptr" {func-ptr.c} {debug}] } {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/gcore-relro-pie.exp b/gdb/testsuite/gdb.base/gcore-relro-pie.exp
index 5f22544..5a22d5d 100644
--- a/gdb/testsuite/gdb.base/gcore-relro-pie.exp
+++ b/gdb/testsuite/gdb.base/gcore-relro-pie.exp
@@ -41,7 +41,7 @@ clean_restart ${stripped_binfile}
 
 # The binary is stripped of debug info, but not minsyms.
 if ![runto break_here] {
-    fail "Can't run to break_here"
+    fail "can't run to break_here"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/gdb1090.exp b/gdb/testsuite/gdb.base/gdb1090.exp
index e75004c..2bba93e 100644
--- a/gdb/testsuite/gdb.base/gdb1090.exp
+++ b/gdb/testsuite/gdb.base/gdb1090.exp
@@ -30,7 +30,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.base/gdb1555.exp b/gdb/testsuite/gdb.base/gdb1555.exp
index 5d11195..bb198f5 100644
--- a/gdb/testsuite/gdb.base/gdb1555.exp
+++ b/gdb/testsuite/gdb.base/gdb1555.exp
@@ -45,7 +45,7 @@ clean_restart ${binfile}
 gdb_load_shlib $libobj
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp b/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
index c8bdd2b..7285962 100644
--- a/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
+++ b/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
@@ -29,13 +29,13 @@ set binfile_lib2 [standard_output_file $lib2name.so]
 
 if { [gdb_compile_shlib $srcfile_lib1 $binfile_lib1 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "Could not compile $binfile_lib1."
+  untested "could not compile $binfile_lib1."
   return -1
 }
 
 if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "Could not compile $binfile_lib2."
+  untested "could not compile $binfile_lib2."
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp
index 3b2775b..ce9e11f 100644
--- a/gdb/testsuite/gdb.base/gnu-ifunc.exp
+++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp
@@ -52,7 +52,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/$libsrc $lib_so $lib_opts] != ""
      || [gdb_compile ${srcdir}/${subdir}/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not compile dynamic executable $binfile."
+    untested "could not compile dynamic executable $binfile."
     return -1
 }
 
@@ -62,7 +62,7 @@ clean_restart $executable
 gdb_load_shlib ${lib_so}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 1
 }
 
@@ -144,7 +144,7 @@ gdb_test "info sym $expect_out(1,string)" "gnu_ifunc in section .*" "info sym <g
 
 if { [gdb_compile ${srcdir}/${subdir}/$libsrc $lib_o object {}] != ""
      || [gdb_compile "${srcdir}/${subdir}/$srcfile $lib_o" $staticbinfile executable {debug}] != "" } {
-    untested "Could not compile static executable $staticbinfile."
+    untested "could not compile static executable $staticbinfile."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
index 03a6b74..28ab3d6 100644
--- a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
+++ b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib_src} ${lib_so} $lib_opts] != ""
      || [gdb_compile ${srcdir}/${subdir}/${main_src} ${binfile} executable $exec_opts] != ""} {
-    untested "Could not compile ${subdir}/$lib_src or ${subdir}/$srcfile."
+    untested "could not compile ${subdir}/$lib_src or ${subdir}/$srcfile."
     return -1
 }
 
@@ -44,7 +44,7 @@ clean_restart $binfile
 gdb_load_shlib $lib_so
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hbreak-unmapped.exp b/gdb/testsuite/gdb.base/hbreak-unmapped.exp
index 43136ef..b5a2fbb 100644
--- a/gdb/testsuite/gdb.base/hbreak-unmapped.exp
+++ b/gdb/testsuite/gdb.base/hbreak-unmapped.exp
@@ -24,13 +24,13 @@ if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
 # If we can read the memory at address 0, skip the test.
 if { [is_address_zero_readable] } {
-    untested "Memory at address 0 is readable"
+    untested "memory at address 0 is readable"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/hook-stop.exp b/gdb/testsuite/gdb.base/hook-stop.exp
index 7b0c22e..b34a4b7 100644
--- a/gdb/testsuite/gdb.base/hook-stop.exp
+++ b/gdb/testsuite/gdb.base/hook-stop.exp
@@ -40,7 +40,7 @@ proc setup {commands} {
     clean_restart $binfile
 
     if ![runto_main] then {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -code return
     }
 
diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.base/infcall-input.exp
index b92a915..c970c0e 100644
--- a/gdb/testsuite/gdb.base/infcall-input.exp
+++ b/gdb/testsuite/gdb.base/infcall-input.exp
@@ -29,7 +29,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Couldn't run to main"
+    fail "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp
index 3437216..2eec698 100644
--- a/gdb/testsuite/gdb.base/info-fun.exp
+++ b/gdb/testsuite/gdb.base/info-fun.exp
@@ -40,13 +40,13 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $sep_lib_flags] != ""
 	 || [gdb_compile $srcdir/$subdir/${srcfile} ${binfile} \
 		 executable $bin_flags] != "" } {
-      untested "Could not compile $binfile_lib or $binfile."
+      untested "could not compile $binfile_lib or $binfile."
       return -1
     }
 
     if {$libsepdebug == "SEP"} {
 	if {[gdb_gnu_strip_debug $binfile_lib] != 0} {
-	    unsupported "Could not split debug of $binfile_lib."
+	    unsupported "could not split debug of $binfile_lib."
 	    return
 	} else {
 	    pass "split solib"
@@ -56,7 +56,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     clean_restart $executable
 
     if ![runto_main] then {
-      fail "Can't run to main"
+      fail "can't run to main"
       return 0
     }
 
diff --git a/gdb/testsuite/gdb.base/info-shared.exp b/gdb/testsuite/gdb.base/info-shared.exp
index aa00f73..57aa1d0 100644
--- a/gdb/testsuite/gdb.base/info-shared.exp
+++ b/gdb/testsuite/gdb.base/info-shared.exp
@@ -31,13 +31,13 @@ set define2 -DSHLIB2_NAME=\"$binfile_lib2\"
 
 if { [gdb_compile_shlib $srcfile_lib1 $binfile_lib1 \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "Could not compile $binfile_lib1."
+    untested "could not compile $binfile_lib1."
     return -1
 }
 
 if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "Could not compile $binfile_lib2."
+    untested "could not compile $binfile_lib2."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/interrupt-noterm.exp b/gdb/testsuite/gdb.base/interrupt-noterm.exp
index 05f6076..3aefa0c 100644
--- a/gdb/testsuite/gdb.base/interrupt-noterm.exp
+++ b/gdb/testsuite/gdb.base/interrupt-noterm.exp
@@ -24,7 +24,7 @@ if [prepare_for_testing "failed to prepare for testing" \
 gdb_test_no_output "set interactive-mode off"
 
 if ![runto main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/jit-so.exp b/gdb/testsuite/gdb.base/jit-so.exp
index 9fadd86..b2e2955 100644
--- a/gdb/testsuite/gdb.base/jit-so.exp
+++ b/gdb/testsuite/gdb.base/jit-so.exp
@@ -76,7 +76,7 @@ proc one_jit_test {count match_str} {
 	}
 
 	if { ![runto_main] } {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.base/jit.exp b/gdb/testsuite/gdb.base/jit.exp
index 17024e4..528c330 100644
--- a/gdb/testsuite/gdb.base/jit.exp
+++ b/gdb/testsuite/gdb.base/jit.exp
@@ -116,7 +116,7 @@ proc one_jit_test {count match_str reattach} {
 	}
 
 	if { ![runto_main] } {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.base/line-symtabs.exp b/gdb/testsuite/gdb.base/line-symtabs.exp
index af22db7..85e9b2f 100644
--- a/gdb/testsuite/gdb.base/line-symtabs.exp
+++ b/gdb/testsuite/gdb.base/line-symtabs.exp
@@ -21,7 +21,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp
index 9946590..a9e2965 100644
--- a/gdb/testsuite/gdb.base/list.exp
+++ b/gdb/testsuite/gdb.base/list.exp
@@ -600,7 +600,7 @@ proc test_list {command listsize1 listsize2 linerange1 linerange2} {
 
 	clean_restart $binfile
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.base/longjmp.exp b/gdb/testsuite/gdb.base/longjmp.exp
index 2c3401c..b8d67fd 100644
--- a/gdb/testsuite/gdb.base/longjmp.exp
+++ b/gdb/testsuite/gdb.base/longjmp.exp
@@ -32,7 +32,7 @@ if [get_compiler_info] {
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 4e03553..22dcaac 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -209,7 +209,7 @@ gdb_test_multiple "info source" "Test macro information"  {
     }
 }
 if {$macro_support == 0} {
-    unsupported "Skipping test because debug information does not include macro information."
+    unsupported "skipping test because debug information does not include macro information."
     return 0
 }
  
diff --git a/gdb/testsuite/gdb.base/max-value-size.exp b/gdb/testsuite/gdb.base/max-value-size.exp
index 63a97a0..730e981 100644
--- a/gdb/testsuite/gdb.base/max-value-size.exp
+++ b/gdb/testsuite/gdb.base/max-value-size.exp
@@ -21,7 +21,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp
index 43867ba..e0dd0e1 100644
--- a/gdb/testsuite/gdb.base/nodebug.exp
+++ b/gdb/testsuite/gdb.base/nodebug.exp
@@ -31,7 +31,7 @@ if [test_compiler_info "xlc-*"] {
 }
 
 if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "Couldn't compile $srcfile."
+    untested "couldn't compile $srcfile."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/nofield.exp b/gdb/testsuite/gdb.base/nofield.exp
index 8d18960..9b06ba1 100644
--- a/gdb/testsuite/gdb.base/nofield.exp
+++ b/gdb/testsuite/gdb.base/nofield.exp
@@ -16,7 +16,7 @@
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp
index cf4213a..45b8670 100644
--- a/gdb/testsuite/gdb.base/overlays.exp
+++ b/gdb/testsuite/gdb.base/overlays.exp
@@ -171,7 +171,7 @@ gdb_expect {
     -re ".*ovly2, "	 	{ fail ".ovly2  not unmapped by .ovly3"  }
     -re ".*data00,"		{ fail ".data00 not unmapped by .data01" }
     -re ".*data02,"		{ fail ".data02 not unmapped by .data03" }
-    -re ".*$gdb_prompt $"	{ pass "Automatic unmapping"             }
+    -re ".*$gdb_prompt $"	{ pass "automatic unmapping"             }
     timeout			{ fail "(timeout) Automatic unmapping"   }
 }
 
diff --git a/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp b/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp
index a6b4df7..e928207 100644
--- a/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp
+++ b/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp
@@ -37,7 +37,7 @@ proc test_ctrlc_while_target_running_paginates {} {
 	clean_restart $binfile
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.base/paginate-bg-execution.exp b/gdb/testsuite/gdb.base/paginate-bg-execution.exp
index 5fc077e..284e623 100644
--- a/gdb/testsuite/gdb.base/paginate-bg-execution.exp
+++ b/gdb/testsuite/gdb.base/paginate-bg-execution.exp
@@ -33,7 +33,7 @@ proc test_bg_execution_pagination_return {} {
 	clean_restart $binfile
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
@@ -76,7 +76,7 @@ proc test_bg_execution_pagination_cancel { how } {
 	clean_restart $binfile
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.base/paginate-inferior-exit.exp b/gdb/testsuite/gdb.base/paginate-inferior-exit.exp
index 5128f5f..05a6dff 100644
--- a/gdb/testsuite/gdb.base/paginate-inferior-exit.exp
+++ b/gdb/testsuite/gdb.base/paginate-inferior-exit.exp
@@ -33,7 +33,7 @@ proc test_paginate_inferior_exited {} {
 	clean_restart $binfile
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index 935fa14..ea913f1 100644
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -37,7 +37,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/pr11022.exp b/gdb/testsuite/gdb.base/pr11022.exp
index 2a650d6..c8b4be8 100644
--- a/gdb/testsuite/gdb.base/pr11022.exp
+++ b/gdb/testsuite/gdb.base/pr11022.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index 7937fe7..bdddde6 100644
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -683,7 +683,7 @@ proc test_print_string_constants {} {
     gdb_test_no_output "set print elements 50"
 
     if [target_info exists gdb,cannot_call_functions] {
-	unsupported "This target can not call functions"
+	unsupported "this target can not call functions"
 	return
     }
 
@@ -706,7 +706,7 @@ proc test_print_string_constants {} {
 proc test_print_array_constants {} {
 
     if [target_info exists gdb,cannot_call_functions] {
-	unsupported "This target can not call functions"
+	unsupported "this target can not call functions"
 	return
     }
 
@@ -950,7 +950,7 @@ gdb_test "p ctable1\[120\]" "120 'x'" "p ctable1\[120\] #1"
 gdb_load ${binfile}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/ptr-typedef.exp b/gdb/testsuite/gdb.base/ptr-typedef.exp
index bb164db..e9f925d 100644
--- a/gdb/testsuite/gdb.base/ptr-typedef.exp
+++ b/gdb/testsuite/gdb.base/ptr-typedef.exp
@@ -16,7 +16,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile test program"
+    untested "couldn't compile test program"
     return -1
 }
 
@@ -25,7 +25,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 clean_restart ${binfile}
 
 if ![runto marker1] {
-    untested "Couldn't run to marker1"
+    untested "couldn't run to marker1"
 }
 
 gdb_test "print foo_ptr" "\\\$$decimal = \\\(struct foo \\\*\\\) $hex"
diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp
index dd61091..296b67a 100644
--- a/gdb/testsuite/gdb.base/ptype.exp
+++ b/gdb/testsuite/gdb.base/ptype.exp
@@ -591,7 +591,7 @@ gdb_test "ptype foo" "type = char" "ptype foo typedef after second list of charf
 if [runto_main] then {
 
   if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
   }
 
diff --git a/gdb/testsuite/gdb.base/randomize.exp b/gdb/testsuite/gdb.base/randomize.exp
index fe78c91..529e6d6 100644
--- a/gdb/testsuite/gdb.base/randomize.exp
+++ b/gdb/testsuite/gdb.base/randomize.exp
@@ -43,11 +43,11 @@ proc address_get { testname } {
 set test "set disable-randomization off"
 gdb_test_multiple "${test}" "${test}" {
     -re "Disabling randomization .* unsupported .*$gdb_prompt $" {
-	untested "Disabling randomization is not supported on this Linux GDB"
+	untested "disabling randomization is not supported on this Linux GDB"
 	return -1
     }
     -re "No symbol .* in current context.*$gdb_prompt $" {
-	untested "Disabling randomization is not supported on this GDB platform"
+	untested "disabling randomization is not supported on this GDB platform"
 	return -1
     }
     -re "$gdb_prompt $" {
@@ -62,7 +62,7 @@ set addr1 [address_get "randomized first address"]
 set addr2 [address_get "randomized second address"]
 set test "randomized addresses should not match"
 if [string equal $addr1 $addr2] {
-    untested "No randomization detected on this system"
+    untested "no randomization detected on this system"
     return -1
 } else {
     pass $test
diff --git a/gdb/testsuite/gdb.base/range-stepping.exp b/gdb/testsuite/gdb.base/range-stepping.exp
index 69c7ef9..9ed92c7 100644
--- a/gdb/testsuite/gdb.base/range-stepping.exp
+++ b/gdb/testsuite/gdb.base/range-stepping.exp
@@ -23,7 +23,7 @@ if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug}] } {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/realname-expand.exp b/gdb/testsuite/gdb.base/realname-expand.exp
index 918cf75..d21a403 100644
--- a/gdb/testsuite/gdb.base/realname-expand.exp
+++ b/gdb/testsuite/gdb.base/realname-expand.exp
@@ -16,7 +16,7 @@
 standard_testfile .c realname-expand-real.c
 
 if [is_remote host] {
-    unsupported "Compiling on a remote host does not support a filename with directory."
+    unsupported "compiling on a remote host does not support a filename with directory."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/relativedebug.exp b/gdb/testsuite/gdb.base/relativedebug.exp
index 00f9792..9563576 100644
--- a/gdb/testsuite/gdb.base/relativedebug.exp
+++ b/gdb/testsuite/gdb.base/relativedebug.exp
@@ -21,7 +21,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile test program"
+    untested "couldn't compile test program"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index a3c34eb..b75540a 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -127,7 +127,7 @@ set sizeof_random_data [get_sizeof "random_data" 48*1024]
 # Part THREE: Check the upload behavour
 #
 if ![runto_main] then {
-    fail "Cannot run to main"
+    fail "cannot run to main"
 }
 
 # Carefully check memory around each of the most common packet edge
diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp
index eea30d1..45174a5 100644
--- a/gdb/testsuite/gdb.base/savedregs.exp
+++ b/gdb/testsuite/gdb.base/savedregs.exp
@@ -33,7 +33,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
@@ -64,7 +64,7 @@ proc process_saved_regs { current inner outer } {
 
     foreach func $inner {
 	set saved_regs($func) "error"
-	set test "Get $func info frame"
+	set test "get $func info frame"
 	# Both dummy and sigtramp frames have problems.
 	switch $func {
 	    dummy {
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index 3ad3669..4ac235e 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -63,7 +63,7 @@ remote_exec build "mkdir [file dirname $new_name]"
 remote_exec build "ln -s ${binfile}${EXEEXT} $new_name"
 clean_restart ${testfile}${EXEEXT}
 if { $gdb_file_cmd_debug_info != "debug" } then {
-    fail "No debug information found."
+    fail "no debug information found."
 }
 
 # Restore subdir
@@ -71,7 +71,7 @@ set subdir ${old_subdir}
 
 clean_restart ${testfile}${EXEEXT}
 if { $gdb_file_cmd_debug_info != "debug" } then {
-    fail "No debug information found."
+    fail "no debug information found."
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/set-noassign.exp b/gdb/testsuite/gdb.base/set-noassign.exp
index eac4e2d..fd9691d 100644
--- a/gdb/testsuite/gdb.base/set-noassign.exp
+++ b/gdb/testsuite/gdb.base/set-noassign.exp
@@ -19,7 +19,7 @@ if { [prepare_for_testing set-noassign.exp "set-noassign" start.c {debug nowarni
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp
index 80491b7..fff1471 100644
--- a/gdb/testsuite/gdb.base/shlib-call.exp
+++ b/gdb/testsuite/gdb.base/shlib-call.exp
@@ -50,7 +50,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib ${lib1src} ${lib1} $lib_opts] != ""
      || [gdb_compile_shlib ${lib2src} ${lib2} $lib_opts] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $exec_opts] != ""} {
-    untested "Could not compile $lib1, $lib2, or $srcfile."
+    untested "could not compile $lib1, $lib2, or $srcfile."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/shreloc.exp b/gdb/testsuite/gdb.base/shreloc.exp
index 1d3ed8b..ed98fa4 100644
--- a/gdb/testsuite/gdb.base/shreloc.exp
+++ b/gdb/testsuite/gdb.base/shreloc.exp
@@ -59,13 +59,13 @@ if [test_compiler_info "xlc-*"] {
 }
 
 if { [gdb_compile_shlib $lib1src $lib1_sl $lib_opts] != ""} {
-    untested "Could not build $lib1_sl."
+    untested "could not build $lib1_sl."
     return -1
 } elseif { [gdb_compile_shlib $lib2src $lib2_sl $lib_opts] != ""} {
-    untested "Could not build $lib1_s2."
+    untested "could not build $lib1_s2."
     return -1
 } elseif { [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not build $binfile."
+    untested "could not build $binfile."
     return -1
 }
 
@@ -77,7 +77,7 @@ gdb_load_shlib $lib2_sl
 
 # Load up the shared objects
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
@@ -235,8 +235,8 @@ if {([istarget "*pc-cygwin"] || [istarget "*pc-mingw32"]) } {
     # A better approach would be include absolute symbols via the assembler.
     #
     if {[check_same "_minor_os_version__" "${msymfile}"]} {
-	pass "Absolute symbols not relocated"
+	pass "absolute symbols not relocated"
     } else {
-	fail "Absolute symbols not relocated"
+	fail "absolute symbols not relocated"
     }
 }
diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp
index c85c69b..23373fc 100644
--- a/gdb/testsuite/gdb.base/sigaltstack.exp
+++ b/gdb/testsuite/gdb.base/sigaltstack.exp
@@ -31,7 +31,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}.c"
+    untested "couldn't compile ${srcfile}.c"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp
index d291c97..012bd29 100644
--- a/gdb/testsuite/gdb.base/sigbpt.exp
+++ b/gdb/testsuite/gdb.base/sigbpt.exp
@@ -56,7 +56,7 @@ if ![runto_main] then {
 # case.
 
 if { [is_address_zero_readable] } {
-    untested "Memory at address 0 is possibly executable"
+    untested "memory at address 0 is possibly executable"
     return
 }
 
@@ -119,7 +119,7 @@ proc after_segv { } {
 
 # Check that the address table and SIGSEGV correspond.
 
-set test "Verify that ${signame} occurs at the last STEPI insn"
+set test "verify that ${signame} occurs at the last STEPI insn"
 if {[string compare $segv_addr [at_segv]] == 0} {
     pass "$test"
 } else {
diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp
index 305a519..480110e 100644
--- a/gdb/testsuite/gdb.base/siginfo-addr.exp
+++ b/gdb/testsuite/gdb.base/siginfo-addr.exp
@@ -28,7 +28,7 @@ if [target_info exists gdb,nosignals] {
 
 standard_testfile
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-    untested "Couldn't compile ${srcfile}.c"
+    untested "couldn't compile ${srcfile}.c"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp
index 303074d..ca40216 100644
--- a/gdb/testsuite/gdb.base/siginfo-obj.exp
+++ b/gdb/testsuite/gdb.base/siginfo-obj.exp
@@ -52,7 +52,7 @@ set gcorefile [standard_output_file $testfile.gcore]
 set gcore_created [gdb_gcore_cmd $gcorefile "save a core file"]
 
 set ssi_addr ""
-set test "Extract si_addr"
+set test "extract si_addr"
 gdb_test_multiple "p \$_siginfo" "$test" {
     -re "si_addr = ($hex).*$gdb_prompt $" {
 	set ssi_addr $expect_out(1,string)
@@ -60,7 +60,7 @@ gdb_test_multiple "p \$_siginfo" "$test" {
     }
 }
 
-set test "Extract si_errno"
+set test "extract si_errno"
 gdb_test_multiple "p \$_siginfo" "$test" {
     -re "si_errno = (\[0-9\]\+).*$gdb_prompt $" {
 	set ssi_errno $expect_out(1,string)
@@ -68,7 +68,7 @@ gdb_test_multiple "p \$_siginfo" "$test" {
     }
 }
 
-set test "Extract si_code"
+set test "extract si_code"
 gdb_test_multiple "p \$_siginfo" "$test" {
     -re "si_code = (\[0-9\]\+).*$gdb_prompt $" {
 	set ssi_code $expect_out(1,string)
@@ -76,7 +76,7 @@ gdb_test_multiple "p \$_siginfo" "$test" {
     }
 }
 
-set test "Extract si_signo"
+set test "extract si_signo"
 gdb_test_multiple "p \$_siginfo" "$test" {
     -re "si_signo = (\[0-9\]\+).*$gdb_prompt $" {
 	set ssi_signo $expect_out(1,string)
@@ -105,7 +105,7 @@ if { ![runto_main] } then {
 # Run to the signal.
 gdb_test "continue" ".*Program received signal SIGSEGV.*" "continue to signal"
 
-set test "Set si_addr"
+set test "set si_addr"
 gdb_test "p \$_siginfo._sifields._sigfault.si_addr = 0x666" " = \\(void \\*\\) 0x666"
 gdb_test "p \$_siginfo.si_errno = 666" " = 666"
 gdb_test "p \$_siginfo.si_code = 999" " = 999"
diff --git a/gdb/testsuite/gdb.base/siginfo-thread.exp b/gdb/testsuite/gdb.base/siginfo-thread.exp
index 9af99ea..415715a 100644
--- a/gdb/testsuite/gdb.base/siginfo-thread.exp
+++ b/gdb/testsuite/gdb.base/siginfo-thread.exp
@@ -48,7 +48,7 @@ set gcorefile [standard_output_file $testfile.gcore]
 set gcore_created [gdb_gcore_cmd $gcorefile "save a core file"]
 
 set ssi_addr ""
-set test "Extract si_addr"
+set test "extract si_addr"
 gdb_test_multiple "p \$_siginfo" "$test" {
     -re "si_addr = ($hex).*$gdb_prompt $" {
 	set ssi_addr $expect_out(1,string)
@@ -56,7 +56,7 @@ gdb_test_multiple "p \$_siginfo" "$test" {
     }
 }
 
-set test "Extract si_errno"
+set test "extract si_errno"
 gdb_test_multiple "p \$_siginfo" "$test" {
     -re "si_errno = (\[0-9\]\+).*$gdb_prompt $" {
 	set ssi_errno $expect_out(1,string)
@@ -64,7 +64,7 @@ gdb_test_multiple "p \$_siginfo" "$test" {
     }
 }
 
-set test "Extract si_code"
+set test "extract si_code"
 gdb_test_multiple "p \$_siginfo" "$test" {
     -re "si_code = (\[0-9\]\+).*$gdb_prompt $" {
 	set ssi_code $expect_out(1,string)
@@ -72,7 +72,7 @@ gdb_test_multiple "p \$_siginfo" "$test" {
     }
 }
 
-set test "Extract si_signo"
+set test "extract si_signo"
 gdb_test_multiple "p \$_siginfo" "$test" {
     -re "si_signo = (\[0-9\]\+).*$gdb_prompt $" {
 	set ssi_signo $expect_out(1,string)
diff --git a/gdb/testsuite/gdb.base/signest.exp b/gdb/testsuite/gdb.base/signest.exp
index 4709b5d..d53b1b0 100644
--- a/gdb/testsuite/gdb.base/signest.exp
+++ b/gdb/testsuite/gdb.base/signest.exp
@@ -39,7 +39,7 @@ if ![runto_main] then {
 # case.
 
 if { [is_address_zero_readable] } {
-    untested "Memory at address 0 is possibly executable"
+    untested "memory at address 0 is possibly executable"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp
index a10c83e..5a14bff 100644
--- a/gdb/testsuite/gdb.base/signull.exp
+++ b/gdb/testsuite/gdb.base/signull.exp
@@ -57,7 +57,7 @@ if ![runto_main] then {
 # case.
 
 if { [is_address_zero_readable] } {
-    untested "Memory at address 0 is possibly executable"
+    untested "memory at address 0 is possibly executable"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp
index f100653..82a9e0b 100644
--- a/gdb/testsuite/gdb.base/sigrepeat.exp
+++ b/gdb/testsuite/gdb.base/sigrepeat.exp
@@ -28,7 +28,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp
index ce55dd2..7eafd94 100644
--- a/gdb/testsuite/gdb.base/skip.exp
+++ b/gdb/testsuite/gdb.base/skip.exp
@@ -46,7 +46,7 @@ gdb_test "skip -x" "Invalid skip option: -x"
 gdb_test "skip -rfu foo.* xyzzy" "Invalid argument: xyzzy"
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
@@ -91,7 +91,7 @@ gdb_test "info skip" \
 # right over it and go to the second line of main().
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
@@ -112,7 +112,7 @@ with_test_prefix "step after deleting 1" {
 	"info skip (delete 1)"
 
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return
     }
 
@@ -132,7 +132,7 @@ with_test_prefix "step after disabling 3" {
 	"info skip shows entry as disabled"
 
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return
     }
 
@@ -153,7 +153,7 @@ with_test_prefix "step after enable 3" {
 	"info skip shows entry as enabled"
 
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return
     }
 
@@ -224,7 +224,7 @@ gdb_test "skip -rfu ^b.z$" "Function\\(s\\) \\^b\\.z\\$ will be skipped when ste
 
 with_test_prefix "step using -fi" {
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return
     }
 
@@ -237,7 +237,7 @@ with_test_prefix "step using -fi" {
 
 with_test_prefix "step using -gfi" {
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return
     }
 
@@ -250,7 +250,7 @@ with_test_prefix "step using -gfi" {
 
 with_test_prefix "step using -fu for baz" {
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return
     }
 
@@ -265,7 +265,7 @@ with_test_prefix "step using -fu for baz" {
 
 with_test_prefix "step using -rfu for baz" {
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return
     }
 
@@ -284,7 +284,7 @@ with_test_prefix "step using -fi + -fu" {
     gdb_test_no_output "skip delete"
 
     if ![runto test_skip_file_and_function no-message] {
-	fail "Can't run to test_skip_file_and_function"
+	fail "can't run to test_skip_file_and_function"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp
index 4223d4c..875242d 100644
--- a/gdb/testsuite/gdb.base/so-impl-ld.exp
+++ b/gdb/testsuite/gdb.base/so-impl-ld.exp
@@ -33,7 +33,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile \
 	     executable $exec_opts] != ""} {
-    untested "Couldn't compile $libsrc or $srcfile."
+    untested "couldn't compile $libsrc or $srcfile."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/solib-corrupted.exp b/gdb/testsuite/gdb.base/solib-corrupted.exp
index f1c1e5c..71a42ba 100644
--- a/gdb/testsuite/gdb.base/solib-corrupted.exp
+++ b/gdb/testsuite/gdb.base/solib-corrupted.exp
@@ -32,7 +32,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/solib-disc.exp b/gdb/testsuite/gdb.base/solib-disc.exp
index 8b61c83..9baf8c2 100644
--- a/gdb/testsuite/gdb.base/solib-disc.exp
+++ b/gdb/testsuite/gdb.base/solib-disc.exp
@@ -56,7 +56,7 @@ gdb_load ${binfile}
 gdb_load_shlib $libobj
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp
index a82ec2e..f4d6bb8 100644
--- a/gdb/testsuite/gdb.base/solib-display.exp
+++ b/gdb/testsuite/gdb.base/solib-display.exp
@@ -74,13 +74,13 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     }
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $sep_lib_flags] != ""
 	 || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-      untested "Could not compile $binfile_lib or $binfile."
+      untested "could not compile $binfile_lib or $binfile."
       return -1
     }
 
     if {$libsepdebug == "SEP"} {
 	if {[gdb_gnu_strip_debug $binfile_lib] != 0} {
-	    unsupported "Could not split debug of $binfile_lib."
+	    unsupported "could not split debug of $binfile_lib."
 	    return
 	} else {
 	    pass "split solib"
@@ -90,7 +90,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     clean_restart $executable
 
     if ![runto_main] then {
-      fail "Can't run to main"
+      fail "can't run to main"
       return 0
     }
 
@@ -99,7 +99,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     gdb_test "display c_global" "3: c_global = 43"
 
     if { [gdb_start_cmd] < 0 } {
-	fail "Can't run to main (2)"
+	fail "can't run to main (2)"
 	continue
     }
 
@@ -112,7 +112,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     # Now rebuild the library without b_global
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} \
 	      "$sep_lib_flags additional_flags=-DNO_B_GLOBAL"] != ""} {
-	fail "Can't rebuild $binfile_lib"
+	fail "can't rebuild $binfile_lib"
     }
 
     if {$libsepdebug == "SEP"} {
@@ -126,7 +126,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     }
 
     if { [gdb_start_cmd] < 0 } {
-	fail "Can't run to main (3)"
+	fail "can't run to main (3)"
 	continue
     }
 
@@ -149,7 +149,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     gdb_test "display a_static" "6: a_static = 46"
 
     if { [gdb_start_cmd] < 0 } {
-	fail "Can't run to main (4)"
+	fail "can't run to main (4)"
 	continue
     }
 
diff --git a/gdb/testsuite/gdb.base/solib-overlap.exp b/gdb/testsuite/gdb.base/solib-overlap.exp
index 40fdd09..5b90894 100644
--- a/gdb/testsuite/gdb.base/solib-overlap.exp
+++ b/gdb/testsuite/gdb.base/solib-overlap.exp
@@ -70,14 +70,14 @@ foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix "$prelink_lib1"
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
 	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""
 	 || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-	untested "Could not compile ${binfile_lib1_test_msg}, ${binfile_lib2_test_msg} or ${binfile_test_msg}."
+	untested "could not compile ${binfile_lib1_test_msg}, ${binfile_lib2_test_msg} or ${binfile_test_msg}."
 	return -1
     }
 
     if {[catch "system \"prelink -N -r ${prelink_lib1} ${binfile_lib1}\""] != 0
 	|| [catch "system \"prelink -N -r ${prelink_lib2} ${binfile_lib2}\""] != 0} {
 	# Maybe we don't have prelink.
-	untested "Could not prelink ${binfile_lib1_test_msg} or ${binfile_lib2_test_msg}."
+	untested "could not prelink ${binfile_lib1_test_msg} or ${binfile_lib2_test_msg}."
 	return -1
     }
 
@@ -92,7 +92,7 @@ foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix "$prelink_lib1"
 
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
 	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""} {
-	untested "Could not recompile ${binfile_lib1_test_msg} or ${binfile_lib2_test_msg}."
+	untested "could not recompile ${binfile_lib1_test_msg} or ${binfile_lib2_test_msg}."
 	kill_wait_spawned_process $test_spawn_id
 	return -1
     }
diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp
index 1a3cb33..9acd347 100644
--- a/gdb/testsuite/gdb.base/solib-search.exp
+++ b/gdb/testsuite/gdb.base/solib-search.exp
@@ -69,7 +69,7 @@ if { [gdb_compile_shlib ${srcfile1_lib} ${wrong_binfile1_lib} $wrong_lib_flags]
      || [gdb_compile_shlib ${srcfile2_lib} ${wrong_binfile2_lib} $wrong_lib_flags] != ""
      || [gdb_compile_shlib ${srcfile1_lib} ${right_binfile1_lib} $right_lib_flags] != ""
      || [gdb_compile_shlib ${srcfile2_lib} ${right_binfile2_lib} $right_lib_flags] != "" } {
-    untested "Could not compile libs."
+    untested "could not compile libs."
     return -1
 }
 
@@ -78,14 +78,14 @@ remote_exec build "ln -sf ${right_lib_subdir}/${libname1}.so ${binfile1_lib}"
 remote_exec build "ln -sf ${right_lib_subdir}/${libname2}.so ${binfile2_lib}"
 if { [gdb_compile $srcdir/$subdir/${srcfile} ${binfile} \
 	  executable $bin_flags] != "" } {
-    untested "Could not compile $binfile."
+    untested "could not compile $binfile."
     return -1
 }
 
 clean_restart $testfile
 
 if { ![runto_main] } {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp
index 1ff4b3d..2d5631f 100644
--- a/gdb/testsuite/gdb.base/solib-symbol.exp
+++ b/gdb/testsuite/gdb.base/solib-symbol.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-  untested "Could not compile $binfile_lib or $binfile."
+  untested "could not compile $binfile_lib or $binfile."
   return -1
 }
 
@@ -54,7 +54,7 @@ gdb_test "br foo2" \
 delete_breakpoints
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/source-execution.exp b/gdb/testsuite/gdb.base/source-execution.exp
index ca984c7..e1128a4 100644
--- a/gdb/testsuite/gdb.base/source-execution.exp
+++ b/gdb/testsuite/gdb.base/source-execution.exp
@@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp b/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp
index cc1acea..85c9085 100644
--- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp
+++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp
@@ -38,7 +38,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp b/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp
index f84d68f..be5c253 100644
--- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp
+++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp
@@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/stack-checking.exp b/gdb/testsuite/gdb.base/stack-checking.exp
index 0258cbe..aa68575 100644
--- a/gdb/testsuite/gdb.base/stack-checking.exp
+++ b/gdb/testsuite/gdb.base/stack-checking.exp
@@ -24,7 +24,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [con
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/stale-infcall.exp b/gdb/testsuite/gdb.base/stale-infcall.exp
index b887334..67b42e5 100644
--- a/gdb/testsuite/gdb.base/stale-infcall.exp
+++ b/gdb/testsuite/gdb.base/stale-infcall.exp
@@ -35,7 +35,7 @@ gdb_test_multiple "next" $test {
     }
     -re "( test-fail .*|\r\nCannot insert breakpoint 0\\.\r\n.*)\r\n$gdb_prompt $" {
 	xfail $test
-	untested "System lacks support for tracking longjmps"
+	untested "system lacks support for tracking longjmps"
 	return -1
     }
 }
diff --git a/gdb/testsuite/gdb.base/step-break.exp b/gdb/testsuite/gdb.base/step-break.exp
index ce1bc63..19794cb 100644
--- a/gdb/testsuite/gdb.base/step-break.exp
+++ b/gdb/testsuite/gdb.base/step-break.exp
@@ -23,7 +23,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp
index a7c1511..292dc7c 100644
--- a/gdb/testsuite/gdb.base/step-line.exp
+++ b/gdb/testsuite/gdb.base/step-line.exp
@@ -29,7 +29,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/step-over-exit.exp b/gdb/testsuite/gdb.base/step-over-exit.exp
index 9f4c826..3cf5d0d 100644
--- a/gdb/testsuite/gdb.base/step-over-exit.exp
+++ b/gdb/testsuite/gdb.base/step-over-exit.exp
@@ -39,7 +39,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 # Start with a fresh gdb.
 clean_restart ${testfile}
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp
index 4bede78..280b892 100644
--- a/gdb/testsuite/gdb.base/step-test.exp
+++ b/gdb/testsuite/gdb.base/step-test.exp
@@ -27,7 +27,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debu
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 4fcef52..912eb82 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -20,7 +20,7 @@
 # test.
 
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/sym-file.exp
index 6febac3..996ba82 100644
--- a/gdb/testsuite/gdb.base/sym-file.exp
+++ b/gdb/testsuite/gdb.base/sym-file.exp
@@ -76,7 +76,7 @@ if {[prepare_for_testing $testfile  $binfile "$srcfile $srcfile2" $exec_opts]} {
 gdb_load_shlib ${lib_so}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/symtab-search-order.exp b/gdb/testsuite/gdb.base/symtab-search-order.exp
index f8f9036..c8d058a 100644
--- a/gdb/testsuite/gdb.base/symtab-search-order.exp
+++ b/gdb/testsuite/gdb.base/symtab-search-order.exp
@@ -33,7 +33,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib $lib1src $lib1 $lib_opts] != ""
      || [gdb_compile [list $srcfile $srcfile2] $binfile executable \
 	     $exec_opts] != ""} {
-    untested "Could not compile $lib1, or $srcfile."
+    untested "could not compile $lib1, or $srcfile."
     return -1
 }
 
@@ -43,7 +43,7 @@ clean_restart $binfile
 gdb_load_shlib $lib1
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp
index 6d22d0e..bb36977 100644
--- a/gdb/testsuite/gdb.base/term.exp
+++ b/gdb/testsuite/gdb.base/term.exp
@@ -28,7 +28,7 @@ gdb_test "info terminal" \
     "test info terminal"
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/type-opaque.exp b/gdb/testsuite/gdb.base/type-opaque.exp
index 2b12752..8d9d845 100644
--- a/gdb/testsuite/gdb.base/type-opaque.exp
+++ b/gdb/testsuite/gdb.base/type-opaque.exp
@@ -43,7 +43,7 @@ clean_restart ${binfile}
 gdb_load_shlib ${libobj}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/unload.exp b/gdb/testsuite/gdb.base/unload.exp
index c058d3a..aa25697 100644
--- a/gdb/testsuite/gdb.base/unload.exp
+++ b/gdb/testsuite/gdb.base/unload.exp
@@ -52,7 +52,7 @@ set exec_opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${lib_dlope
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""
      || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "Couldn't compile $libsrc or $libsrc2 or $srcfile."
+    untested "couldn't compile $libsrc or $libsrc2 or $srcfile."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/until-nodebug.exp b/gdb/testsuite/gdb.base/until-nodebug.exp
index 8e74a4c..3252941 100644
--- a/gdb/testsuite/gdb.base/until-nodebug.exp
+++ b/gdb/testsuite/gdb.base/until-nodebug.exp
@@ -23,7 +23,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile nodebug]} {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp
index 8df03a7..b9b986c 100644
--- a/gdb/testsuite/gdb.base/until.exp
+++ b/gdb/testsuite/gdb.base/until.exp
@@ -26,7 +26,7 @@ set bp_location20 [gdb_get_line_number "set breakpoint 20 here"]
 set bp_location21 [gdb_get_line_number "set breakpoint 21 here"]
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp
index cf63c6d..1c0661d 100644
--- a/gdb/testsuite/gdb.base/unwindonsignal.exp
+++ b/gdb/testsuite/gdb.base/unwindonsignal.exp
@@ -22,7 +22,7 @@ if [target_info exists gdb,nosignals] {
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
@@ -34,7 +34,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if { ![runto_main] } {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/watch-cond.exp b/gdb/testsuite/gdb.base/watch-cond.exp
index b046526..f26741f 100644
--- a/gdb/testsuite/gdb.base/watch-cond.exp
+++ b/gdb/testsuite/gdb.base/watch-cond.exp
@@ -30,7 +30,7 @@ if [target_info exists gdb,no_hardware_watchpoints] {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
@@ -50,7 +50,7 @@ if [target_info exists gdb,no_hardware_watchpoints] {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
@@ -70,7 +70,7 @@ if [target_info exists gdb,no_hardware_watchpoints] {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/watch-non-mem.exp b/gdb/testsuite/gdb.base/watch-non-mem.exp
index e1a5bb8..a773543 100644
--- a/gdb/testsuite/gdb.base/watch-non-mem.exp
+++ b/gdb/testsuite/gdb.base/watch-non-mem.exp
@@ -25,7 +25,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp
index eff9fbd..7625722 100644
--- a/gdb/testsuite/gdb.base/watch_thread_num.exp
+++ b/gdb/testsuite/gdb.base/watch_thread_num.exp
@@ -60,7 +60,7 @@ gdb_test "continue" ".*Breakpoint .*loop.*" "Stopped in loop"
 
 gdb_test_multiple "thread" "Thread command" {
     -re ".*Current thread is (\[0-9\]*).*$gdb_prompt $" {
-	pass "Thread command" 
+	pass "thread command"
     }
 }
 
diff --git a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp
index 47c40ff..7492115 100644
--- a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp
@@ -34,7 +34,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.base/watchpoint-solib.exp b/gdb/testsuite/gdb.base/watchpoint-solib.exp
index bd50064..1ae972f 100644
--- a/gdb/testsuite/gdb.base/watchpoint-solib.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-solib.exp
@@ -42,7 +42,7 @@ set exec_opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${lib_dlope
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "Couldn't compile $libsrc or $srcfile."
+    untested "couldn't compile $libsrc or $srcfile."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index e4eab3d..6e262e9 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -347,7 +347,7 @@ proc test_watchpoint_triggered_in_syscall {} {
     # Run until we get to the first marker function.
     set x 0
     set y 0
-    set testname "Watch buffer passed to read syscall"
+    set testname "watch buffer passed to read syscall"
     if [runto marker2] then {
 	gdb_test "watch buf\[0\]" ".*\[Ww\]atchpoint \[0-9\]*: buf\\\[0\\\]"
 	gdb_test "watch buf\[1\]" ".*\[Ww\]atchpoint \[0-9\]*: buf\\\[1\\\]"
diff --git a/gdb/testsuite/gdb.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp
index 2afb42b..05354f5 100644
--- a/gdb/testsuite/gdb.btrace/dlopen.exp
+++ b/gdb/testsuite/gdb.btrace/dlopen.exp
@@ -26,7 +26,7 @@ set binfile_lib [standard_output_file $basename_lib.so]
 
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "Could not compile $binfile_lib."
+    untested "could not compile $binfile_lib."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cell/arch.exp b/gdb/testsuite/gdb.cell/arch.exp
index 56d2c73..f328ab6 100644
--- a/gdb/testsuite/gdb.cell/arch.exp
+++ b/gdb/testsuite/gdb.cell/arch.exp
@@ -33,16 +33,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -61,7 +61,7 @@ gdb_test "show architecture" \
 	 "startup architecture is powerpc:common"
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
@@ -78,15 +78,15 @@ check_spu_arch ""
 send_gdb "thread\n"
 gdb_expect 10 {
     -re "Current thread is (\[0-9\]*) .*\r\n$gdb_prompt $" {
-	pass "Retrieve current thread"
+	pass "retrieve current thread"
 	set thread_id $expect_out(1,string)
     }
     -re "$gdb_prompt $" {
-	fail "Retrieve current thread"
+	fail "retrieve current thread"
 	return 0
     }
     timeout {
-	fail "Retrieve current thread (timed out)"
+	fail "retrieve current thread (timed out)"
 	return 0
     }
 }
diff --git a/gdb/testsuite/gdb.cell/break.exp b/gdb/testsuite/gdb.cell/break.exp
index 6052479..66ed698 100644
--- a/gdb/testsuite/gdb.cell/break.exp
+++ b/gdb/testsuite/gdb.cell/break.exp
@@ -34,16 +34,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -67,7 +67,7 @@ gdb_test "break main" \
 	 "breakpoint main in ppu"
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
@@ -84,7 +84,7 @@ gdb_expect {
   -re ".*$spu_file.c.*Make breakpoint pending.*y or \\\[n\\\]. $" {
     gdb_test "y" "Breakpoint.*$spu_file.*pending." "set pending breakpoint"
   }
-  timeout { fail "Timeout while setting breakpoint in spu binary" }
+  timeout { fail "timeout while setting breakpoint in spu binary" }
 }
 
 # Check breakpoints.
diff --git a/gdb/testsuite/gdb.cell/bt.exp b/gdb/testsuite/gdb.cell/bt.exp
index cd5d843..ba4e2cf 100644
--- a/gdb/testsuite/gdb.cell/bt.exp
+++ b/gdb/testsuite/gdb.cell/bt.exp
@@ -37,24 +37,24 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binaries.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_spu $spu2_src $spu2_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_cell_embedspu $spu2_bin $spu2_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o $spu2_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -68,7 +68,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${ppu_bin}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/core.exp b/gdb/testsuite/gdb.cell/core.exp
index 4cd9c7f..68d98bd 100644
--- a/gdb/testsuite/gdb.cell/core.exp
+++ b/gdb/testsuite/gdb.cell/core.exp
@@ -38,16 +38,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.cell/data.exp b/gdb/testsuite/gdb.cell/data.exp
index e373ba4..9da96ab 100644
--- a/gdb/testsuite/gdb.cell/data.exp
+++ b/gdb/testsuite/gdb.cell/data.exp
@@ -34,16 +34,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -74,7 +74,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${ppu_bin}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/dwarfaddr.exp b/gdb/testsuite/gdb.cell/dwarfaddr.exp
index a733146..37a8192 100644
--- a/gdb/testsuite/gdb.cell/dwarfaddr.exp
+++ b/gdb/testsuite/gdb.cell/dwarfaddr.exp
@@ -30,7 +30,7 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $srcfile $binary executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 
@@ -40,7 +40,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binary}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/ea-cache.exp b/gdb/testsuite/gdb.cell/ea-cache.exp
index c567f38..a6b2595 100644
--- a/gdb/testsuite/gdb.cell/ea-cache.exp
+++ b/gdb/testsuite/gdb.cell/ea-cache.exp
@@ -33,16 +33,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -56,7 +56,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${ppu_bin}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/ea-standalone.exp b/gdb/testsuite/gdb.cell/ea-standalone.exp
index 5079f36..9f8f81c 100644
--- a/gdb/testsuite/gdb.cell/ea-standalone.exp
+++ b/gdb/testsuite/gdb.cell/ea-standalone.exp
@@ -30,7 +30,7 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $srcfile $binary executable {debug}]  != "" } {
-  unsupported "Compile spu binary failed, so all tests in this file will automatically fail."
+  unsupported "compile spu binary failed, so all tests in this file will automatically fail."
   return -1
 }
 
@@ -40,7 +40,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binary}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/ea-test.exp b/gdb/testsuite/gdb.cell/ea-test.exp
index 6a5afd2..57ed9e2 100644
--- a/gdb/testsuite/gdb.cell/ea-test.exp
+++ b/gdb/testsuite/gdb.cell/ea-test.exp
@@ -30,7 +30,7 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $source $binary executable {debug}]  != "" } {
-  unsupported "Compile spu binary failed, so all tests in this file will automatically fail."
+  unsupported "compile spu binary failed, so all tests in this file will automatically fail."
   return -1
 }
 
@@ -40,7 +40,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binary}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/f-regs.exp b/gdb/testsuite/gdb.cell/f-regs.exp
index 6e211a6..512f2d9 100644
--- a/gdb/testsuite/gdb.cell/f-regs.exp
+++ b/gdb/testsuite/gdb.cell/f-regs.exp
@@ -33,16 +33,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -74,7 +74,7 @@ gdb_test "info all-registers" \
          "info all-registers"
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/fork.exp b/gdb/testsuite/gdb.cell/fork.exp
index 8437ab9..9e72f54 100644
--- a/gdb/testsuite/gdb.cell/fork.exp
+++ b/gdb/testsuite/gdb.cell/fork.exp
@@ -34,16 +34,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -57,7 +57,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${ppu_bin}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/gcore.exp b/gdb/testsuite/gdb.cell/gcore.exp
index ca1d20a..ad8e4d6 100644
--- a/gdb/testsuite/gdb.cell/gcore.exp
+++ b/gdb/testsuite/gdb.cell/gcore.exp
@@ -38,16 +38,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -61,7 +61,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${ppu_bin}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/mem-access.exp b/gdb/testsuite/gdb.cell/mem-access.exp
index 4ba5e48..623d166 100644
--- a/gdb/testsuite/gdb.cell/mem-access.exp
+++ b/gdb/testsuite/gdb.cell/mem-access.exp
@@ -34,16 +34,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -146,7 +146,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${ppu_bin}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/ptype.exp b/gdb/testsuite/gdb.cell/ptype.exp
index 291c7c4..82c381c 100644
--- a/gdb/testsuite/gdb.cell/ptype.exp
+++ b/gdb/testsuite/gdb.cell/ptype.exp
@@ -33,16 +33,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -56,7 +56,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${ppu_bin}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/registers.exp b/gdb/testsuite/gdb.cell/registers.exp
index 15b5dbf..ced627a 100644
--- a/gdb/testsuite/gdb.cell/registers.exp
+++ b/gdb/testsuite/gdb.cell/registers.exp
@@ -33,16 +33,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -61,7 +61,7 @@ gdb_test "info all-registers" \
 	  "info all-registers"
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/sizeof.exp b/gdb/testsuite/gdb.cell/sizeof.exp
index c576914..721cd4d 100644
--- a/gdb/testsuite/gdb.cell/sizeof.exp
+++ b/gdb/testsuite/gdb.cell/sizeof.exp
@@ -33,16 +33,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -88,7 +88,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${ppu_bin}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/solib-symbol.exp b/gdb/testsuite/gdb.cell/solib-symbol.exp
index 21070bc..253a20d 100644
--- a/gdb/testsuite/gdb.cell/solib-symbol.exp
+++ b/gdb/testsuite/gdb.cell/solib-symbol.exp
@@ -33,16 +33,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -57,7 +57,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${ppu_bin}
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.cell/solib.exp b/gdb/testsuite/gdb.cell/solib.exp
index 05fcd9b..ad43b03 100644
--- a/gdb/testsuite/gdb.cell/solib.exp
+++ b/gdb/testsuite/gdb.cell/solib.exp
@@ -33,16 +33,16 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
@@ -62,7 +62,7 @@ gdb_test "info sharedlibrary" \
 	 "no shared library is loaded"
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.compile/compile-tls.exp b/gdb/testsuite/gdb.compile/compile-tls.exp
index 2156ba6..107600a 100644
--- a/gdb/testsuite/gdb.compile/compile-tls.exp
+++ b/gdb/testsuite/gdb.compile/compile-tls.exp
@@ -22,7 +22,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 
 clean_restart ${binfile}
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp
index 970cf10..5dd3449 100644
--- a/gdb/testsuite/gdb.cp/exception.exp
+++ b/gdb/testsuite/gdb.cp/exception.exp
@@ -91,7 +91,7 @@ set ok 0
 gdb_run_cmd
 gdb_test_multiple "" "Run to main" {
     -re "Temporary breakpoint 4,.*$gdb_prompt $" {
-	pass "Run to main"
+	pass "run to main"
 	set ok 1
     }
 }
diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp
index 0ce1a53..7fe2b12 100644
--- a/gdb/testsuite/gdb.cp/gdb2495.exp
+++ b/gdb/testsuite/gdb.cp/gdb2495.exp
@@ -54,7 +54,7 @@ if [get_compiler_info "c++"] {
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
diff --git a/gdb/testsuite/gdb.cp/local.exp b/gdb/testsuite/gdb.cp/local.exp
index 3312139..62c1fd8 100644
--- a/gdb/testsuite/gdb.cp/local.exp
+++ b/gdb/testsuite/gdb.cp/local.exp
@@ -166,7 +166,7 @@ gdb_test "up" ".*main.*" "up from marker2"
 set eol "\[\t \]*\[\r\n\]+\[\t \]*"
 gdb_test_multiple "ptype Local" "Local out of scope" {
     -re "No symbol \"Local\" in current context.*${gdb_prompt} $" {
-        pass "Local out of scope"
+        pass "local out of scope"
     }
     -re "ptype Local${eol}type = class Local {${eol}  public:${eol}    int loc1;${eol}.*${eol}    char loc_foo\\(char\\);${eol}}${eol}${gdb_prompt} " {
         # GCC emits STABS debugging information in a way that doesn't
diff --git a/gdb/testsuite/gdb.cp/mb-inline.exp b/gdb/testsuite/gdb.cp/mb-inline.exp
index f493279..7f4a874 100644
--- a/gdb/testsuite/gdb.cp/mb-inline.exp
+++ b/gdb/testsuite/gdb.cp/mb-inline.exp
@@ -83,7 +83,7 @@ delete_breakpoints
 set bp_location [gdb_get_line_number "set multi-line breakpoint here" $hdrfile]
 
 if { ![runto_main] } {
-    fail "Can't run to main for multi_line_foo tests."
+    fail "can't run to main for multi_line_foo tests."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.cp/mb-templates.exp b/gdb/testsuite/gdb.cp/mb-templates.exp
index 2bc90b7..a17adf0 100644
--- a/gdb/testsuite/gdb.cp/mb-templates.exp
+++ b/gdb/testsuite/gdb.cp/mb-templates.exp
@@ -117,7 +117,7 @@ delete_breakpoints
 set bp_location [gdb_get_line_number "set multi-line breakpoint here"]
 
 if { ![runto_main] } {
-    fail "Can't run to main for multi_line_foo tests."
+    fail "can't run to main for multi_line_foo tests."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.cp/pr10687.exp b/gdb/testsuite/gdb.cp/pr10687.exp
index e7caa7f..385e64a 100644
--- a/gdb/testsuite/gdb.cp/pr10687.exp
+++ b/gdb/testsuite/gdb.cp/pr10687.exp
@@ -20,7 +20,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.cp/pr9167.exp b/gdb/testsuite/gdb.cp/pr9167.exp
index f7701fb..cdd7d2a 100644
--- a/gdb/testsuite/gdb.cp/pr9167.exp
+++ b/gdb/testsuite/gdb.cp/pr9167.exp
@@ -25,7 +25,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.cp/scope-err.exp b/gdb/testsuite/gdb.cp/scope-err.exp
index b197829..7b11fad 100644
--- a/gdb/testsuite/gdb.cp/scope-err.exp
+++ b/gdb/testsuite/gdb.cp/scope-err.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing $testfile $exefile $srcfile {debug c++}]} {
 }
 
 if {![runto_main]} {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp
index c503598..8a60c6d 100644
--- a/gdb/testsuite/gdb.cp/templates.exp
+++ b/gdb/testsuite/gdb.cp/templates.exp
@@ -184,7 +184,7 @@ proc test_template_calls {} {
     global gdb_prompt
 
     if [target_info exists gdb,cannot_call_functions] {
-	unsupported "This target can not call functions"
+	unsupported "this target can not call functions"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.cp/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp
index 04fe5aa..2776b0a 100644
--- a/gdb/testsuite/gdb.cp/virtfunc.exp
+++ b/gdb/testsuite/gdb.cp/virtfunc.exp
@@ -177,7 +177,7 @@ proc test_virtual_calls {} {
     global nl
 
     if [target_info exists gdb,cannot_call_functions] {
-	unsupported "This target can not call functions"
+	unsupported "this target can not call functions"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
index 2f17556..313b56f 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
@@ -327,7 +327,7 @@ lappend opts "additional_flags=-DFDIR=\"fdir\""
 lappend opts "additional_flags=-DFILE=\"${srctmpfile}\""
 
 if { [gdb_compile "${asmsrcfile} ${srcdir}/${subdir}/$srcfile" "${binfile}" executable $opts] != "" } {
-    untested "Cannot compile ${asmsrcfile} or $srcfile"
+    untested "cannot compile ${asmsrcfile} or $srcfile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
index bb7b53e..a10c5fa 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
@@ -36,7 +36,7 @@ if { [prepare_for_testing "${testfile}.exp" "${testfile}" $srcfile {nodebug}] }
 }
 
 if ![runto_main] then {
-    fail "Cannot run to main."
+    fail "cannot run to main."
     continue
 }
 
diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fortran/complex.exp
index 2d94e42..7046ba2 100644
--- a/gdb/testsuite/gdb.fortran/complex.exp
+++ b/gdb/testsuite/gdb.fortran/complex.exp
@@ -16,7 +16,7 @@
 standard_testfile .f
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90 quiet}]} {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/gdb.fortran/library-module.exp
index 8a913ed..e2f03c3 100644
--- a/gdb/testsuite/gdb.fortran/library-module.exp
+++ b/gdb/testsuite/gdb.fortran/library-module.exp
@@ -24,7 +24,7 @@ if [get_compiler_info] {
 }
 
 if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90}] != "" } {
-    untested "Couldn't compile ${srclibfile}"
+    untested "couldn't compile ${srclibfile}"
     return -1
 }
 
@@ -33,7 +33,7 @@ if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90
 # warnings on ignored $libfile abort the process.
 
 if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug f90 shlib=$libfile]] != "" } {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.guile/guile.exp b/gdb/testsuite/gdb.guile/guile.exp
index 6f4374b..37347b7 100644
--- a/gdb/testsuite/gdb.guile/guile.exp
+++ b/gdb/testsuite/gdb.guile/guile.exp
@@ -27,7 +27,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 # We want to do some tests when Guile is not present.
 gdb_test_multiple "guile (display 23) (newline)" "verify guile support" {
     -re "Undefined command.*$gdb_prompt $" {
-	unsupported "Guile not supported."
+	unsupported "guile not supported."
 	return
     }
     -re "not supported.*$gdb_prompt $"	{
diff --git a/gdb/testsuite/gdb.guile/scm-cmd.exp b/gdb/testsuite/gdb.guile/scm-cmd.exp
index bf14dd0..5b1174c 100644
--- a/gdb/testsuite/gdb.guile/scm-cmd.exp
+++ b/gdb/testsuite/gdb.guile/scm-cmd.exp
@@ -28,7 +28,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 if { [skip_guile_tests] } { continue }
 
 if ![gdb_guile_runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-frame-inline.exp b/gdb/testsuite/gdb.guile/scm-frame-inline.exp
index 93caaa7..f1d58ed 100644
--- a/gdb/testsuite/gdb.guile/scm-frame-inline.exp
+++ b/gdb/testsuite/gdb.guile/scm-frame-inline.exp
@@ -25,7 +25,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 if { [skip_guile_tests] } { continue }
 
 if ![runto main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-objfile.exp b/gdb/testsuite/gdb.guile/scm-objfile.exp
index 95e67ac..d99a519 100644
--- a/gdb/testsuite/gdb.guile/scm-objfile.exp
+++ b/gdb/testsuite/gdb.guile/scm-objfile.exp
@@ -28,7 +28,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 if { [skip_guile_tests] } { continue }
 
 if ![gdb_guile_runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-pretty-print.exp b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
index e2554a9..f17d827 100644
--- a/gdb/testsuite/gdb.guile/scm-pretty-print.exp
+++ b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
@@ -30,7 +30,7 @@ if { [skip_guile_tests] } { continue }
 proc run_lang_tests {exefile lang} {
     global srcdir subdir srcfile testfile hex
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "Couldn't compile ${srcfile} in $lang mode"
+	untested "couldn't compile ${srcfile} in $lang mode"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.guile/scm-symbol.exp b/gdb/testsuite/gdb.guile/scm-symbol.exp
index de5747a..e143045 100644
--- a/gdb/testsuite/gdb.guile/scm-symbol.exp
+++ b/gdb/testsuite/gdb.guile/scm-symbol.exp
@@ -138,7 +138,7 @@ gdb_test "guile (print (symbol-symtab t))" "= #<gdb:symtab .*gdb.guile/scm-symbo
 # C++ tests
 # Recompile binary.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "debug c++"] != "" } {
-    untested "Couldn't compile ${srcfile} in c++ mode"
+    untested "couldn't compile ${srcfile} in c++ mode"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-type.exp b/gdb/testsuite/gdb.guile/scm-type.exp
index 87e85db..455d948 100644
--- a/gdb/testsuite/gdb.guile/scm-type.exp
+++ b/gdb/testsuite/gdb.guile/scm-type.exp
@@ -30,7 +30,7 @@ proc build_inferior {exefile lang} {
     global srcdir subdir srcfile
 
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "Couldn't compile ${srcfile} in $lang mode"
+	untested "couldn't compile ${srcfile} in $lang mode"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
index 1d07c9f..282a1ce 100644
--- a/gdb/testsuite/gdb.guile/scm-value.exp
+++ b/gdb/testsuite/gdb.guile/scm-value.exp
@@ -39,7 +39,7 @@ proc build_inferior {exefile lang} {
 
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object "debug $lang"] != ""
 	 || [gdb_compile "${objfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "Couldn't compile ${srcfile} in $lang mode"
+	untested "couldn't compile ${srcfile} in $lang mode"
 	return -1
     }
     return 0
@@ -320,7 +320,7 @@ proc test_subscript_regression {exefile lang} {
     clean_restart ${exefile}
 
     if ![gdb_guile_runto_main ] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return
     }
 
@@ -450,7 +450,7 @@ test_value_hash
 # The following tests require execution.
 
 if ![gdb_guile_runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.linespec/keywords.exp b/gdb/testsuite/gdb.linespec/keywords.exp
index 11e2c4c..7baf641 100644
--- a/gdb/testsuite/gdb.linespec/keywords.exp
+++ b/gdb/testsuite/gdb.linespec/keywords.exp
@@ -23,7 +23,7 @@ if {[prepare_for_testing $testfile $exefile $srcfile {debug}]} {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp b/gdb/testsuite/gdb.linespec/ls-errs.exp
index bc4ca26..4276aa2 100644
--- a/gdb/testsuite/gdb.linespec/ls-errs.exp
+++ b/gdb/testsuite/gdb.linespec/ls-errs.exp
@@ -48,7 +48,7 @@ proc do_test {lang} {
     gdb_test_no_output "set max-completions unlimited"
 
     if {![runto_main]} {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.linespec/macro-relative.exp b/gdb/testsuite/gdb.linespec/macro-relative.exp
index 8eef3b6..4c6885a 100644
--- a/gdb/testsuite/gdb.linespec/macro-relative.exp
+++ b/gdb/testsuite/gdb.linespec/macro-relative.exp
@@ -22,7 +22,7 @@ if [using_fission] {
 }
 
 if [is_remote host] {
-    unsupported "Compiling on a remote host does not support a filename with directory."
+    unsupported "compiling on a remote host does not support a filename with directory."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.linespec/thread.exp b/gdb/testsuite/gdb.linespec/thread.exp
index d3cefb7..a469f27 100644
--- a/gdb/testsuite/gdb.linespec/thread.exp
+++ b/gdb/testsuite/gdb.linespec/thread.exp
@@ -24,7 +24,7 @@ if {[prepare_for_testing $testfile $exefile $srcfile {debug}]} {
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
index cda8c4a..dc42720 100644
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
@@ -31,7 +31,7 @@ set lib_opts "debug"
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "Could not compile either $libsrc1 or $libsrc2"
+    untested "could not compile either $libsrc1 or $libsrc2"
     return -1
 }
 
@@ -39,7 +39,7 @@ set MIFLAGS "-i=mi"
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "Failed to compile $srcfile"
+    untested "failed to compile $srcfile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
index 12a91cd..b1c870e 100644
--- a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
@@ -36,12 +36,12 @@ if {[get_compiler_info]} {
 }
 
 if {[gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""} {
-    untested "Could not compile $libsrc1"
+    untested "could not compile $libsrc1"
     return -1
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not compile $srcdir/$subdir/$srcfile"
+    untested "could not compile $srcdir/$subdir/$srcfile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp b/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
index 884a19b..d538c68 100644
--- a/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
+++ b/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
@@ -26,13 +26,13 @@ set srcfileabs [standard_output_file $srcfile]
 
 # "//$srcfile" It is used for the test of compare_filenames_for_search.
 if { [regsub {/[^/]+$} $srcfileabs {/\0} srcfileabs] != 1 } {
-    xfail "Cannot double the last slash separator"
+    xfail "cannot double the last slash separator"
     return -1
 }
 
 if { [regsub {^(/[^/]+)/} $srcfileabs {\1subst/} srcfileabssubst] != 1
      || [regsub {^(/[^/]+)/.*$} $srcfileabs {\1} initdir] != 1 } {
-    xfail "Missing root subdirectory"
+    xfail "missing root subdirectory"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-logging.exp b/gdb/testsuite/gdb.mi/mi-logging.exp
index b66f5c2..8babed0 100644
--- a/gdb/testsuite/gdb.mi/mi-logging.exp
+++ b/gdb/testsuite/gdb.mi/mi-logging.exp
@@ -54,9 +54,9 @@ close $chan
 set mi_log_prompt "\[(\]gdb\[)\] \[\r\n\]+"
 
 if [regexp "\\^done\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
-    pass "Log file contents"
+    pass "log file contents"
 } else {
-    fail "Log file contents"
+    fail "log file contents"
 }
 
 # Now try the redirect, which writes into the file only.
@@ -77,9 +77,9 @@ set logcontent [read $chan]
 close $chan
 
 if [regexp "1001\\^done\[\r\n\]+$mi_log_prompt.*1002\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt.*1003\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
-    pass "Redirect log file contents"
+    pass "redirect log file contents"
 } else {
-    fail "Redirect log file contents"
+    fail "redirect log file contents"
 }
 
 mi_gdb_exit
diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 48487ce..668572c 100644
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -41,12 +41,12 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "Could not compile either $libsrc1 or $libsrc2"
+    untested "could not compile either $libsrc1 or $libsrc2"
     return -1
 }
 
 if { [gdb_compile_pthreads $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not compile  $srcdir/$subdir/$srcfile."
+    untested "could not compile  $srcdir/$subdir/$srcfile."
     return -1
 }
 
@@ -111,7 +111,7 @@ mi_gdb_test "-break-insert -p 2 -f pendfunc3" \
 mi_send_resuming_command "exec-continue" "continuing execution to thread condition"
 
 # Check if we stopped in thread 2 like we should.
-set testname "Run till MI pending breakpoint on pendfunc3 on thread 2"
+set testname "run till MI pending breakpoint on pendfunc3 on thread 2"
 gdb_expect {
     -re "\\*stopped,reason=\"breakpoint-hit\",disp=\"keep\",bkptno=\"4\",frame=\{addr=\"$hex\",func=\"pendfunc3\".*thread-id=\"2\".*" {
 	pass $testname
diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp
index 2227987..6ac8c3a 100644
--- a/gdb/testsuite/gdb.mi/mi-solib.exp
+++ b/gdb/testsuite/gdb.mi/mi-solib.exp
@@ -42,7 +42,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile_main} ${binfile} executable $bin_flags] != "" } {
-  untested "Could not compile $binfile_lib or $binfile."
+  untested "could not compile $binfile_lib or $binfile."
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
index 55c66a5..b0f6c31 100644
--- a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
+++ b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
@@ -40,7 +40,7 @@ proc do_test {sync_command} {
     mi_gdb_exit
 
     if {[mi_gdb_start "separate-mi-tty"] != 0} {
-	fail "Could not start gdb"
+	fail "could not start gdb"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index d3f75d8..ef94775 100644
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -396,7 +396,7 @@ proc_with_prefix test_setup { mode } {
     mi_gdb_load $binfile
 
     if { [mi_runto main] < 0 } {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
index a0dddf5..e0b7c41 100644
--- a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
+++ b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug}]} {
 # Inferior 1 stops at f1.
 
 if ![runto f1] then {
-    fail "Can't run to f1"
+    fail "can't run to f1"
     return 0
 }
 
@@ -42,7 +42,7 @@ delete_breakpoints
 # Inferior 2 stops at f2.
 
 if ![runto f2] then {
-    fail "Can't run to f2"
+    fail "can't run to f2"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.multi/multi-arch-exec.exp b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
index 88e5a62..7b6b818 100644
--- a/gdb/testsuite/gdb.multi/multi-arch-exec.exp
+++ b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
@@ -78,7 +78,7 @@ if { [prepare_for_testing ${testfile}.exp ${exec2} "${srcfile2}" \
 
 clean_restart ${exec1}
 if ![runto_main] then {
-    fail "Couldn't run to main"
+    fail "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index d46beec..fe7d0bf 100644
--- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -53,7 +53,7 @@ proc test_remove_inferiors { } {
 	     "load binary"
 
     if {![runto_main]} {
-	fail "Couldn't run to main."
+	fail "couldn't run to main."
 	return
     }
 
diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp b/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
index e811422..2267413 100644
--- a/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
+++ b/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
@@ -35,7 +35,7 @@ proc do_test {dispose} {
     gdb_test_no_output "set detach-on-fork off"
 
     if ![runto "child_function"] {
-	fail "Can't run to child_function"
+	fail "can't run to child_function"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp
index c8c156f..d6ec632 100644
--- a/gdb/testsuite/gdb.opt/solib-intra-step.exp
+++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-  untested "Could not compile $binfile_lib or $binfile."
+  untested "could not compile $binfile_lib or $binfile."
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.perf/backtrace.exp b/gdb/testsuite/gdb.perf/backtrace.exp
index eb94fb9..412e20c 100644
--- a/gdb/testsuite/gdb.perf/backtrace.exp
+++ b/gdb/testsuite/gdb.perf/backtrace.exp
@@ -52,7 +52,7 @@ PerfTest::assemble {
     clean_restart $binfile
 
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.perf/single-step.exp b/gdb/testsuite/gdb.perf/single-step.exp
index c2af8c9..1cc94ee 100644
--- a/gdb/testsuite/gdb.perf/single-step.exp
+++ b/gdb/testsuite/gdb.perf/single-step.exp
@@ -44,7 +44,7 @@ PerfTest::assemble {
     clean_restart $binfile
 
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.perf/skip-command.exp b/gdb/testsuite/gdb.perf/skip-command.exp
index d251725..755b3bf 100644
--- a/gdb/testsuite/gdb.perf/skip-command.exp
+++ b/gdb/testsuite/gdb.perf/skip-command.exp
@@ -94,7 +94,7 @@ proc run_skip_bench { kind text } {
     global SKIP_STEP_COUNT SKIP_DIRECTIVE_COUNT
 
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.perf/skip-prologue.exp b/gdb/testsuite/gdb.perf/skip-prologue.exp
index 2d942fc..2c4aad4 100644
--- a/gdb/testsuite/gdb.perf/skip-prologue.exp
+++ b/gdb/testsuite/gdb.perf/skip-prologue.exp
@@ -49,7 +49,7 @@ PerfTest::assemble {
     clean_restart $binfile
 
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.perf/solib.exp b/gdb/testsuite/gdb.perf/solib.exp
index 06a606c..e2b4baa 100644
--- a/gdb/testsuite/gdb.perf/solib.exp
+++ b/gdb/testsuite/gdb.perf/solib.exp
@@ -77,7 +77,7 @@ PerfTest::assemble {
     clean_restart $binfile
 
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.python/lib-types.exp b/gdb/testsuite/gdb.python/lib-types.exp
index 003b218..f095718 100644
--- a/gdb/testsuite/gdb.python/lib-types.exp
+++ b/gdb/testsuite/gdb.python/lib-types.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-as-string.exp b/gdb/testsuite/gdb.python/py-as-string.exp
index 4c7dd0d..2b48501 100644
--- a/gdb/testsuite/gdb.python/py-as-string.exp
+++ b/gdb/testsuite/gdb.python/py-as-string.exp
@@ -25,7 +25,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 }
 
 if ![runto_main] {
-    fail "Couldn't run to main."
+    fail "couldn't run to main."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-bad-printers.exp b/gdb/testsuite/gdb.python/py-bad-printers.exp
index 6f67798..1449820 100644
--- a/gdb/testsuite/gdb.python/py-bad-printers.exp
+++ b/gdb/testsuite/gdb.python/py-bad-printers.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main ] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index 2bd987e..45e4f07 100644
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -28,7 +28,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index d4a1a48..7503f5a 100644
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -38,7 +38,7 @@ proc test_bkpt_basic { } {
 	gdb_test "python print (gdb.breakpoints())" "\\(\\)"
 
 	if ![runto_main] then {
-	    fail "Cannot run to main."
+	    fail "cannot run to main."
 	    return 0
 	}
 
@@ -123,7 +123,7 @@ proc test_bkpt_deletion { } {
 	clean_restart ${testfile}
 
 	if ![runto_main] then {
-	    fail "Cannot run to main."
+	    fail "cannot run to main."
 	    return 0
 	}
 
@@ -161,7 +161,7 @@ proc test_bkpt_cond_and_cmds { } {
 	clean_restart ${testfile}
 
 	if ![runto_main] then {
-	    fail "Cannot run to main."
+	    fail "cannot run to main."
 	    return 0
 	}
 
@@ -213,7 +213,7 @@ proc test_bkpt_invisible { } {
 	clean_restart ${testfile}
 
 	if ![runto_main] then {
-	    fail "Cannot run to main."
+	    fail "cannot run to main."
 	    return 0
 	}
 
@@ -263,7 +263,7 @@ proc test_watchpoints { } {
 	}
 
 	if ![runto_main] then {
-	    fail "Cannot run to main."
+	    fail "cannot run to main."
 	    return 0
 	}
 
@@ -288,7 +288,7 @@ proc test_bkpt_internal { } {
 	    gdb_test_no_output "set can-use-hw-watchpoints 0" ""
 	}
 	if ![runto_main] then {
-	    fail "Cannot run to main."
+	    fail "cannot run to main."
 	    return 0
 	}
 	delete_breakpoints
@@ -318,7 +318,7 @@ proc test_bkpt_eval_funcs { } {
 	    gdb_test_no_output "set can-use-hw-watchpoints 0" ""
 	}
 	if ![runto_main] then {
-	    fail "Cannot run to main."
+	    fail "cannot run to main."
 	    return 0
 	}
 	delete_breakpoints
@@ -434,7 +434,7 @@ proc test_bkpt_temporary { } {
 	clean_restart ${testfile}
 
 	if ![runto_main] then {
-	    fail "Cannot run to main."
+	    fail "cannot run to main."
 	    return 0
 	}
 	delete_breakpoints
diff --git a/gdb/testsuite/gdb.python/py-cmd.exp b/gdb/testsuite/gdb.python/py-cmd.exp
index 4742c44..0665b8e 100644
--- a/gdb/testsuite/gdb.python/py-cmd.exp
+++ b/gdb/testsuite/gdb.python/py-cmd.exp
@@ -28,7 +28,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "Cannot run to main."
+    fail "cannot run to main."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index de8de07..547870a 100644
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -34,7 +34,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-evthreads.exp b/gdb/testsuite/gdb.python/py-evthreads.exp
index 93ff83d..c14b49a 100644
--- a/gdb/testsuite/gdb.python/py-evthreads.exp
+++ b/gdb/testsuite/gdb.python/py-evthreads.exp
@@ -46,7 +46,7 @@ gdb_breakpoint "thread2"
 gdb_breakpoint "thread3"
 
 gdb_run_cmd
-set test "Run to breakpoint 1"
+set test "run to breakpoint 1"
 gdb_test_multiple "" $test {
     -re "event type: stop\r\nstop reason: breakpoint\r\nfirst breakpoint number: 1\r\nbreakpoint number: 1\r\nthread num: 1\r\n.*$gdb_prompt $" {
         pass $test
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
index 81c7bbd..218baed 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
@@ -37,7 +37,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
     return -1
 }
 
@@ -64,7 +64,7 @@ clean_restart ${testfile}
 gdb_load_shlib ${lib_sl}
 
 if ![runto_main] then {
-    fail "Cannot run to main."
+    fail "cannot run to main."
     return 0
 }
 
@@ -115,7 +115,7 @@ gdb_test "source $python_file" "Python script imported.*" \
 set cond_line [gdb_get_line_number "Condition Break."]
 
 if ![runto_main] then {
-    fail "Cannot run to main."
+    fail "cannot run to main."
     return 0
 }
 
@@ -168,7 +168,7 @@ gdb_test "source $python_file" "Python script imported.*" \
 
 
 if ![runto_main] then {
-    fail "Cannot run to main."
+    fail "cannot run to main."
     return 0
 }
          
@@ -193,7 +193,7 @@ gdb_test "source $python_file" "Python script imported.*" \
          "import python scripts"
 
 if ![runto_main] then {
-    fail "Cannot run to main."
+    fail "cannot run to main."
     return 0
 }
 
@@ -220,7 +220,7 @@ gdb_test "source $python_file" "Python script imported.*" \
          "import python scripts"
 
 if ![runto_main] then {
-    fail "Cannot run to main."
+    fail "cannot run to main."
     return 0
 }
 
@@ -247,7 +247,7 @@ gdb_test "print increase(&i)" \
 #
 
 if ![runto "test_exec_exit"] then {
-    fail "Cannot run to test_exec_exit."
+    fail "cannot run to test_exec_exit."
     return 0
 }
 
@@ -260,7 +260,7 @@ gdb_test "continue" "SimpleFinishBreakpoint out of scope.*" "catch out of scope
 #
 
 if ![runto "test_exec_exit"] then {
-    fail "Cannot run to test_exec_exit."
+    fail "cannot run to test_exec_exit."
     return 0
 }     
 
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
index 0e8c492..8859d71 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "Cannot run to main."
+    fail "cannot run to main."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-frame-inline.exp b/gdb/testsuite/gdb.python/py-frame-inline.exp
index 1372ee0..98d349d 100644
--- a/gdb/testsuite/gdb.python/py-frame-inline.exp
+++ b/gdb/testsuite/gdb.python/py-frame-inline.exp
@@ -25,7 +25,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 if { [skip_python_tests] } { continue }
 
 if ![runto main] then {
-    fail "Can't run to function f"
+    fail "can't run to function f"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
index b5a4682..f2a9907 100644
--- a/gdb/testsuite/gdb.python/py-frame.exp
+++ b/gdb/testsuite/gdb.python/py-frame.exp
@@ -30,7 +30,7 @@ if { [skip_python_tests] } { continue }
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp
index 9b90d0b..ced81c6 100644
--- a/gdb/testsuite/gdb.python/py-inferior.exp
+++ b/gdb/testsuite/gdb.python/py-inferior.exp
@@ -44,7 +44,7 @@ gdb_test_multiple "show endian" "getting target endian" {
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-infthread.exp b/gdb/testsuite/gdb.python/py-infthread.exp
index 11f8d21..9292d28 100644
--- a/gdb/testsuite/gdb.python/py-infthread.exp
+++ b/gdb/testsuite/gdb.python/py-infthread.exp
@@ -33,7 +33,7 @@ if { [skip_python_tests] } { continue }
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp
index 138aa2d..6bbc510 100644
--- a/gdb/testsuite/gdb.python/py-mi.exp
+++ b/gdb/testsuite/gdb.python/py-mi.exp
@@ -321,7 +321,7 @@ mi_gdb_test "-var-update c" \
 gdb_exit
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" \
 	   executable {debug c++ additional_flags=-DMI}] != "" } {
-    untested "Couldn't compile ${srcfile} in c++ mode"
+    untested "couldn't compile ${srcfile} in c++ mode"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-objfile.exp b/gdb/testsuite/gdb.python/py-objfile.exp
index 62ca309..9f7ded9 100644
--- a/gdb/testsuite/gdb.python/py-objfile.exp
+++ b/gdb/testsuite/gdb.python/py-objfile.exp
@@ -28,7 +28,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
@@ -104,7 +104,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile}2 ${srcfile} {nodebug ldfla
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp
index a424931..5bddfa2 100644
--- a/gdb/testsuite/gdb.python/py-pp-maint.exp
+++ b/gdb/testsuite/gdb.python/py-pp-maint.exp
@@ -33,7 +33,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main ] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-pp-registration.exp b/gdb/testsuite/gdb.python/py-pp-registration.exp
index 95e43b7..2a8796c 100644
--- a/gdb/testsuite/gdb.python/py-pp-registration.exp
+++ b/gdb/testsuite/gdb.python/py-pp-registration.exp
@@ -31,7 +31,7 @@ set remote_python_file [gdb_remote_download host \
 			    ${srcdir}/${subdir}/${testfile}.py]
 
 if ![runto_main ] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp
index 91b9b0d..86491e4 100644
--- a/gdb/testsuite/gdb.python/py-prettyprint.exp
+++ b/gdb/testsuite/gdb.python/py-prettyprint.exp
@@ -30,7 +30,7 @@ if { [skip_python_tests] } { continue }
 proc run_lang_tests {exefile lang} {
     global srcdir subdir srcfile testfile hex
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "Couldn't compile ${srcfile} in $lang mode"
+	untested "couldn't compile ${srcfile} in $lang mode"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.python/py-recurse-unwind.exp b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
index 97c69f7..d611c90 100644
--- a/gdb/testsuite/gdb.python/py-recurse-unwind.exp
+++ b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
@@ -41,7 +41,7 @@ gdb_test "source ${pyfile}" "Python script imported" \
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp
index 4a0c738..3e049b3 100644
--- a/gdb/testsuite/gdb.python/py-shared.exp
+++ b/gdb/testsuite/gdb.python/py-shared.exp
@@ -28,14 +28,14 @@ set libsrc   ${libfile}.c
 set library  [standard_output_file ${libfile}.sl]
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${libsrc} ${library} "debug"] != "" } {
-    untested "Could not compile shared library."
+    untested "could not compile shared library."
     return -1
 }
 
 set exec_opts [list debug shlib=${library}]
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
-    untested "Could not compile $binfile."
+    untested "could not compile $binfile."
     return -1
 }
 
@@ -49,7 +49,7 @@ if { [skip_python_tests] } { continue }
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
index 4cdb3b8..41c4a9e 100644
--- a/gdb/testsuite/gdb.python/py-symbol.exp
+++ b/gdb/testsuite/gdb.python/py-symbol.exp
@@ -50,7 +50,7 @@ gdb_test "python print (gdb.lookup_global_symbol('qq').needs_frame)" \
 
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
@@ -127,7 +127,7 @@ gdb_test "python print (t\[0\].symtab)" "${py_symbol_c}" "Get symtab"
 # C++ tests
 # Recompile binary.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "debug c++"] != "" } {
-    untested "Couldn't compile ${srcfile} in c++ mode"
+    untested "couldn't compile ${srcfile} in c++ mode"
     return -1
 }
 
@@ -138,7 +138,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}-cxx
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
@@ -167,7 +167,7 @@ gdb_test "python print (cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "T
 # Start with a fresh gdb.
 clean_restart ${testfile}
 if ![runto_main] then {
-    fail "Cannot run to main."
+    fail "cannot run to main."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp
index efb2cb9..95c83c9 100644
--- a/gdb/testsuite/gdb.python/py-symtab.exp
+++ b/gdb/testsuite/gdb.python/py-symtab.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-template.exp b/gdb/testsuite/gdb.python/py-template.exp
index ea50f49..28a5177 100644
--- a/gdb/testsuite/gdb.python/py-template.exp
+++ b/gdb/testsuite/gdb.python/py-template.exp
@@ -21,7 +21,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 	  {debug c++}] != "" } {
-    untested "Couldn't compile ${srcfile}"
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index 709c587..61c8c2f 100644
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -29,7 +29,7 @@ proc build_inferior {exefile lang} {
   global srcdir subdir srcfile testfile hex
 
   if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-      untested "Couldn't compile ${srcfile} in $lang mode"
+      untested "couldn't compile ${srcfile} in $lang mode"
       return -1
   }
 
diff --git a/gdb/testsuite/gdb.python/py-unwind-maint.exp b/gdb/testsuite/gdb.python/py-unwind-maint.exp
index 1253057..cf78236 100644
--- a/gdb/testsuite/gdb.python/py-unwind-maint.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-maint.exp
@@ -30,7 +30,7 @@ if { [skip_python_tests] } { continue }
 set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
 
 if ![runto_main ] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-unwind.exp b/gdb/testsuite/gdb.python/py-unwind.exp
index e31a472..80ee680 100644
--- a/gdb/testsuite/gdb.python/py-unwind.exp
+++ b/gdb/testsuite/gdb.python/py-unwind.exp
@@ -33,7 +33,7 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { continue }
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index 39b0385..5395f8c 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -39,7 +39,7 @@ proc build_inferior {exefile lang} {
 
   if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object "debug $lang"] != ""
        || [gdb_compile "${objfile}" "${exefile}" executable "debug $lang"] != "" } {
-      untested "Couldn't compile ${srcfile} in $lang mode"
+      untested "couldn't compile ${srcfile} in $lang mode"
       return -1
   }
   return 0
@@ -528,7 +528,7 @@ test_value_hash
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 4072fa3..2ff1f14 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -203,7 +203,7 @@ clean_restart ${testfile}
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
@@ -324,7 +324,7 @@ gdb_test_multiple "set prompt blah " "set blah in GDB" {
 
 gdb_test_multiple "python gdb.prompt_hook = None" "Delete hook" {
     -re "\[\r\n\]$newprompt2 $" {
-	pass "Delete old hook"
+	pass "delete old hook"
     }
 }
 
@@ -391,7 +391,7 @@ clean_restart ${testfile}
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
@@ -447,7 +447,7 @@ clean_restart ${testfile}
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
index 1dff8e1..795a313 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
@@ -30,7 +30,7 @@ if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.reverse/insn-reverse.exp b/gdb/testsuite/gdb.reverse/insn-reverse.exp
index f52b40c..a252959 100644
--- a/gdb/testsuite/gdb.reverse/insn-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/insn-reverse.exp
@@ -119,7 +119,7 @@ proc test { func } {
 set n_testcases [get_integer_valueof "n_testcases" 0]
 
 if { ${n_testcases} == 0 } {
-    untested "No test"
+    untested "no test"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
index e06eb7e..e0cfcf7 100644
--- a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
+++ b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
@@ -34,7 +34,7 @@ if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 6ce26eb..3d1f4cb 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -40,12 +40,12 @@ if [get_compiler_info] {
 # Compile the first without debug info so that
 # stepping and reverse stepping doesn't end up inside them.
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib1src} ${library1} ""] != "" } {
-    untested "Could not compile shared library1."
+    untested "could not compile shared library1."
     return -1
 }
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib2src} ${library2} "debug"] != "" } {
-    untested "Could not compile shared library2."
+    untested "could not compile shared library2."
     return -1
 }
 
@@ -58,7 +58,7 @@ set exec_opts [list debug shlib=${library1} shlib=${library2}]
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable \
 		     [concat $exec_opts additional_flags=-Wl,-z,norelro]] != ""
      && [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
-    untested "Could not compile $binfile."
+    untested "could not compile $binfile."
     return -1
 }
      
diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp
index a370e94..1389952 100644
--- a/gdb/testsuite/gdb.reverse/solib-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp
@@ -38,19 +38,19 @@ if [get_compiler_info] {
 # Compile the first without debug info so that
 # stepping and reverse stepping doesn't end up inside them.
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib1src} ${library1} ""] != "" } {
-    untested "Could not compile shared library1."
+    untested "could not compile shared library1."
     return -1
 }
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib2src} ${library2} "debug"] != "" } {
-    untested "Could not compile shared library2."
+    untested "could not compile shared library2."
     return -1
 }
 
 set exec_opts [list debug shlib=${library1} shlib=${library2}]
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
-    untested "Could not compile $binfile."
+    untested "could not compile $binfile."
     return -1
 }
      
diff --git a/gdb/testsuite/gdb.stabs/gdb11479.exp b/gdb/testsuite/gdb.stabs/gdb11479.exp
index b5c5772..ab67280 100644
--- a/gdb/testsuite/gdb.stabs/gdb11479.exp
+++ b/gdb/testsuite/gdb.stabs/gdb11479.exp
@@ -22,7 +22,7 @@ set testfile "gdb11479"
 
 proc do_test {version} {
     if ![runto_main] {
-        fail "Can't run to main $version"
+        fail "can't run to main $version"
         return -1
     }
     gdb_test "rb test" "" "Set breakpoints $version"
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index 2a8ef3e..699b26b 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -305,7 +305,7 @@ gdb_expect 60 {
 	pass "weirdx.o read without error"
     }
     -re ".*$gdb_prompt $" {
-	fail "Errors reading weirdx.o"
+	fail "errors reading weirdx.o"
     }
     timeout {
 	perror "couldn't load $binfile into $GDB (timed out)."
diff --git a/gdb/testsuite/gdb.threads/fork-child-threads.exp b/gdb/testsuite/gdb.threads/fork-child-threads.exp
index fcceb02..8a7c596 100644
--- a/gdb/testsuite/gdb.threads/fork-child-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-child-threads.exp
@@ -27,7 +27,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
index 0d621c3..81eeda3 100644
--- a/gdb/testsuite/gdb.threads/fork-plus-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
@@ -46,7 +46,7 @@ proc do_test { detach_on_fork } {
     set GDBFLAGS $saved_gdbflags
 
     if ![runto_main] then {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
index 96187ec..ff67294 100644
--- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp
+++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
@@ -28,7 +28,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
@@ -86,7 +86,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 gdb_load ${binfile}
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
index 364c5d4..0c1f042 100644
--- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
+++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
@@ -39,7 +39,7 @@ proc probe_displaced_stepping_support {} {
 
 	gdb_test_no_output "set displaced on"
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
@@ -79,7 +79,7 @@ proc do_test { cond_bp_target detach_on_fork displaced } {
     set GDBFLAGS $saved_gdbflags
 
     if ![runto_main] then {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
index 67c2c8e..1dd73b9 100644
--- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
+++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
@@ -26,7 +26,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
@@ -50,7 +50,7 @@ proc get_dummy_frame_number { } {
 clean_restart ${binfile}
 
 if { ![runto_main] } {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
index 556902c..65ed279 100644
--- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
+++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
@@ -27,14 +27,14 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
 clean_restart ${binfile}
 
 if { ![runto_main] } {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp
index 9f717c7..400fb16 100644
--- a/gdb/testsuite/gdb.threads/linux-dp.exp
+++ b/gdb/testsuite/gdb.threads/linux-dp.exp
@@ -98,7 +98,7 @@ for {set i 0} {$i < 5} {incr i} {
 	    # It would be nice if we could catch the message that GDB prints
 	    # when it first notices that the thread library doesn't support
 	    # debugging, or if we could explicitly ask GDB somehow.
-	    unsupported "This GDB does not support threads on this system."
+	    unsupported "this GDB does not support threads on this system."
 	    return -1
 	}
 	-re "$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
index a60f98b..b97f71a 100644
--- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
+++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
@@ -35,7 +35,7 @@ clean_restart ${binfile}
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
index 56442b1..2913a63 100644
--- a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
+++ b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" \
 }
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/non-ldr-exit.exp b/gdb/testsuite/gdb.threads/non-ldr-exit.exp
index 7276b6c..39b9804 100644
--- a/gdb/testsuite/gdb.threads/non-ldr-exit.exp
+++ b/gdb/testsuite/gdb.threads/non-ldr-exit.exp
@@ -23,7 +23,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}
 }
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/pending-step.exp b/gdb/testsuite/gdb.threads/pending-step.exp
index d3c7d57..b8b6443 100644
--- a/gdb/testsuite/gdb.threads/pending-step.exp
+++ b/gdb/testsuite/gdb.threads/pending-step.exp
@@ -57,7 +57,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp
index 1cbec5f..3ead23c 100644
--- a/gdb/testsuite/gdb.threads/print-threads.exp
+++ b/gdb/testsuite/gdb.threads/print-threads.exp
@@ -50,16 +50,16 @@ proc test_all_threads { name kill } {
     gdb_test_multiple "continue" "all threads ran once" {
 	-re "Breakpoint \[0-9\]+, thread_function \\(arg=.*\\) at .*print-threads.c:\[0-9\]+.*$gdb_prompt" {
 	    set i [expr $i + 1]
-	    pass "Hit thread_function breakpoint, $i ($name)"
+	    pass "hit thread_function breakpoint, $i ($name)"
 	    send_gdb "continue\n"
 	    exp_continue
 	}
 	-re "Breakpoint \[0-9\]+, .* kill \\(.*\\) .*$gdb_prompt" {
 	    set j [expr $j + 1]
 	    if { $kill == 1 } {
-		pass "Hit kill breakpoint, $j ($name)"
+		pass "hit kill breakpoint, $j ($name)"
 	    } else {
-		fail "Hit kill breakpoint, $j ($name) (unexpected)"
+		fail "hit kill breakpoint, $j ($name) (unexpected)"
 	    }
 	    send_gdb "continue\n"
 	    exp_continue
@@ -76,7 +76,7 @@ proc test_all_threads { name kill } {
 	    if { $kill == 1 } {
 		kfail "gdb/1265" "Running threads ($name) (zombie thread)"
 	    } else {
-		fail "Running threads ($name) (unknown output)"
+		fail "running threads ($name) (unknown output)"
 	    }
 	}
     }
diff --git a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
index 52dc8dd..84e9cbc 100644
--- a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
+++ b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
@@ -193,7 +193,7 @@ proc test_detach {multi_process cmd} {
 	clean_restart ${binfile}
 
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
@@ -218,7 +218,7 @@ proc test_detach_watch {multi_process cmd} {
 	clean_restart ${binfile}
 
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
@@ -254,7 +254,7 @@ proc test_detach_killed_outside {multi_process cmd} {
 	clean_restart ${binfile}
 
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
index 2db31af..efec517 100644
--- a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
+++ b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
@@ -46,7 +46,7 @@ proc do_test { non_stop cond_bp_target } {
     set GDBFLAGS $saved_gdbflags
 
     if ![runto_main] then {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 1fb27cf..2d26505 100644
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -189,13 +189,13 @@ proc check_control_c {} {
 
     # Verify that all threads are running.
     if [all_threads_running] then {
-	pass "All threads running after startup"
+	pass "all threads running after startup"
     }
 
     # Send a continue followed by ^C to the process to stop it.
     gdb_test_multiple "continue" "continue with all threads running" {
 	-re "Continuing." {
-	    pass "Continue with all threads running"
+	    pass "continue with all threads running"
 	}
     }
     after 2000
@@ -217,7 +217,7 @@ proc check_control_c {} {
 
     # Verify that all threads can be run again after a ^C stop.
     if [all_threads_running] then {
-	pass "All threads running after continuing from ^C stop"
+	pass "all threads running after continuing from ^C stop"
     }
     return 0
 }
diff --git a/gdb/testsuite/gdb.threads/queue-signal.exp b/gdb/testsuite/gdb.threads/queue-signal.exp
index 187e049..3813b66 100644
--- a/gdb/testsuite/gdb.threads/queue-signal.exp
+++ b/gdb/testsuite/gdb.threads/queue-signal.exp
@@ -23,7 +23,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 clean_restart ${binfile}
 
 if ![runto_main] {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/reconnect-signal.exp b/gdb/testsuite/gdb.threads/reconnect-signal.exp
index 1fe0f59..1d134e2 100644
--- a/gdb/testsuite/gdb.threads/reconnect-signal.exp
+++ b/gdb/testsuite/gdb.threads/reconnect-signal.exp
@@ -27,14 +27,14 @@ if { [gdb_compile_pthreads \
 	  "${srcdir}/${subdir}/${srcfile}" \
 	  "${binfile}" \
 	  executable {debug}] != "" } {
-    untested "Couldn't compile test program."
+    untested "couldn't compile test program."
     return -1
 }
 
 clean_restart $executable
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
index 97dc420..d3b1670 100644
--- a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
+++ b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
@@ -41,7 +41,7 @@ proc test { step_over } {
 	clean_restart ${binfile}
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
index 43fe779..581849d 100644
--- a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
+++ b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
@@ -38,7 +38,7 @@ proc test { schedlock } {
 	clean_restart ${binfile}
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
index b7ce8ef..b8e03cb 100644
--- a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
+++ b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
@@ -35,7 +35,7 @@ proc test { command } {
 	clean_restart ${binfile}
 
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.threads/signal-sigtrap.exp b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
index c2789eb..6a3af56 100644
--- a/gdb/testsuite/gdb.threads/signal-sigtrap.exp
+++ b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
@@ -37,7 +37,7 @@ proc test { sigtrap_thread } {
 	clean_restart ${binfile}
 
 	if ![runto "thread_function"] then {
-	    fail "Can't run to thread_function"
+	    fail "can't run to thread_function"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.threads/sigthread.exp b/gdb/testsuite/gdb.threads/sigthread.exp
index 71ef75a..c746b39 100644
--- a/gdb/testsuite/gdb.threads/sigthread.exp
+++ b/gdb/testsuite/gdb.threads/sigthread.exp
@@ -24,7 +24,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp
index 16fcb68..6bd3c20 100644
--- a/gdb/testsuite/gdb.threads/staticthreads.exp
+++ b/gdb/testsuite/gdb.threads/staticthreads.exp
@@ -42,7 +42,7 @@ gdb_test_no_output "set print sevenbit-strings"
 
 runto_main
 gdb_test "break sem_post"
-set test "Continue to main's call of sem_post"
+set test "continue to main's call of sem_post"
 gdb_test_multiple "continue" "$test" {
     -re "Breakpoint .*, .*sem_post .*$gdb_prompt " {
 	pass "$test"
@@ -65,7 +65,7 @@ if [istarget hppa*-*-*] {
 
 rerun_to_main
 gdb_test "handle $sig nostop noprint pass"
-set test "Handle $sig helps"
+set test "handle $sig helps"
 gdb_test "continue" " .*sem_post .*" "handle $sig helps"
 
 
diff --git a/gdb/testsuite/gdb.threads/stepi-random-signal.exp b/gdb/testsuite/gdb.threads/stepi-random-signal.exp
index 2b64d5f..5e558dd 100644
--- a/gdb/testsuite/gdb.threads/stepi-random-signal.exp
+++ b/gdb/testsuite/gdb.threads/stepi-random-signal.exp
@@ -20,7 +20,7 @@ if { [gdb_compile_pthreads \
 	  "${srcdir}/${subdir}/${srcfile}" \
 	  "${binfile}" \
 	  executable {debug}] != "" } {
-    untested "Couldn't compile test program."
+    untested "couldn't compile test program."
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
index 1327c7e..efa68d1 100644
--- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
+++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
@@ -27,14 +27,14 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
-    unsupported "This target can not call functions"
+    unsupported "this target can not call functions"
     continue
 }
 
 clean_restart ${binfile}
 
 if { ![runto_main] } {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
index 52c6fa4..e4ad3ea 100644
--- a/gdb/testsuite/gdb.threads/thread_check.exp
+++ b/gdb/testsuite/gdb.threads/thread_check.exp
@@ -42,7 +42,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
       return 1
 }
 
diff --git a/gdb/testsuite/gdb.threads/thread_events.exp b/gdb/testsuite/gdb.threads/thread_events.exp
index c80d441..900cd29 100644
--- a/gdb/testsuite/gdb.threads/thread_events.exp
+++ b/gdb/testsuite/gdb.threads/thread_events.exp
@@ -112,7 +112,7 @@ proc test_thread_messages {enabled} {
   # The initial thread may log a 'New Thread' message, but we don't
   # check for it.
   if ![runto_main] then {
-     fail "Can't run to main $enabled_string"
+     fail "can't run to main $enabled_string"
      return 1
   }
 
diff --git a/gdb/testsuite/gdb.threads/tid-reuse.exp b/gdb/testsuite/gdb.threads/tid-reuse.exp
index 4a2c103..e2885ec 100644
--- a/gdb/testsuite/gdb.threads/tid-reuse.exp
+++ b/gdb/testsuite/gdb.threads/tid-reuse.exp
@@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile { debug pthreads
 clean_restart ${binfile}
 
 if ![runto main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/tls-nodebug.exp b/gdb/testsuite/gdb.threads/tls-nodebug.exp
index 3b20697..89ec6e6 100644
--- a/gdb/testsuite/gdb.threads/tls-nodebug.exp
+++ b/gdb/testsuite/gdb.threads/tls-nodebug.exp
@@ -28,7 +28,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 
 clean_restart ${binfile}
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/tls-shared.exp b/gdb/testsuite/gdb.threads/tls-shared.exp
index 804e28a..2bbc4a5 100644
--- a/gdb/testsuite/gdb.threads/tls-shared.exp
+++ b/gdb/testsuite/gdb.threads/tls-shared.exp
@@ -39,7 +39,7 @@ clean_restart ${binfile}
 gdb_load_shlib ${binfile_lib}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/tls-so_extern.exp b/gdb/testsuite/gdb.threads/tls-so_extern.exp
index dde7bcd..2142d15 100644
--- a/gdb/testsuite/gdb.threads/tls-so_extern.exp
+++ b/gdb/testsuite/gdb.threads/tls-so_extern.exp
@@ -38,7 +38,7 @@ clean_restart ${binfile}
 gdb_load_shlib ${binfile_lib}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index 5c07844..f6e988c 100644
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -157,7 +157,7 @@ gdb_test "print a_thread_local" \
     "Cannot read .a_thread_local. without registers"
 
 if ![runto_main] then {
-   fail "Can't run to main"
+   fail "can't run to main"
    return 0
 }
 
@@ -263,7 +263,7 @@ foreach i [array names spin_threads] {
 }
 
 if {$thrs_in_spin == 0} {
-  fail "No thread backtrace reported spin (vsyscall kernel problem?)"
+  fail "no thread backtrace reported spin (vsyscall kernel problem?)"
 }
 
 gdb_test "continue" ".*Breakpoint 4.*before exit.*" "threads exited"
@@ -271,10 +271,10 @@ gdb_test "continue" ".*Breakpoint 4.*before exit.*" "threads exited"
 send_gdb "info thread\n" 
 gdb_expect {
     -re ".* 1 *Thread.*2 *Thread.*$gdb_prompt $" {
-        fail "Too many threads left at end"
+        fail "too many threads left at end"
     }
     -re ".*\\\* 1 *Thread.*main.*$gdb_prompt $" {
-        pass "Expect only base thread at end"
+        pass "expect only base thread at end"
     }
     -re ".*No stack.*$gdb_prompt $" {
         fail "runaway at end"
diff --git a/gdb/testsuite/gdb.threads/wp-replication.exp b/gdb/testsuite/gdb.threads/wp-replication.exp
index 12ec87a..88a2e06 100644
--- a/gdb/testsuite/gdb.threads/wp-replication.exp
+++ b/gdb/testsuite/gdb.threads/wp-replication.exp
@@ -43,7 +43,7 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
 # Run to `main' where we begin our tests.
 if ![runto_main] then {
-    fail "Failed to run to main"
+    fail "failed to run to main"
     return 0
 }
 
@@ -86,7 +86,7 @@ gdb_test_no_output "set breakpoint always-inserted off"
 # (through board settings) that it did not support them in the first place.
 # Just exit.
 if { $hwatch_count == 0} {
-  fail "No hardware watchpoints available"
+  fail "no hardware watchpoints available"
   return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/actions-changed.exp b/gdb/testsuite/gdb.trace/actions-changed.exp
index 296277a..3b8e6ba 100644
--- a/gdb/testsuite/gdb.trace/actions-changed.exp
+++ b/gdb/testsuite/gdb.trace/actions-changed.exp
@@ -160,12 +160,12 @@ proc test_actions_changed { } {
 clean_restart $testfile
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if ![gdb_target_supports_trace] {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index c4d1605..f02890a 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -39,7 +39,7 @@ gdb_file_cmd $binfile
 
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
 if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
+    fail "could not find gdb_recursion_test function"
     return
 }
 
@@ -243,7 +243,7 @@ gdb_load $binfile
 gdb_breakpoint "main"
 gdb_run_cmd
 if {[gdb_test "" "Breakpoint .*"] != 0} {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index 881a798..44a7657 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -28,12 +28,12 @@ if [prepare_for_testing $expfile $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 
 }
@@ -58,7 +58,7 @@ set arg6 6
 
 set baseline [gdb_find_recursion_test_baseline $srcfile]
 if { $baseline == -1 } {
-    fail "Could not find gdb_recursion_test function"
+    fail "could not find gdb_recursion_test function"
     return
 }
 
diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index 9fef3f0..118060a 100644
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -39,7 +39,7 @@ set additional_flags [list debug shlib=$lib_sl1 shlib_load [gdb_target_symbol_pr
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $additional_flags] != ""} {
-    untested "Could not compile either $libsrc1 or $srcdir/$subdir/$srcfile."
+    untested "could not compile either $libsrc1 or $srcdir/$subdir/$srcfile."
     return -1
 }
 
@@ -49,12 +49,12 @@ gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
@@ -70,7 +70,7 @@ proc tracepoint_change_loc_1 { trace_type } {
 
 	clean_restart ${testfile}
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 	gdb_test_no_output "delete break 1"
@@ -298,7 +298,7 @@ proc tracepoint_install_in_trace_disabled { trace_type } {
 
 	clean_restart ${testfile}
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index f225429..c2f2b5c 100644
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -777,7 +777,7 @@ proc gdb_trace_collection_test {} {
 runto_main
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index 652b6c1..bffd575 100644
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -38,7 +38,7 @@ gdb_file_cmd $binfile
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline [gdb_find_recursion_test_baseline $srcfile]
 if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
+    fail "could not find gdb_recursion_test function"
     return
 }
 set testline1 [expr $baseline + 4]
diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
index 240284b..5c45021 100644
--- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp
+++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
@@ -54,7 +54,7 @@ proc disconnected_tracing {  } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
@@ -117,7 +117,7 @@ proc disconnected_tfind {  } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
index e8ed517..ced0095 100644
--- a/gdb/testsuite/gdb.trace/entry-values.exp
+++ b/gdb/testsuite/gdb.trace/entry-values.exp
@@ -80,7 +80,7 @@ gdb_test_multiple $test $test {
 }
 
 if { [string equal $returned_from_foo ""] } {
-    fail "Find the call or branch instruction offset in bar"
+    fail "find the call or branch instruction offset in bar"
     # The following test makes no sense if the offset is unknown.  We need
     # to update the pattern above to match call or branch instruction for
     # the target architecture.
@@ -175,7 +175,7 @@ if  {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \
 clean_restart ${testfile}
 
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
@@ -210,7 +210,7 @@ clean_restart $binfile
 load_lib "trace-support.exp"
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
index 0b12c8d..b48d969 100644
--- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
+++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
@@ -30,14 +30,14 @@ set options [list debug [gdb_target_symbol_prefix_flags] \
 
 # Check that the target supports trace.
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "Couldn't compile test program"
+    untested "couldn't compile test program"
     return -1
 }
 
 clean_restart ${testfile}
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -53,19 +53,19 @@ set remote_libipa [gdb_load_shlib $libipa]
 lappend options shlib=$libipa
 
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "Couldn't compile test program with in-process agent library"
+    untested "couldn't compile test program with in-process agent library"
     return -1
 }
 
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
-    untested "Could not find IPA lib loaded"
+    untested "could not find IPA lib loaded"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index e90485c..8b720d4 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -28,7 +28,7 @@ if [prepare_for_testing $expfile $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -52,7 +52,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "Can't run to main for ftrace tests"
+    fail "can't run to main for ftrace tests"
     return 0
 }
 
@@ -177,7 +177,7 @@ proc test_fast_tracepoints {} {
 gdb_reinitialize_dir $srcdir/$subdir
 
 if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
-    untested "Could not find IPA lib loaded"
+    untested "could not find IPA lib loaded"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 7ba212a..1561ead 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -102,12 +102,12 @@ gdb_trace_setactions "collect on tracepoint 1" "1" \
 	"collect gdb_struct1_test" "^$"
 gdb_run_cmd
 if {[gdb_test "" "Breakpoint ${decimal}, main.*"] != 0} {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
index 567954a..3e2aff7 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
@@ -22,12 +22,12 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug}] } {
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if ![gdb_target_supports_trace] {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
index a49cd17..3236d7c 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
@@ -22,12 +22,12 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug}] } {
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if ![gdb_target_supports_trace] {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
index ce02389..3d57623 100644
--- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
@@ -110,12 +110,12 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 clean_restart $executable
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if ![gdb_target_supports_trace] {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
index a0e49af..43b34c9 100644
--- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
@@ -32,13 +32,13 @@ set lib_opts [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "Could not compile either $libsrc1 or $libsrc2"
+    untested "could not compile either $libsrc1 or $libsrc2"
     return -1
 }
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "Failed to compile $srcfile"
+    untested "failed to compile $srcfile"
     return -1
 }
 
@@ -66,7 +66,7 @@ proc test_reconnect { } {
 	gdb_load_shlib $lib_sl1
 	gdb_load_shlib $lib_sl2
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 	# Create tracepoints on marker and main, and leave them in the
@@ -247,12 +247,12 @@ gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if ![gdb_target_supports_trace] {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
index 1a4783d..cf9a448 100644
--- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
@@ -65,12 +65,12 @@ proc test_create_delete_modify_tsv { } {
 	clean_restart $testfile
 
 	if ![runto_main] {
-	    fail "Can't run to main to check for trace support"
+	    fail "can't run to main to check for trace support"
 	    return -1
 	}
 
 	if ![gdb_target_supports_trace] {
-	    unsupported "Current target does not support trace"
+	    unsupported "current target does not support trace"
 	    return -1
 	}
 	gdb_exit
@@ -147,7 +147,7 @@ proc test_upload_tsv { } {
 
 	clean_restart $testfile
 	if ![runto_main] then {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return 0
 	}
 
@@ -233,12 +233,12 @@ proc test_upload_tsv { } {
 clean_restart $testfile
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if ![gdb_target_supports_trace] {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/no-attach-trace.exp b/gdb/testsuite/gdb.trace/no-attach-trace.exp
index 7ee8a4f..06d86e6 100644
--- a/gdb/testsuite/gdb.trace/no-attach-trace.exp
+++ b/gdb/testsuite/gdb.trace/no-attach-trace.exp
@@ -31,7 +31,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 clean_restart $testfile
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 }
 
@@ -43,7 +43,7 @@ gdb_test "tstart" "Target returns error code.*\."
 
 with_test_prefix "after tstart" {
     if ![runto_main] {
-	fail "Can't run to main, target may have died unexpectedly"
+	fail "can't run to main, target may have died unexpectedly"
 	return -1
     }
 }
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index 93bfc79..a790063 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -34,7 +34,7 @@ runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 
 }
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index c5e2e2b..d8d68ec 100644
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -33,7 +33,7 @@ runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 
 }
@@ -49,7 +49,7 @@ if { ![gdb_target_supports_trace] } then {
 set baseline [gdb_find_recursion_test_baseline $srcfile]
 
 if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
+    fail "could not find gdb_recursion_test function"
     return
 }
 
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index 2ec858a..df7e39d 100644
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -37,7 +37,7 @@ gdb_file_cmd $binfile
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
 if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
+    fail "could not find gdb_recursion_test function"
     return
 }
 
diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
index f7905fb..28ffc28 100644
--- a/gdb/testsuite/gdb.trace/pending.exp
+++ b/gdb/testsuite/gdb.trace/pending.exp
@@ -31,13 +31,13 @@ set lib_opts [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "Could not compile either $libsrc1 or $libsrc2"
+    untested "could not compile either $libsrc1 or $libsrc2"
     return -1
 }
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "Failed to compile $srcfile"
+    untested "failed to compile $srcfile"
     return -1
 }
 
@@ -47,12 +47,12 @@ gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
 if ![gdb_target_supports_trace] {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
@@ -183,7 +183,7 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -252,7 +252,7 @@ proc pending_tracepoint_installed_during_trace { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -326,7 +326,7 @@ proc pending_tracepoint_disconnect_during_trace { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -374,7 +374,7 @@ proc pending_tracepoint_disconnect_after_resolved { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -427,7 +427,7 @@ proc pending_tracepoint_with_action_resolved { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -508,7 +508,7 @@ gdb_load_shlib $libipa
 lappend exec_opts "shlib=$libipa"
 
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "Failed to compile $srcfile"
+    untested "failed to compile $srcfile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/pr16508.exp b/gdb/testsuite/gdb.trace/pr16508.exp
index 7e6cbf5..8e963c3 100644
--- a/gdb/testsuite/gdb.trace/pr16508.exp
+++ b/gdb/testsuite/gdb.trace/pr16508.exp
@@ -23,7 +23,7 @@ if [prepare_for_testing "failed to prepare for trace tests" \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp
index 7bc80b8..444b453 100644
--- a/gdb/testsuite/gdb.trace/qtro.exp
+++ b/gdb/testsuite/gdb.trace/qtro.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 clean_restart $testfile
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -40,7 +40,7 @@ if ![gdb_is_target_remote] {
 }
 
 if ![gdb_target_supports_trace] {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp
index ba8c3d2..81da27d 100644
--- a/gdb/testsuite/gdb.trace/range-stepping.exp
+++ b/gdb/testsuite/gdb.trace/range-stepping.exp
@@ -25,7 +25,7 @@ if [prepare_for_testing $testfile.exp $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -78,13 +78,13 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "Can't run to main for ftrace tests"
+    fail "can't run to main for ftrace tests"
     return 0
 }
 
 gdb_reinitialize_dir $srcdir/$subdir
 if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
-    untested "Could not find IPA lib loaded"
+    untested "could not find IPA lib loaded"
 } else {
     range_stepping_with_tracepoint "ftrace"
 }
diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp
index 35402cb..b82967d 100644
--- a/gdb/testsuite/gdb.trace/read-memory.exp
+++ b/gdb/testsuite/gdb.trace/read-memory.exp
@@ -23,7 +23,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -40,7 +40,7 @@ proc set_tracepoint_and_collect { } {
     # Start with a fresh gdb.
     clean_restart ${testfile}
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
     gdb_test "break end" "Breakpoint \[0-9\] at .*"
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 7d89627..f487ec6 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -34,7 +34,7 @@ runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 
 }
@@ -64,7 +64,7 @@ set arg6 6
 
 set gdb_recursion_test_baseline [gdb_find_recursion_test_baseline $srcfile]
 if { $gdb_recursion_test_baseline == -1 } {
-    fail "Could not find gdb_recursion_test function"
+    fail "could not find gdb_recursion_test function"
     return
 }
 
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index a70ad54..dfbbdca 100644
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -38,7 +38,7 @@ gdb_file_cmd $binfile
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
 if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
+    fail "could not find gdb_recursion_test function"
     return
 }
 
diff --git a/gdb/testsuite/gdb.trace/signal.exp b/gdb/testsuite/gdb.trace/signal.exp
index 48e495e..f36133a 100644
--- a/gdb/testsuite/gdb.trace/signal.exp
+++ b/gdb/testsuite/gdb.trace/signal.exp
@@ -36,7 +36,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -63,7 +63,7 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
 # Start with a fresh gdb.
 clean_restart ${testfile}
 if ![runto_main] {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/stap-trace.exp b/gdb/testsuite/gdb.trace/stap-trace.exp
index 1c002c1..4cb05d5 100644
--- a/gdb/testsuite/gdb.trace/stap-trace.exp
+++ b/gdb/testsuite/gdb.trace/stap-trace.exp
@@ -42,7 +42,7 @@ proc compile_stap_bin {exec_name {arg ""}} {
     if { [gdb_compile "$srcdir/$subdir/$srcfile" \
 	      [standard_output_file $exec_name] \
 	      executable [concat $arg debug nowarnings]] != "" } {
-	untested "Could not compile ${srcfile}"
+	untested "could not compile ${srcfile}"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index 73bc6e7..d6ce4ce 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -26,7 +26,7 @@ if [prepare_for_testing $expfile $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -45,7 +45,7 @@ proc test_tstart_tstop_tstart { } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
@@ -72,7 +72,7 @@ proc test_tstart_tstart { } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
@@ -99,7 +99,7 @@ proc test_buffer_full_tstart { } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index 6394926..6b11fcf 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -51,7 +51,7 @@ proc strace_remove_socket { action } {
     clean_restart $executable
     gdb_load_shlib $libipa
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -136,7 +136,7 @@ proc strace_info_marker { } {
 	clean_restart $executable
 	gdb_load_shlib $libipa
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
@@ -173,7 +173,7 @@ proc strace_probe_marker { } {
 	clean_restart $executable
 	gdb_load_shlib $libipa
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
@@ -213,7 +213,7 @@ proc strace_trace_on_same_addr { type } {
 	clean_restart $executable
 	gdb_load_shlib $libipa
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
@@ -317,7 +317,7 @@ proc strace_trace_on_diff_addr { } {
 	clean_restart $executable
 	gdb_load_shlib $libipa
 	if ![runto_main] {
-	    fail "Can't run to main"
+	    fail "can't run to main"
 	    return -1
 	}
 
@@ -377,7 +377,7 @@ if { [istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"] } {
 clean_restart $executable
 gdb_load_shlib $libipa
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 if { ![gdb_target_supports_trace] } then {
@@ -386,7 +386,7 @@ if { ![gdb_target_supports_trace] } then {
     # file can be removed.  Note that GDB simply kill inferior doesn't remove
     # the socket file.
     gdb_test "detach" "Detaching .*, process .*"
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp
index 183b4c3..9f89d3d 100644
--- a/gdb/testsuite/gdb.trace/tfile.exp
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -51,7 +51,7 @@ remote_file target delete $tfile_basic
 remote_file target delete $tfile_error
 
 if { ![generate_tracefile $binfile] } {
-    unsupported "Unable to generate trace file"
+    unsupported "unable to generate trace file"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index d78547d..cfd7db3 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -63,7 +63,7 @@ runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 
 }
@@ -75,7 +75,7 @@ if { ![gdb_target_supports_trace] } then {
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
 if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
+    fail "could not find gdb_recursion_test function"
     return
 }
 
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index a90d02d..b7b2ea1 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -28,7 +28,7 @@ if [prepare_for_testing $expfile $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -48,7 +48,7 @@ proc break_trace_same_addr_1 { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -83,7 +83,7 @@ proc break_trace_same_addr_2 { trace_type1 trace_type2 option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -122,7 +122,7 @@ proc break_trace_same_addr_3 { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -160,7 +160,7 @@ proc break_trace_same_addr_4 { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -204,7 +204,7 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -278,7 +278,7 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -363,13 +363,13 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "Can't run to main for ftrace tests"
+    fail "can't run to main for ftrace tests"
     return 0
 }
 
 gdb_reinitialize_dir $srcdir/$subdir
 if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
-    untested "Could not find IPA lib loaded"
+    untested "could not find IPA lib loaded"
 } else {
     foreach break_always_inserted { "on" "off" } {
 	break_trace_same_addr_1 "ftrace" ${break_always_inserted}
diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp
index e36dba4..0e93e51 100644
--- a/gdb/testsuite/gdb.trace/trace-condition.exp
+++ b/gdb/testsuite/gdb.trace/trace-condition.exp
@@ -28,7 +28,7 @@ if [prepare_for_testing $expfile $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -53,12 +53,12 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "Can't run to main for ftrace tests"
+    fail "can't run to main for ftrace tests"
     return 0
 }
 
 if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
-    untested "Could not find IPA lib loaded"
+    untested "could not find IPA lib loaded"
     return 1
 }
 
@@ -68,7 +68,7 @@ proc test_tracepoints { trace_command condition num_frames { kfail_proc 0 } } {
     clean_restart ${executable}
 
     if ![runto_main] {
-	fail "Can't run to main for ftrace tests"
+	fail "can't run to main for ftrace tests"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
index 0c35c92..43891fa 100644
--- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp
+++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
@@ -23,14 +23,14 @@ set options [list debug [gdb_target_symbol_prefix_flags]]
 
 # Check that the target supports trace.
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "Couldn't compile test program"
+    untested "couldn't compile test program"
     return -1
 }
 
 clean_restart ${testfile}
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -46,7 +46,7 @@ gdb_load_shlib $libipa
 lappend options shlib=$libipa
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "Couldn't compile test program with in-process agent library"
+    untested "couldn't compile test program with in-process agent library"
     return -1
 }
 
@@ -62,7 +62,7 @@ proc test_tracepoint_enable_disable { tracepoint_cmd } {
 	set expected 0
 
 	if ![runto_main] {
-	    fail "Can't run to main."
+	    fail "can't run to main."
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index b580344..bab2a61 100644
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -23,14 +23,14 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags] ] != "" } {
-    untested "Couldn't compile test program"
+    untested "couldn't compile test program"
     return -1
 }
 
 clean_restart ${testfile}
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -50,7 +50,7 @@ proc step_over_tracepoint { trace_type } \
     # Make sure inferior is running in all-stop mode.
     gdb_test_no_output "set non-stop 0"
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -75,7 +75,7 @@ proc break_trace_same_addr { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return -1
     }
 
@@ -118,13 +118,13 @@ if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "Can't run to main for ftrace tests"
+    fail "can't run to main for ftrace tests"
     return 0
 }
 
 gdb_reinitialize_dir $srcdir/$subdir
 if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
-    untested "Could not find IPA lib loaded"
+    untested "could not find IPA lib loaded"
 } else {
     foreach break_always_inserted { "on" "off" } {
 	break_trace_same_addr "ftrace" ${break_always_inserted}
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 11ef691..645dcbc 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -37,7 +37,7 @@ gdb_file_cmd $binfile
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
 if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
+    fail "could not find gdb_recursion_test function"
     return
 }
 
@@ -163,9 +163,9 @@ gdb_delete_tracepoints
 # Acceptance vs rejection of a location are target-specific, so allow both.
 gdb_test_multiple "ftrace gdb_recursion_test" "Set a fast tracepoint" {
     -re "Fast tracepoint $decimal at $hex: file.*$srcfile, line $testline1.*$gdb_prompt $" {
-	pass "Set a fast tracepoint"
+	pass "set a fast tracepoint"
     }
     -re ".*May not have a fast tracepoint at $hex.*$gdb_prompt $" {
-	pass "Declined to set a fast tracepoint"
+	pass "declined to set a fast tracepoint"
     }
 }
diff --git a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
index 4c52c64..52735d3 100644
--- a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
+++ b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index e638839..885fe23 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -128,7 +128,7 @@ clean_restart $executable
 runto_main
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp
index de6efb6..c3957c2 100644
--- a/gdb/testsuite/gdb.trace/tstatus.exp
+++ b/gdb/testsuite/gdb.trace/tstatus.exp
@@ -25,7 +25,7 @@ if [prepare_for_testing $expfile $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "Can't run to main to check for trace support"
+    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index f146745..d9e2d6b 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -106,7 +106,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 # The rest of the testing needs actual tracing to work.
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 }
 
@@ -193,7 +193,7 @@ gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "Can't run to main"
+    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index ed1b533..d7cf020 100644
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -732,7 +732,7 @@ proc gdb_trace_collection_test {} {
 runto_main
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index 79785e2..b090f76 100644
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -35,7 +35,7 @@ runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
-    unsupported "Current target does not support trace"
+    unsupported "current target does not support trace"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index fe4588a..2705852 100644
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -41,7 +41,7 @@ gdb_file_cmd $binfile
 gdb_delete_tracepoints
 set trcpt1 [gdb_gettpnum gdb_c_test]
 if { $trcpt1 <= 0 } then {
-    fail "Could not find gdb_c_test function"
+    fail "could not find gdb_c_test function"
     return
 }
 
@@ -108,7 +108,7 @@ gdb_load $binfile
 gdb_breakpoint "main"
 gdb_run_cmd
 if {[gdb_test "" "Breakpoint .*"] != 0} {
-    fail "Can't run to main"
+    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/lib/gdb-guile.exp b/gdb/testsuite/lib/gdb-guile.exp
index 7789449..8f73f5a 100644
--- a/gdb/testsuite/lib/gdb-guile.exp
+++ b/gdb/testsuite/lib/gdb-guile.exp
@@ -116,7 +116,7 @@ proc gdb_install_guile_module { } {
 
 proc gdb_guile_runto_main { } {
     if ![runto_main] {
-	fail "Can't run to main"
+	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index e1e9880..b9b3a45 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -523,7 +523,7 @@ proc runto { function args } {
 	}
 	-re "The target does not support running in non-stop mode.\r\n$gdb_prompt $" {
 	    if { $print_fail } {
-		unsupported "Non-stop mode not supported"
+		unsupported "non-stop mode not supported"
 	    }
 	    return 0
 	}
@@ -3150,7 +3150,7 @@ gdb_caching_proc target_is_gdbserver {
     global gdb_prompt
 
     set is_gdbserver -1
-    set test "Probing for GDBserver"
+    set test "probing for GDBserver"
 
     gdb_test_multiple "monitor help" $test {
 	-re "The following monitor commands are supported.*Quit GDBserver.*$gdb_prompt $" {
@@ -3602,7 +3602,7 @@ proc gdb_compile_pthreads {source dest type options} {
         }
     }
     if {!$built_binfile} {
-	unsupported "Couldn't compile [file tail $source]: ${why_msg}"
+	unsupported "couldn't compile [file tail $source]: ${why_msg}"
         return -1
     }
 }
@@ -3731,7 +3731,7 @@ proc gdb_compile_shlib_pthreads {sources dest options} {
         }
     }
     if {!$built_binfile} {
-        unsupported "Couldn't compile $sources: ${why_msg}"
+        unsupported "couldn't compile $sources: ${why_msg}"
         return -1
     }
 }
@@ -3771,7 +3771,7 @@ proc gdb_compile_objc {source dest type options} {
         }
     }
     if {!$built_binfile} {
-        unsupported "Couldn't compile [file tail $source]: ${why_msg}"
+        unsupported "couldn't compile [file tail $source]: ${why_msg}"
         return -1
     }
 }
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 7c2bb3e..622b7cc 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -269,12 +269,12 @@ proc default_mi_gdb_start { args } {
 	    verbose "GDB initialized."
 	}
 	-re ".*unrecognized option.*for a complete list of options." {
-	    untested "Skip mi tests (not compiled with mi support)."
+	    untested "skip mi tests (not compiled with mi support)."
 	    remote_close host
 	    return -1
 	}
 	-re ".*Interpreter `mi' unrecognized." {
-	    untested "Skip mi tests (not compiled with mi support)."
+	    untested "skip mi tests (not compiled with mi support)."
 	    remote_close host
 	    return -1
 	}
@@ -462,7 +462,7 @@ proc mi_gdb_target_cmd { targetname serialport } {
 		continue
 	    }
 	    -re "Non-stop mode requested, but remote does not support non-stop.*$mi_gdb_prompt" {
-		unsupported "Non-stop mode not supported"
+		unsupported "non-stop mode not supported"
 		return 1
 	    }
 	    -re "Timeout reading from remote system.*$mi_gdb_prompt$" {
@@ -989,7 +989,7 @@ proc mi_run_cmd_full {use_mi_command args} {
 	-re "${run_match}\\^running\r\n(\\*running,thread-id=\"\[^\"\]+\"\r\n|=thread-created,id=\"1\",group-id=\"\[0-9\]+\"\r\n)*(${library_loaded_re})*(${thread_selected_re})?${mi_gdb_prompt}" {
 	}
 	-re "\\^error,msg=\"The target does not support running in non-stop mode.\"" {
-	    unsupported "Non-stop mode not supported"
+	    unsupported "non-stop mode not supported"
 	    return -1
 	}
 	timeout {
diff --git a/gdb/testsuite/lib/pascal.exp b/gdb/testsuite/lib/pascal.exp
index 5ef3065..ac29f7e 100644
--- a/gdb/testsuite/lib/pascal.exp
+++ b/gdb/testsuite/lib/pascal.exp
@@ -158,7 +158,7 @@ proc gdb_compile_pascal {source destfile type options} {
     } elseif { $pascal_compiler_is_gpc == 1 } {
         set result [gpc_compile $source $destfile $type $options]
     } else {
-	unsupported "No pascal compiler found"
+	unsupported "no pascal compiler found"
 	return "No pascal compiler. Compilation failed."
     }
 
diff --git a/gdb/testsuite/lib/perftest.exp b/gdb/testsuite/lib/perftest.exp
index 7659ee0..2f8da14 100644
--- a/gdb/testsuite/lib/perftest.exp
+++ b/gdb/testsuite/lib/perftest.exp
@@ -90,7 +90,7 @@ namespace eval PerfTest {
 
 	if { [string compare $GDB_PERFTEST_MODE "run"] != 0 } {
 	    if { [eval compile {$compile}] } {
-		untested "Could not compile source files."
+		untested "could not compile source files."
 		return
 	    }
 	}
diff --git a/gdb/testsuite/lib/prelink-support.exp b/gdb/testsuite/lib/prelink-support.exp
index 0584669..1d28b9b 100644
--- a/gdb/testsuite/lib/prelink-support.exp
+++ b/gdb/testsuite/lib/prelink-support.exp
@@ -62,7 +62,7 @@ proc symlink_resolve {file} {
 
 	set loop [expr $loop + 1]
 	if {$loop > 30} {
-	    fail "Looping symlink resolution for $file"
+	    fail "looping symlink resolution for $file"
 	    return ""
 	}
     }
diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
index f171cc8..ea8d6f2 100644
--- a/gdb/testsuite/lib/selftest-support.exp
+++ b/gdb/testsuite/lib/selftest-support.exp
@@ -72,7 +72,7 @@ proc selftest_setup { executable function } {
     }
 
     if { $gdb_file_cmd_debug_info != "debug" } then {
-	untested "No debug information, skipping testcase."
+	untested "no debug information, skipping testcase."
 	return -1
     }
 
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple
  2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
                   ` (3 preceding siblings ...)
  2016-11-25 20:55 ` [PATCH v2 1/8] Fix test names starting with uppercase output by basic functions Luis Machado
@ 2016-11-25 20:55 ` Luis Machado
  2016-11-27 17:10   ` Yao Qi
  2016-11-25 20:55 ` [PATCH v2 5/8] Fix test names starting with uppercase using multi-line gdb_test/mi_gdb_test Luis Machado
                   ` (3 subsequent siblings)
  8 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-25 20:55 UTC (permalink / raw)
  To: gdb-patches

This fixes offender testcases that have test names starting with uppercase
when using gdb_test_multiple in a single-line construct.

gdb/testsuite/ChangeLog
2016-11-25  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names starting with uppercase throughout the files.

	* gdb/testsuite/gdb.arch/i386-bp_permanent.exp
	* gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
	* gdb/testsuite/gdb.base/disasm-end-cu.exp
	* gdb/testsuite/gdb.base/macscp.exp
	* gdb/testsuite/gdb.base/pending.exp
	* gdb/testsuite/gdb.base/watch_thread_num.exp
	* gdb/testsuite/gdb.cp/exception.exp
	* gdb/testsuite/gdb.cp/gdb2495.exp
	* gdb/testsuite/gdb.cp/local.exp
	* gdb/testsuite/gdb.python/py-evsignal.exp
	* gdb/testsuite/gdb.python/python.exp
	* gdb/testsuite/gdb.trace/tracecmd.exp
---
 gdb/testsuite/gdb.arch/i386-bp_permanent.exp | 2 +-
 gdb/testsuite/gdb.arch/i386-gnu-cfi.exp      | 2 +-
 gdb/testsuite/gdb.base/disasm-end-cu.exp     | 2 +-
 gdb/testsuite/gdb.base/macscp.exp            | 2 +-
 gdb/testsuite/gdb.base/pending.exp           | 4 ++--
 gdb/testsuite/gdb.base/watch_thread_num.exp  | 2 +-
 gdb/testsuite/gdb.cp/exception.exp           | 2 +-
 gdb/testsuite/gdb.cp/gdb2495.exp             | 4 ++--
 gdb/testsuite/gdb.cp/local.exp               | 2 +-
 gdb/testsuite/gdb.python/py-evsignal.exp     | 2 +-
 gdb/testsuite/gdb.python/python.exp          | 2 +-
 gdb/testsuite/gdb.trace/tracecmd.exp         | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
index 005d1fc..cb2fedb 100644
--- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
+++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
@@ -51,7 +51,7 @@ if ![runto_main] then {
 
 set function "standard"
 
-set retcode [gdb_test_multiple "disassemble $function" "Disassemble function '$function'" {
+set retcode [gdb_test_multiple "disassemble $function" "disassemble function '$function'" {
     -re "($hex) <\\+0>.*($hex) <\\+$decimal>.*int3.*($hex) <\\+$decimal>.*leave.*$gdb_prompt $" {
       set address_bp $expect_out(2,string)
       set address_after_bp $expect_out(3,string)
diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index 9c05cab..83e1884 100644
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -71,7 +71,7 @@ gdb_test "up 3" \
          "gate \\(\[^()\]*\\) at .*gate.c.*" \
          "shift up to the modified frame"
 
-gdb_test_multiple "info frame" "Existence of the CFI inserted register" {
+gdb_test_multiple "info frame" "existence of the CFI inserted register" {
     -re "Stack level 3, frame at (0x\[0-9a-f\]+):.*Saved registers:.* ecx at (0x\[0-9a-f\]+),.*" {
 	pass "existence of the CFI inserted register"
 	if { [string compare $expect_out(1,string) $expect_out(2,string)] } then {
diff --git a/gdb/testsuite/gdb.base/disasm-end-cu.exp b/gdb/testsuite/gdb.base/disasm-end-cu.exp
index 81b153f..38488f7 100644
--- a/gdb/testsuite/gdb.base/disasm-end-cu.exp
+++ b/gdb/testsuite/gdb.base/disasm-end-cu.exp
@@ -33,7 +33,7 @@ if {$main_addr == 0 || $dummy_3_addr == 0 || $dummy_3_addr <= $main_addr} {
     return -1
 }
 
-gdb_test_multiple "disassemble /m ${main_addr},${dummy_3_addr}" "Disassemble address range with source" {
+gdb_test_multiple "disassemble /m ${main_addr},${dummy_3_addr}" "disassemble address range with source" {
     -re "Dump of assembler code from ${main_addr} to ${dummy_3_addr}:\r\nEnd of assembler dump\." {
         fail "no output from the disassemble command"
     }
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 22dcaac..aec18fb 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -195,7 +195,7 @@ proc list_and_check_macro {func macro expected} {
 
 gdb_test "list main" ".*main.*" "list main for support check"
 set macro_support "unknown"
-gdb_test_multiple "info source" "Test macro information"  {
+gdb_test_multiple "info source" "test macro information"  {
     -re "Includes preprocessor macro info\..*$gdb_prompt $" {
 	set macro_support 1
 	verbose "Source has macro information"
diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index a1b497c..e89f4a9 100644
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -167,7 +167,7 @@ gdb_test "info break" \
 #
 
 set bp2_loc [gdb_get_line_number "y = x + 4" ${libfile}.c]
-gdb_test_multiple "break pendshr.c:$bp2_loc if x > 3" "Set pending breakpoint 2" {
+gdb_test_multiple "break pendshr.c:$bp2_loc if x > 3" "set pending breakpoint 2" {
      -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
 	    gdb_test "y" "Breakpoint.*pendshr.c:$bp2_loc.*pending." \
 		"Set pending breakpoint 2"
@@ -189,7 +189,7 @@ gdb_test "info break" \
 #
 
 set bp3_loc [gdb_get_line_number "printf" ${libfile}.c]
-gdb_test_multiple "break pendshr.c:$bp3_loc" "Set pending breakpoint 3" {
+gdb_test_multiple "break pendshr.c:$bp3_loc" "set pending breakpoint 3" {
      -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
 	    gdb_test "y" "Breakpoint.*pendshr.c:$bp3_loc.*pending." \
 		"Set pending breakpoint 3"
diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp
index 839bf84..2077121 100644
--- a/gdb/testsuite/gdb.base/watch_thread_num.exp
+++ b/gdb/testsuite/gdb.base/watch_thread_num.exp
@@ -58,7 +58,7 @@ gdb_test "break loop" "Breakpoint \[0-9\].*" \
 
 gdb_test "continue" ".*Breakpoint .*loop.*" "stopped in loop"
 
-gdb_test_multiple "thread" "Thread command" {
+gdb_test_multiple "thread" "thread command" {
     -re ".*Current thread is (\[0-9\]*).*$gdb_prompt $" {
 	pass "thread command"
     }
diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp
index 5dd3449..81fde04 100644
--- a/gdb/testsuite/gdb.cp/exception.exp
+++ b/gdb/testsuite/gdb.cp/exception.exp
@@ -89,7 +89,7 @@ gdb_test "tbreak main" "Temporary breakpoint 4.*" \
 
 set ok 0
 gdb_run_cmd
-gdb_test_multiple "" "Run to main" {
+gdb_test_multiple "" "run to main" {
     -re "Temporary breakpoint 4,.*$gdb_prompt $" {
 	pass "run to main"
 	set ok 1
diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp
index 7fe2b12..f80c30c 100644
--- a/gdb/testsuite/gdb.cp/gdb2495.exp
+++ b/gdb/testsuite/gdb.cp/gdb2495.exp
@@ -121,7 +121,7 @@ if ![runto_main] then {
 # behaviour; it should not.  Test both on and off states.
 
 # Turn on unwind on signal behaviour.
-gdb_test_multiple "set unwindonsignal on" "Turn unwindonsignal on" {
+gdb_test_multiple "set unwindonsignal on" "turn unwindonsignal on" {
     -re "$gdb_prompt $" {pass "set unwindonsignal on"}
     timeout {fail "(timeout) set unwindonsignal on"}
 }
@@ -137,7 +137,7 @@ gdb_test "p exceptions.raise_signal(1)" \
     "To change this behavior use \"set unwindonsignal off\".*"
 
 # And reverse - turn off again.
-gdb_test_multiple "set unwindonsignal off" "Turn unwindonsignal off" {
+gdb_test_multiple "set unwindonsignal off" "turn unwindonsignal off" {
     -re "$gdb_prompt $" {pass "set unwindonsignal off"}
     timeout {fail "(timeout) set unwindonsignal off"}
 }
diff --git a/gdb/testsuite/gdb.cp/local.exp b/gdb/testsuite/gdb.cp/local.exp
index 62c1fd8..da63312 100644
--- a/gdb/testsuite/gdb.cp/local.exp
+++ b/gdb/testsuite/gdb.cp/local.exp
@@ -164,7 +164,7 @@ gdb_test "up" ".*main.*" "up from marker2"
 # setup_kfail "gdb/825"
 
 set eol "\[\t \]*\[\r\n\]+\[\t \]*"
-gdb_test_multiple "ptype Local" "Local out of scope" {
+gdb_test_multiple "ptype Local" "local out of scope" {
     -re "No symbol \"Local\" in current context.*${gdb_prompt} $" {
         pass "local out of scope"
     }
diff --git a/gdb/testsuite/gdb.python/py-evsignal.exp b/gdb/testsuite/gdb.python/py-evsignal.exp
index 9cf2702..f725688 100644
--- a/gdb/testsuite/gdb.python/py-evsignal.exp
+++ b/gdb/testsuite/gdb.python/py-evsignal.exp
@@ -37,7 +37,7 @@ gdb_test "test-events" "Event testers registered."
 gdb_test_no_output "set non-stop on"
 
 gdb_run_cmd
-gdb_test_multiple "" "Signal Thread 3"  {
+gdb_test_multiple "" "signal Thread 3"  {
     -re "event type: stop\r\nstop reason: signal\r\nstop signal: SIGUSR1\r\nthread num: 3\r\nevent type: stop\r\n.*$gdb_prompt $" {
         pass "thread 3 was signaled"
     }
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 14cfffe..b657016 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -322,7 +322,7 @@ gdb_test_multiple "set prompt blah " "set blah in GDB" {
     }
 }
 
-gdb_test_multiple "python gdb.prompt_hook = None" "Delete hook" {
+gdb_test_multiple "python gdb.prompt_hook = None" "delete hook" {
     -re "\[\r\n\]$newprompt2 $" {
 	pass "delete old hook"
     }
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 645dcbc..7ad6c91 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -161,7 +161,7 @@ gdb_test "help trace" "Set a tracepoint at .*" "1.14: help trace"
 gdb_delete_tracepoints
 
 # Acceptance vs rejection of a location are target-specific, so allow both.
-gdb_test_multiple "ftrace gdb_recursion_test" "Set a fast tracepoint" {
+gdb_test_multiple "ftrace gdb_recursion_test" "set a fast tracepoint" {
     -re "Fast tracepoint $decimal at $hex: file.*$srcfile, line $testline1.*$gdb_prompt $" {
 	pass "set a fast tracepoint"
     }
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v2 2/8] Fix test names starting with uppercase using gdb_test on a single line.
  2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
                   ` (5 preceding siblings ...)
  2016-11-25 20:55 ` [PATCH v2 5/8] Fix test names starting with uppercase using multi-line gdb_test/mi_gdb_test Luis Machado
@ 2016-11-25 20:55 ` Luis Machado
  2016-11-27 16:48   ` Yao Qi
  2016-11-25 20:55 ` [PATCH v2 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages Luis Machado
  2016-11-28 18:57 ` [PATCH v2 0/8] Fix gdb's testsuite test names Sergio Durigan Junior
  8 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-25 20:55 UTC (permalink / raw)
  To: gdb-patches

This fixes offender testcases that have test names starting with uppercase
when using gdb_test in a single line construct.

gdb/testsuite/ChangeLog
2016-11-25  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names starting with uppercase throughout the files.

	* gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
	* gdb/testsuite/gdb.arch/i386-mpx.exp
	* gdb/testsuite/gdb.arch/i386-permbkpt.exp
	* gdb/testsuite/gdb.arch/pa-nullify.exp
	* gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
	* gdb/testsuite/gdb.arch/vsx-regs.exp
	* gdb/testsuite/gdb.base/bfp-test.exp
	* gdb/testsuite/gdb.base/break.exp
	* gdb/testsuite/gdb.base/breakpoint-shadow.exp
	* gdb/testsuite/gdb.base/callfuncs.exp
	* gdb/testsuite/gdb.base/charset.exp
	* gdb/testsuite/gdb.base/commands.exp
	* gdb/testsuite/gdb.base/completion.exp
	* gdb/testsuite/gdb.base/dfp-test.exp
	* gdb/testsuite/gdb.base/echo.exp
	* gdb/testsuite/gdb.base/ending-run.exp
	* gdb/testsuite/gdb.base/eval.exp
	* gdb/testsuite/gdb.base/expand-psymtabs.exp
	* gdb/testsuite/gdb.base/float128.exp
	* gdb/testsuite/gdb.base/floatn.exp
	* gdb/testsuite/gdb.base/foll-exec-mode.exp
	* gdb/testsuite/gdb.base/gdb1056.exp
	* gdb/testsuite/gdb.base/gdb11531.exp
	* gdb/testsuite/gdb.base/kill-after-signal.exp
	* gdb/testsuite/gdb.base/multi-forks.exp
	* gdb/testsuite/gdb.base/overlays.exp
	* gdb/testsuite/gdb.base/pending.exp
	* gdb/testsuite/gdb.base/sepdebug.exp
	* gdb/testsuite/gdb.base/testenv.exp
	* gdb/testsuite/gdb.base/valgrind-db-attach.exp
	* gdb/testsuite/gdb.base/watch_thread_num.exp
	* gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
	* gdb/testsuite/gdb.base/watchpoint.exp
	* gdb/testsuite/gdb.base/watchpoints.exp
	* gdb/testsuite/gdb.cp/arg-reference.exp
	* gdb/testsuite/gdb.cp/baseenum.exp
	* gdb/testsuite/gdb.cp/operator.exp
	* gdb/testsuite/gdb.cp/shadow.exp
	* gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
	* gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
	* gdb/testsuite/gdb.go/chan.exp
	* gdb/testsuite/gdb.go/hello.exp
	* gdb/testsuite/gdb.go/integers.exp
	* gdb/testsuite/gdb.go/methods.exp
	* gdb/testsuite/gdb.go/package.exp
	* gdb/testsuite/gdb.guile/scm-parameter.exp
	* gdb/testsuite/gdb.guile/scm-progspace.exp
	* gdb/testsuite/gdb.guile/scm-value.exp
	* gdb/testsuite/gdb.mi/mi-pending.exp
	* gdb/testsuite/gdb.mi/user-selected-context-sync.exp
	* gdb/testsuite/gdb.multi/multi-attach.exp
	* gdb/testsuite/gdb.multi/tids.exp
	* gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
	* gdb/testsuite/gdb.pascal/floats.exp
	* gdb/testsuite/gdb.pascal/integers.exp
	* gdb/testsuite/gdb.python/py-block.exp
	* gdb/testsuite/gdb.python/py-events.exp
	* gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
	* gdb/testsuite/gdb.python/py-parameter.exp
	* gdb/testsuite/gdb.python/py-symbol.exp
	* gdb/testsuite/gdb.python/py-symtab.exp
	* gdb/testsuite/gdb.python/py-type.exp
	* gdb/testsuite/gdb.python/py-value.exp
	* gdb/testsuite/gdb.python/py-xmethods.exp
	* gdb/testsuite/gdb.python/python.exp
	* gdb/testsuite/gdb.reverse/break-precsave.exp
	* gdb/testsuite/gdb.reverse/consecutive-precsave.exp
	* gdb/testsuite/gdb.reverse/finish-precsave.exp
	* gdb/testsuite/gdb.reverse/i386-precsave.exp
	* gdb/testsuite/gdb.reverse/machinestate-precsave.exp
	* gdb/testsuite/gdb.reverse/sigall-precsave.exp
	* gdb/testsuite/gdb.reverse/solib-precsave.exp
	* gdb/testsuite/gdb.reverse/step-precsave.exp
	* gdb/testsuite/gdb.reverse/until-precsave.exp
	* gdb/testsuite/gdb.reverse/watch-precsave.exp
	* gdb/testsuite/gdb.server/ext-attach.exp
	* gdb/testsuite/gdb.server/ext-restart.exp
	* gdb/testsuite/gdb.server/ext-run.exp
	* gdb/testsuite/gdb.server/ext-wrapper.exp
	* gdb/testsuite/gdb.stabs/gdb11479.exp
	* gdb/testsuite/gdb.stabs/weird.exp
	* gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
	* gdb/testsuite/gdb.threads/kill.exp
	* gdb/testsuite/gdb.threads/watchpoint-fork.exp
---
 gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp    |  6 +-
 gdb/testsuite/gdb.arch/i386-mpx.exp                | 16 ++---
 gdb/testsuite/gdb.arch/i386-permbkpt.exp           |  4 +-
 gdb/testsuite/gdb.arch/pa-nullify.exp              |  6 +-
 gdb/testsuite/gdb.arch/powerpc-d128-regs.exp       |  6 +-
 gdb/testsuite/gdb.arch/vsx-regs.exp                |  4 +-
 gdb/testsuite/gdb.base/bfp-test.exp                | 18 ++---
 gdb/testsuite/gdb.base/break.exp                   |  6 +-
 gdb/testsuite/gdb.base/breakpoint-shadow.exp       |  4 +-
 gdb/testsuite/gdb.base/callfuncs.exp               |  4 +-
 gdb/testsuite/gdb.base/charset.exp                 |  2 +-
 gdb/testsuite/gdb.base/commands.exp                |  4 +-
 gdb/testsuite/gdb.base/completion.exp              |  2 +-
 gdb/testsuite/gdb.base/dfp-test.exp                | 18 ++---
 gdb/testsuite/gdb.base/echo.exp                    |  2 +-
 gdb/testsuite/gdb.base/ending-run.exp              |  4 +-
 gdb/testsuite/gdb.base/eval.exp                    |  4 +-
 gdb/testsuite/gdb.base/expand-psymtabs.exp         |  2 +-
 gdb/testsuite/gdb.base/float128.exp                | 12 ++--
 gdb/testsuite/gdb.base/floatn.exp                  | 40 +++++------
 gdb/testsuite/gdb.base/foll-exec-mode.exp          |  2 +-
 gdb/testsuite/gdb.base/gdb1056.exp                 |  2 +-
 gdb/testsuite/gdb.base/gdb11531.exp                |  2 +-
 gdb/testsuite/gdb.base/kill-after-signal.exp       |  2 +-
 gdb/testsuite/gdb.base/multi-forks.exp             | 14 ++--
 gdb/testsuite/gdb.base/overlays.exp                | 20 +++---
 gdb/testsuite/gdb.base/pending.exp                 |  4 +-
 gdb/testsuite/gdb.base/sepdebug.exp                |  4 +-
 gdb/testsuite/gdb.base/testenv.exp                 |  2 +-
 gdb/testsuite/gdb.base/valgrind-db-attach.exp      |  2 +-
 gdb/testsuite/gdb.base/watch_thread_num.exp        |  6 +-
 gdb/testsuite/gdb.base/watchpoint-cond-gone.exp    |  2 +-
 gdb/testsuite/gdb.base/watchpoint.exp              | 12 ++--
 gdb/testsuite/gdb.base/watchpoints.exp             | 14 ++--
 gdb/testsuite/gdb.cp/arg-reference.exp             |  2 +-
 gdb/testsuite/gdb.cp/baseenum.exp                  |  2 +-
 gdb/testsuite/gdb.cp/operator.exp                  |  2 +-
 gdb/testsuite/gdb.cp/shadow.exp                    | 10 +--
 gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp      |  8 +--
 gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp     |  2 +-
 gdb/testsuite/gdb.go/chan.exp                      |  4 +-
 gdb/testsuite/gdb.go/hello.exp                     |  2 +-
 gdb/testsuite/gdb.go/integers.exp                  | 16 ++---
 gdb/testsuite/gdb.go/methods.exp                   |  4 +-
 gdb/testsuite/gdb.go/package.exp                   |  2 +-
 gdb/testsuite/gdb.guile/scm-parameter.exp          |  8 +--
 gdb/testsuite/gdb.guile/scm-progspace.exp          |  4 +-
 gdb/testsuite/gdb.guile/scm-value.exp              |  2 +-
 gdb/testsuite/gdb.mi/mi-pending.exp                |  2 +-
 .../gdb.mi/user-selected-context-sync.exp          |  2 +-
 gdb/testsuite/gdb.multi/multi-attach.exp           |  4 +-
 gdb/testsuite/gdb.multi/tids.exp                   |  2 +-
 gdb/testsuite/gdb.opt/clobbered-registers-O2.exp   |  2 +-
 gdb/testsuite/gdb.pascal/floats.exp                | 28 ++++----
 gdb/testsuite/gdb.pascal/integers.exp              | 16 ++---
 gdb/testsuite/gdb.python/py-block.exp              | 18 ++---
 gdb/testsuite/gdb.python/py-events.exp             |  2 +-
 gdb/testsuite/gdb.python/py-finish-breakpoint2.exp |  2 +-
 gdb/testsuite/gdb.python/py-parameter.exp          | 82 +++++++++++-----------
 gdb/testsuite/gdb.python/py-symbol.exp             | 64 ++++++++---------
 gdb/testsuite/gdb.python/py-symtab.exp             | 34 ++++-----
 gdb/testsuite/gdb.python/py-type.exp               | 58 +++++++--------
 gdb/testsuite/gdb.python/py-value.exp              | 48 ++++++-------
 gdb/testsuite/gdb.python/py-xmethods.exp           | 66 ++++++++---------
 gdb/testsuite/gdb.python/python.exp                | 58 +++++++--------
 gdb/testsuite/gdb.reverse/break-precsave.exp       |  2 +-
 gdb/testsuite/gdb.reverse/consecutive-precsave.exp |  2 +-
 gdb/testsuite/gdb.reverse/finish-precsave.exp      |  2 +-
 gdb/testsuite/gdb.reverse/i386-precsave.exp        |  2 +-
 .../gdb.reverse/machinestate-precsave.exp          |  2 +-
 gdb/testsuite/gdb.reverse/sigall-precsave.exp      |  2 +-
 gdb/testsuite/gdb.reverse/solib-precsave.exp       |  2 +-
 gdb/testsuite/gdb.reverse/step-precsave.exp        |  2 +-
 gdb/testsuite/gdb.reverse/until-precsave.exp       |  2 +-
 gdb/testsuite/gdb.reverse/watch-precsave.exp       |  2 +-
 gdb/testsuite/gdb.server/ext-attach.exp            |  2 +-
 gdb/testsuite/gdb.server/ext-restart.exp           |  2 +-
 gdb/testsuite/gdb.server/ext-run.exp               |  2 +-
 gdb/testsuite/gdb.server/ext-wrapper.exp           |  2 +-
 gdb/testsuite/gdb.stabs/gdb11479.exp               |  4 +-
 gdb/testsuite/gdb.stabs/weird.exp                  |  8 +--
 .../attach-many-short-lived-threads.exp            |  2 +-
 gdb/testsuite/gdb.threads/kill.exp                 |  2 +-
 gdb/testsuite/gdb.threads/watchpoint-fork.exp      |  4 +-
 84 files changed, 428 insertions(+), 428 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
index 2eefc74..7729f6b 100644
--- a/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
+++ b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
@@ -73,7 +73,7 @@ with_test_prefix "$parameters" {
              ".*SIGSEGV.*Yes.*Yes.*Yes.*Segmentation fault.*"\
              "set parameters"
 
-    gdb_test "continue" ".*$violation.*" "Display"
+    gdb_test "continue" ".*$violation.*" "display"
 
     gdb_test "where" ".*#0  $hex in upper.*"\
              "should be in upper"
@@ -93,7 +93,7 @@ with_test_prefix "$parameters" {
              ".*SIGSEGV.*No.*Yes.*Yes.*Segmentation fault.*"\
              "set parameters"
 
-    gdb_test "continue" ".*$segv_with_exit.*" "Display"
+    gdb_test "continue" ".*$segv_with_exit.*" "display"
 
     gdb_test "where" "No stack." "no inferior"
 }
@@ -112,7 +112,7 @@ with_test_prefix "$parameters" {
              ".*SIGSEGV.*Yes.*Yes.*No.*Segmentation fault.*"\
              "set parameters"
 
-    gdb_test "continue" ".*$violation.*" "Display"
+    gdb_test "continue" ".*$violation.*" "display"
 
     gdb_test "where" ".*#0  $hex in upper.*"\
              "should be in upper"
diff --git a/gdb/testsuite/gdb.arch/i386-mpx.exp b/gdb/testsuite/gdb.arch/i386-mpx.exp
index 7f4727e..dc1ad56 100644
--- a/gdb/testsuite/gdb.arch/i386-mpx.exp
+++ b/gdb/testsuite/gdb.arch/i386-mpx.exp
@@ -71,30 +71,30 @@ gdb_breakpoint [ gdb_get_line_number "break here" ]
 gdb_continue_to_breakpoint "break here" ".*break here.*"
 
 set test_string ".*\\\{lbound = 0xa, ubound = 0x13\\\}.*"
-gdb_test "info register bnd0" ".*bnd0$test_string" "Pure bnd0 register"
+gdb_test "info register bnd0" ".*bnd0$test_string" "pure bnd0 register"
 
 set test_string ".*\\\{lbound = 0x14, ubound = 0x1d\\\}.*"
-gdb_test "info register bnd1" ".*bnd1$test_string" "Pure bnd1 register"
+gdb_test "info register bnd1" ".*bnd1$test_string" "pure bnd1 register"
 
 set test_string ".*\\\{lbound = 0x1e, ubound = 0x27\\\}.*"
-gdb_test "info register bnd2" ".*bnd2$test_string" "Pure bnd2 register"
+gdb_test "info register bnd2" ".*bnd2$test_string" "pure bnd2 register"
 
 set test_string ".*\\\{lbound = 0x28, ubound = 0x31\\\}.*"
-gdb_test "info register bnd3" ".*bnd3$test_string" "Pure bnd3 register"
+gdb_test "info register bnd3" ".*bnd3$test_string" "pure bnd3 register"
 
 # Read value from registers bndrs.
 
 set test_string ".*\\\{lbound = 0xa, ubound_raw = 0x\[f\]+ec\\\}.*"
-gdb_test "info register bnd0raw" ".*bnd0$test_string" "Pure bnd0r register"
+gdb_test "info register bnd0raw" ".*bnd0$test_string" "pure bnd0r register"
 
 set test_string ".*\\\{lbound = 0x14, ubound_raw = 0x\[f\]+e2\\\}.*"
-gdb_test "info register bnd1raw" ".*bnd1$test_string" "Pure bnd1r register"
+gdb_test "info register bnd1raw" ".*bnd1$test_string" "pure bnd1r register"
 
 set test_string ".*\\\{lbound = 0x1e, ubound_raw = 0x\[f\]+d8\\\}.*"
-gdb_test "info register bnd2raw" ".*bnd2$test_string" "Pure bnd2r register"
+gdb_test "info register bnd2raw" ".*bnd2$test_string" "pure bnd2r register"
 
 set test_string ".*\\\{lbound = 0x28, ubound_raw = 0x\[f\]+ce\\\}.*"
-gdb_test "info register bnd3raw" ".*bnd3$test_string" "Pure bnd3r register"
+gdb_test "info register bnd3raw" ".*bnd3$test_string" "pure bnd3r register"
 
 # Setting fields on bnds
 set test_string ".*\\\{lbound = 0xa, ubound = 0x400\\\}.*"
diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
index 083217b..c2dc620 100644
--- a/gdb/testsuite/gdb.arch/i386-permbkpt.exp
+++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
@@ -35,5 +35,5 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 
 clean_restart ${binfile}
 
-gdb_test "break main" "" "First permanent break"
-gdb_test "break main" "" "Second permanent break"
+gdb_test "break main" "" "first permanent break"
+gdb_test "break main" "" "second permanent break"
diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
index cbc66bf..9a98fe4 100644
--- a/gdb/testsuite/gdb.arch/pa-nullify.exp
+++ b/gdb/testsuite/gdb.arch/pa-nullify.exp
@@ -51,7 +51,7 @@ gdb_load ${binfile}
 # that we end up back at the caller and not at the second instruction.
 
 gdb_breakpoint foo
-gdb_test "run" "Breakpoint 1, .* in foo.*" "Breakpoint at foo"
+gdb_test "run" "Breakpoint 1, .* in foo.*" "breakpoint at foo"
 
 set test "stepi till main"
 gdb_test_multiple "stepi" "${test}" {
@@ -97,9 +97,9 @@ set foo_last "(bar - 4)"
 gdb_breakpoint "*$foo_last"
 
 gdb_test "continue" "Breakpoint \[0-9\]*,.* in foo.*"
-gdb_test "backtrace" "in foo.*in main.*" "Backtrace from last insn in foo"
+gdb_test "backtrace" "in foo.*in main.*" "backtrace from last insn in foo"
 gdb_test "stepi" "in foo.*" "stepi to nullified instruction stays in foo"
-gdb_test "backtrace" "in foo.*in main.*" "Backtrace from nullified insn"
+gdb_test "backtrace" "in foo.*in main.*" "backtrace from nullified insn"
 gdb_test "stepi" "in main.*" "stepi to main"
 
 # In the third test, we verify that backtraces from nullified instructions
diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
index 4a08f26..2be82c3 100644
--- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
@@ -44,16 +44,16 @@ if { ![runto main] } then {
    return
 }
 
-if [gdb_test "show arch" ".*currently powerpc:common.*" "Checking for PPC arch"] {
+if [gdb_test "show arch" ".*currently powerpc:common.*" "checking for PPC arch"] {
     return -1
 }
 
 gdb_test "next" ""
 
 for {set i 0} {$i < 16} {incr i 1} {
-gdb_test "set \$dl$i=d128" "" "Set dl$i register"
+gdb_test "set \$dl$i=d128" "" "set dl$i register"
 
-gdb_test "print \$dl$i" "\\\$$decimal = 1\.2345678910" "Print dl$i register as DFP"
+gdb_test "print \$dl$i" "\\\$$decimal = 1\.2345678910" "print dl$i register as DFP"
 
 gdb_test "info reg dl$i" \
 	 "dl$i\[ \]*1\.2345678910\[\t\]*\\(raw 0x2205800000000000000000049c5de09c\\)" \
diff --git a/gdb/testsuite/gdb.arch/vsx-regs.exp b/gdb/testsuite/gdb.arch/vsx-regs.exp
index 31e58e6..6c708e1 100644
--- a/gdb/testsuite/gdb.arch/vsx-regs.exp
+++ b/gdb/testsuite/gdb.arch/vsx-regs.exp
@@ -199,9 +199,9 @@ if { $core_loaded == -1 } {
 }
 
 for {set i 0} {$i < 32} {incr i 1} {
-    gdb_test "info reg vs$i" "vs$i.*$vector_register2" "Restore vs$i from core file"
+    gdb_test "info reg vs$i" "vs$i.*$vector_register2" "restore vs$i from core file"
 }
 
 for {set i 32} {$i < 64} {incr i 1} {
-    gdb_test "info reg vs$i" "vs$i.*$vector_register3" "Restore vs$i from core file"
+    gdb_test "info reg vs$i" "vs$i.*$vector_register3" "restore vs$i from core file"
 }
diff --git a/gdb/testsuite/gdb.base/bfp-test.exp b/gdb/testsuite/gdb.base/bfp-test.exp
index 4b39d39..91c7e51 100644
--- a/gdb/testsuite/gdb.base/bfp-test.exp
+++ b/gdb/testsuite/gdb.base/bfp-test.exp
@@ -35,14 +35,14 @@ gdb_breakpoint [gdb_get_line_number "return"]
 gdb_continue_to_breakpoint "return"
 
 # Print the original value of b32, b64 and b128.
-gdb_test "print b32" ".*1 = 1\.5.*" "The original value of b32 is 1.5"
-gdb_test "print b64" ".*2 = 2\.25.*" "The original value of b64 is 2.25"
-gdb_test "print b128" ".*3 = 3\.375.*" "The original value of b128 is 3.375"
+gdb_test "print b32" ".*1 = 1\.5.*" "the original value of b32 is 1.5"
+gdb_test "print b64" ".*2 = 2\.25.*" "the original value of b64 is 2.25"
+gdb_test "print b128" ".*3 = 3\.375.*" "the original value of b128 is 3.375"
 
 # Test that gdb could correctly recognize float constant expression with a suffix. 
-gdb_test "print b32=-1.5f" ".*4 = -1\.5.*" "Try to change b32 to -1.5 with 'print b32=-1.5f'"
-gdb_test "print b64=-2.25f" ".*5 = -2\.25.*" "Try to change b64 to -2.25 with 'print b64=-2.25f'"
-gdb_test "print b128=-3.375l" ".*6 = -3\.375.*" "Try to change b128 to -3.375 with 'print b128=-3.375l'"
+gdb_test "print b32=-1.5f" ".*4 = -1\.5.*" "try to change b32 to -1.5 with 'print b32=-1.5f'"
+gdb_test "print b64=-2.25f" ".*5 = -2\.25.*" "try to change b64 to -2.25 with 'print b64=-2.25f'"
+gdb_test "print b128=-3.375l" ".*6 = -3\.375.*" "try to change b128 to -3.375 with 'print b128=-3.375l'"
 
 # Test that gdb could handle the above correctly with "set var" command.
 set test "set variable b32 = 10.5f"
@@ -75,9 +75,9 @@ gdb_test_multiple "set var b128=30.375l" "$test" {
     }
 }
 
-gdb_test "print b32" ".*7 = 10\.5.*" "The value of b32 is changed to 10.5"
-gdb_test "print b64" ".*8 = 20\.25.*" "The value of b64 is changed to 20.25"
-gdb_test "print b128" ".*9 = 30\.375.*" "The value of b128 is changed to 30.375"
+gdb_test "print b32" ".*7 = 10\.5.*" "the value of b32 is changed to 10.5"
+gdb_test "print b64" ".*8 = 20\.25.*" "the value of b64 is changed to 20.25"
+gdb_test "print b128" ".*9 = 30\.375.*" "the value of b128 is changed to 30.375"
 
 # Test that gdb could handle invalid suffix correctly.
 
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index f111d58..26636a6 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -420,7 +420,7 @@ delete_breakpoints
 # test temporary breakpoint at function
 #
 
-gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
+gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "temporary breakpoint function"
 
 #
 # test break at function in file
@@ -436,7 +436,7 @@ gdb_test "tbreak $bp_location1" \
     "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location1.*" \
     "Temporary breakpoint line number #1"
 
-gdb_test "tbreak $bp_location6" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "Temporary breakpoint line number #2"
+gdb_test "tbreak $bp_location6" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "temporary breakpoint line number #2"
 
 #
 # test break at line number in file
@@ -670,7 +670,7 @@ proc test_next_with_recursion {} {
     global decimal
     global binfile
 
-    gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
+    gdb_test "kill" "" "kill program" "kill the program being debugged.*y or n. $" "y"
     delete_breakpoints
 
     gdb_test "break factorial" "Breakpoint $decimal at .*" "break at factorial"
diff --git a/gdb/testsuite/gdb.base/breakpoint-shadow.exp b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
index 610a21c..edf4b3b 100644
--- a/gdb/testsuite/gdb.base/breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
@@ -41,8 +41,8 @@ gdb_test_multiple "disass main" $test {
     }
 }
 
-gdb_test "b [gdb_get_line_number "break-first"]" "Breakpoint \[0-9\] at .*" "First breakpoint placed"
-gdb_test "b [gdb_get_line_number "break-second"]" "Breakpoint \[0-9\] at .*" "Second breakpoint placed"
+gdb_test "b [gdb_get_line_number "break-first"]" "Breakpoint \[0-9\] at .*" "first breakpoint placed"
+gdb_test "b [gdb_get_line_number "break-second"]" "Breakpoint \[0-9\] at .*" "second breakpoint placed"
 
 # Disassemble main, and compare the output to the original output
 # before breakpoints were inserted.  TEST is used as test message.
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index 8fa016a..47c0b25 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -101,7 +101,7 @@ proc do_function_calls {} {
 
 	gdb_test "p t_float_values2(3.14159,float_val2)" " = 1"
 
-	gdb_test "p t_float_many_args (float_val1, float_val2, float_val3, float_val4, float_val5, float_val6, float_val7, float_val8, float_val9, float_val10, float_val11, float_val12, float_val13, float_val14, float_val15)" " = 1" "Call function with many float arguments."
+	gdb_test "p t_float_many_args (float_val1, float_val2, float_val3, float_val4, float_val5, float_val6, float_val7, float_val8, float_val9, float_val10, float_val11, float_val12, float_val13, float_val14, float_val15)" " = 1" "call function with many float arguments."
 
 	gdb_test "p t_small_values(1,2,3,4,5,6,7,8,9,10)" " = 55"
 
@@ -111,7 +111,7 @@ proc do_function_calls {} {
 	gdb_test "p t_double_values(45.654,double_val2)" " = 1"
 	gdb_test "p t_double_values(double_val1,-67.66)" " = 1"
 
-	gdb_test "p t_double_many_args (double_val1, double_val2, double_val3, double_val4, double_val5, double_val6, double_val7, double_val8, double_val9, double_val10, double_val11, double_val12, double_val13, double_val14, double_val15)" " = 1" "Call function with many double arguments."
+	gdb_test "p t_double_many_args (double_val1, double_val2, double_val3, double_val4, double_val5, double_val6, double_val7, double_val8, double_val9, double_val10, double_val11, double_val12, double_val13, double_val14, double_val15)" " = 1" "call function with many double arguments."
 
 	gdb_test "p t_double_int(99.0, 1)" " = 0"
 	gdb_test "p t_double_int(99.0, 99)" " = 1"
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 44d5502..a376461 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -592,7 +592,7 @@ gdb_test "print 'a' == 'a' || 'b' == 'b'" \
 
 proc string_display { var_name set_prefix x_size x_type} {
   gdb_test_no_output "set ${var_name} = ${set_prefix}\"Test String\\0with zeroes\"" "Assign ${var_name} with prefix ${set_prefix}"
-  gdb_test "x /2${x_size}s ${var_name}" ".*\t${x_type}\"Test String\"\[\r\n\]+.*\t${x_type}\"with zeroes\"" "Display String ${var_name} with x/${x_size}s"
+  gdb_test "x /2${x_size}s ${var_name}" ".*\t${x_type}\"Test String\"\[\r\n\]+.*\t${x_type}\"with zeroes\"" "display String ${var_name} with x/${x_size}s"
 }
 
 if {$ucs2_ok} {
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index ee7bd38..8c06e8c 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -476,14 +476,14 @@ proc_with_prefix deprecated_command_test {} {
     gdb_test "p 5" \
 	    "Warning: 'p', an alias for the command 'print' is deprecated.*Use 'new_p'.*" \
 	    "p deprecated warning, with replacement"
-    gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away /1/"
+    gdb_test "p 5" ".\[0-9\]* = 5.*" "deprecated warning goes away /1/"
 
     gdb_test_no_output "maintenance deprecate p \"new_p\"" "maintenance deprecate p \"new_p\" /2/"
     gdb_test_no_output "maintenance deprecate print \"new_print\"" 
     gdb_test "p 5" \
 	    "Warning: command 'print' \\(p\\) is deprecated.*Use 'new_print'.*" \
 	    "both alias and command are deprecated"
-    gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away /2/"
+    gdb_test "p 5" ".\[0-9\]* = 5.*" "deprecated warning goes away /2/"
 
     gdb_test_no_output "maintenance deprecate set remote memory-read-packet-size \"srm\" " \
 	    "deprecate long command /1/"
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 10a4572..b72ccf5 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -717,7 +717,7 @@ gdb_expect {
 }
 
 # Empty COMMAND sends no newline while " " sends the newline we need.
-gdb_test " " "Source directories searched: .*" "Glob remaining of directory test"
+gdb_test " " "Source directories searched: .*" "glob remaining of directory test"
 
 gdb_test "complete file ./gdb.base/compl" \
     "file ./gdb.base/completion\\.exp.*" \
diff --git a/gdb/testsuite/gdb.base/dfp-test.exp b/gdb/testsuite/gdb.base/dfp-test.exp
index 81605be..370e90c 100644
--- a/gdb/testsuite/gdb.base/dfp-test.exp
+++ b/gdb/testsuite/gdb.base/dfp-test.exp
@@ -223,17 +223,17 @@ gdb_test "backtrace" ".*arg0_128 \\(arg0=0.1, arg1=1.0, arg2=2.0, arg3=3.0, arg4
 
 # Test calling inferior function with DFP arguments or return value.
 
-gdb_test "call arg0_32 (1.2df, 2.2df, 3.2df, 4.2df, 5.2df, 6.2df)" "Breakpoint.*arg0_32.*" "Call function with correct _Decimal32 arguments."
-gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_32 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "Backtrace function with correct _Decimal32 arguments."
-gdb_test "finish" " = 1.2" "Correct _Decimal32 return value from called function."
+gdb_test "call arg0_32 (1.2df, 2.2df, 3.2df, 4.2df, 5.2df, 6.2df)" "Breakpoint.*arg0_32.*" "call function with correct _Decimal32 arguments."
+gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_32 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "backtrace function with correct _Decimal32 arguments."
+gdb_test "finish" " = 1.2" "correct _Decimal32 return value from called function."
 
-gdb_test "call arg0_64 (1.2dd, 2.2dd, 3.2dd, 4.2dd, 5.2dd, 6.2dd)" "Breakpoint.*arg0_64.*" "Call function with correct _Decimal64 arguments."
-gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_64 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "Backtrace function with correct _Decimal64 arguments."
-gdb_test "finish" " = 1.2" "Correct _Decimal64 return value from called function."
+gdb_test "call arg0_64 (1.2dd, 2.2dd, 3.2dd, 4.2dd, 5.2dd, 6.2dd)" "Breakpoint.*arg0_64.*" "call function with correct _Decimal64 arguments."
+gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_64 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "backtrace function with correct _Decimal64 arguments."
+gdb_test "finish" " = 1.2" "correct _Decimal64 return value from called function."
 
-gdb_test "call arg0_128 (1.2dl, 2.2dl, 3.2dl, 4.2dl, 5.2dl, 6.2dl)" "Breakpoint.*arg0_128.*" "Call function with correct _Decimal128 arguments."
-gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_128 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "Backtrace function with correct _Decimal128 arguments."
-gdb_test "finish" " = 1.2" "Correct _Decimal128 return value from called function."
+gdb_test "call arg0_128 (1.2dl, 2.2dl, 3.2dl, 4.2dl, 5.2dl, 6.2dl)" "Breakpoint.*arg0_128.*" "call function with correct _Decimal128 arguments."
+gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_128 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "backtrace function with correct _Decimal128 arguments."
+gdb_test "finish" " = 1.2" "correct _Decimal128 return value from called function."
 
 gdb_test "call decimal_dec128_align (double_val1, dec128_val2, double_val3, double_val4, double_val5, double_val6, double_val7, double_val8, double_val9, double_val10, double_val11, double_val12, double_val13, double_val14)" " = 1" \
   "Call function with mixed decimal float arguments TEST."
diff --git a/gdb/testsuite/gdb.base/echo.exp b/gdb/testsuite/gdb.base/echo.exp
index 759b4eb..b84d2d5 100644
--- a/gdb/testsuite/gdb.base/echo.exp
+++ b/gdb/testsuite/gdb.base/echo.exp
@@ -22,4 +22,4 @@ gdb_start
 # test the echo command
 #
 
-gdb_test "echo Hello world!\\n" "Hello world!" "Echo test"
+gdb_test "echo Hello world!\\n" "Hello world!" "echo test"
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 37bb39e..f94ee4b 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -74,8 +74,8 @@ gdb_test_multiple "info line ending-run.c:$break1_line" "" {
     -re ".*address (0x\[0-9a-fA-F]*).*$gdb_prompt $" {
         set line_nine $expect_out(1,string)
         gdb_test "b ending-run.c:$break1_line" ".*Breakpoint 6.*ending-run.c, line $break1_line.*"
-        gdb_test "b *$line_nine" ".*Note.*also.*Breakpoint 7.*" "Breakpoint 7 at *ending-run.c:$break1_line"
-        gdb_test "cle" ".*Deleted breakpoints 4 6 7.*" "Clear 2 by default"
+        gdb_test "b *$line_nine" ".*Note.*also.*Breakpoint 7.*" "breakpoint 7 at *ending-run.c:$break1_line"
+        gdb_test "cle" ".*Deleted breakpoints 4 6 7.*" "clear 2 by default"
     }
     -re ".*$gdb_prompt $" {
         fail "need to fix test for new compile outcome"
diff --git a/gdb/testsuite/gdb.base/eval.exp b/gdb/testsuite/gdb.base/eval.exp
index 8cda630..f47e7e3 100644
--- a/gdb/testsuite/gdb.base/eval.exp
+++ b/gdb/testsuite/gdb.base/eval.exp
@@ -18,5 +18,5 @@ gdb_start
 
 gdb_test_no_output "set \$a = 10" "Initialize \$a."
 
-gdb_test "eval \"echo %d\\n\", \$a++" "10" "First eval."
-gdb_test "eval \"echo %d\\n\", \$a*2" "22" "Second eval."
+gdb_test "eval \"echo %d\\n\", \$a++" "10" "first eval."
+gdb_test "eval \"echo %d\\n\", \$a*2" "22" "second eval."
diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.exp b/gdb/testsuite/gdb.base/expand-psymtabs.exp
index 1097d4b..59b10d5 100644
--- a/gdb/testsuite/gdb.base/expand-psymtabs.exp
+++ b/gdb/testsuite/gdb.base/expand-psymtabs.exp
@@ -44,5 +44,5 @@ if {[prepare_for_testing_full $testfile.exp \
 }
 
 set foo_bp [gdb_get_line_number "Break here"]
-gdb_test "break $foo_bp" "Breakpoint.*" "Expand psymtabs"
+gdb_test "break $foo_bp" "Breakpoint.*" "expand psymtabs"
 
diff --git a/gdb/testsuite/gdb.base/float128.exp b/gdb/testsuite/gdb.base/float128.exp
index 5907a46..a0ec4f3 100644
--- a/gdb/testsuite/gdb.base/float128.exp
+++ b/gdb/testsuite/gdb.base/float128.exp
@@ -42,13 +42,13 @@ gdb_breakpoint [gdb_get_line_number "return"]
 gdb_continue_to_breakpoint "return"
 
 # Print the original value of ld and f128
-gdb_test "print ld" ".* = 1\\.375.*" "The original value of ld is 1.375"
-gdb_test "print f128" ".* = 2\\.375.*" "The original value of f128 is 2.375"
+gdb_test "print ld" ".* = 1\\.375.*" "the original value of ld is 1.375"
+gdb_test "print f128" ".* = 2\\.375.*" "the original value of f128 is 2.375"
 
 # Test that gdb could correctly recognize float constant expression with a suffix.
 # FIXME: gdb does not yet recognize the GNU extension 'q' suffix for __float128 constants.
-gdb_test "print ld=-1.375l" ".* = -1\\.375.*" "Try to change ld to -1.375 with 'print ld=-1.375l'"
-gdb_test "print f128=-2.375l" ".* = -2\\.375.*" "Try to change f128 to -2.375 with 'print f128=-2.375l'"
+gdb_test "print ld=-1.375l" ".* = -1\\.375.*" "try to change ld to -1.375 with 'print ld=-1.375l'"
+gdb_test "print f128=-2.375l" ".* = -2\\.375.*" "try to change f128 to -2.375 with 'print f128=-2.375l'"
 
 # Test that gdb could handle the above correctly with "set var" command.
 set test "set variable ld=10.375l"
@@ -71,6 +71,6 @@ gdb_test_multiple "set var f128=20.375l" "$test" {
     }
 }
 
-gdb_test "print ld" ".* = 10\\.375.*" "The value of ld is changed to 10.375"
-gdb_test "print f128" ".* = 20\\.375.*" "The value of f128 is changed to 20.375"
+gdb_test "print ld" ".* = 10\\.375.*" "the value of ld is changed to 10.375"
+gdb_test "print f128" ".* = 20\\.375.*" "the value of f128 is changed to 20.375"
 
diff --git a/gdb/testsuite/gdb.base/floatn.exp b/gdb/testsuite/gdb.base/floatn.exp
index 0a8b4ff..aa8fddc 100644
--- a/gdb/testsuite/gdb.base/floatn.exp
+++ b/gdb/testsuite/gdb.base/floatn.exp
@@ -42,19 +42,19 @@ gdb_breakpoint [gdb_get_line_number "return"]
 gdb_continue_to_breakpoint "return"
 
 # Print the original values of f32, f64, f128, f32x, f64x.
-gdb_test "print f32" ".* = 1\\.5.*" "The original value of f32 is 1.5"
-gdb_test "print f64" ".* = 2\\.25.*" "The original value of f64 is 2.25"
-gdb_test "print f128" ".* = 3\\.375.*" "The original value of f128 is 3.375"
-gdb_test "print f32x" ".* = 10\\.5.*" "The original value of f32x is 10.5"
-gdb_test "print f64x" ".* = 20\\.25.*" "The original value of f64x is 20.25"
+gdb_test "print f32" ".* = 1\\.5.*" "the original value of f32 is 1.5"
+gdb_test "print f64" ".* = 2\\.25.*" "the original value of f64 is 2.25"
+gdb_test "print f128" ".* = 3\\.375.*" "the original value of f128 is 3.375"
+gdb_test "print f32x" ".* = 10\\.5.*" "the original value of f32x is 10.5"
+gdb_test "print f64x" ".* = 20\\.25.*" "the original value of f64x is 20.25"
 
 # Test that gdb could correctly recognize float constant expression with a suffix.
 # FIXME: gdb does not yet recognize the suffix for _FloatN/_FloatNx types.
-gdb_test "print f32=-1.5" ".* = -1\\.5.*" "Try to change f32 to -1.5 with 'print f32=-1.5'"
-gdb_test "print f64=-2.25" ".* = -2\\.25.*" "Try to change f64 to -2.25 with 'print f64=-2.25'"
-gdb_test "print f128=-3.375" ".* = -3\\.375.*" "Try to change f128 to -3.375 with 'print f128=-3.375'"
-gdb_test "print f32x=-10.5" ".* = -10\\.5.*" "Try to change f32x to -10.5 with 'print f32=-1.5x'"
-gdb_test "print f64x=-20.25" ".* = -20\\.25.*" "Try to change f64x to -20.25 with 'print f64=-2.25x'"
+gdb_test "print f32=-1.5" ".* = -1\\.5.*" "try to change f32 to -1.5 with 'print f32=-1.5'"
+gdb_test "print f64=-2.25" ".* = -2\\.25.*" "try to change f64 to -2.25 with 'print f64=-2.25'"
+gdb_test "print f128=-3.375" ".* = -3\\.375.*" "try to change f128 to -3.375 with 'print f128=-3.375'"
+gdb_test "print f32x=-10.5" ".* = -10\\.5.*" "try to change f32x to -10.5 with 'print f32=-1.5x'"
+gdb_test "print f64x=-20.25" ".* = -20\\.25.*" "try to change f64x to -20.25 with 'print f64=-2.25x'"
 
 # Test that gdb could handle the above correctly with "set var" command.
 set test "set variable f32 = 10.5"
@@ -107,18 +107,18 @@ gdb_test_multiple "set var f64x=200.25" "$test" {
     }
 }
 
-gdb_test "print f32" ".* = 10\\.5.*" "The value of f32 is changed to 10.5"
-gdb_test "print f64" ".* = 20\\.25.*" "The value of f64 is changed to 20.25"
-gdb_test "print f128" ".* = 30\\.375.*" "The value of f128 is changed to 30.375"
-gdb_test "print f32x" ".* = 100\\.5.*" "The value of f32x is changed to 100.5"
-gdb_test "print f64x" ".* = 200\\.25.*" "The value of f64x is changed to 200.25"
+gdb_test "print f32" ".* = 10\\.5.*" "the value of f32 is changed to 10.5"
+gdb_test "print f64" ".* = 20\\.25.*" "the value of f64 is changed to 20.25"
+gdb_test "print f128" ".* = 30\\.375.*" "the value of f128 is changed to 30.375"
+gdb_test "print f32x" ".* = 100\\.5.*" "the value of f32x is changed to 100.5"
+gdb_test "print f64x" ".* = 200\\.25.*" "the value of f64x is changed to 200.25"
 
 # Print the original values of c32, c64, c128, c32x, c64x.
-gdb_test "print c32" ".* = 1\\.5 \\+ 1 \\* I.*" "The original value of c32 is 1.5 + 1 * I"
-gdb_test "print c64" ".* = 2\\.25 \\+ 1 \\* I.*" "The original value of c64 is 2.25 + 1 * I"
-gdb_test "print c128" ".* = 3\\.375 \\+ 1 \\* I.*" "The original value of c128 is 3.375 + 1 * I"
-gdb_test "print c32x" ".* = 10\\.5 \\+ 1 \\* I.*" "The original value of c32x is 10.5 + 1 * I"
-gdb_test "print c64x" ".* = 20\\.25 \\+ 1 \\* I.*" "The original value of c64x is 20.25 + 1 * I"
+gdb_test "print c32" ".* = 1\\.5 \\+ 1 \\* I.*" "the original value of c32 is 1.5 + 1 * I"
+gdb_test "print c64" ".* = 2\\.25 \\+ 1 \\* I.*" "the original value of c64 is 2.25 + 1 * I"
+gdb_test "print c128" ".* = 3\\.375 \\+ 1 \\* I.*" "the original value of c128 is 3.375 + 1 * I"
+gdb_test "print c32x" ".* = 10\\.5 \\+ 1 \\* I.*" "the original value of c32x is 10.5 + 1 * I"
+gdb_test "print c64x" ".* = 20\\.25 \\+ 1 \\* I.*" "the original value of c64x is 20.25 + 1 * I"
 
 # FIXME: GDB cannot parse non-trivial complex constants yet.
 
diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp
index af417ca..2c6e379 100644
--- a/gdb/testsuite/gdb.base/foll-exec-mode.exp
+++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp
@@ -164,7 +164,7 @@ proc do_follow_exec_mode_tests { mode cmd infswitch } {
 	} elseif {$infswitch == "infswitch"} {
 	    # Two inferiors, we have switched to the original program.
 	    set expected_inf $testfile
-	    gdb_test "inferior 1" "Switching to inferior 1.*$testfile.*" "Switch inferiors"
+	    gdb_test "inferior 1" "Switching to inferior 1.*$testfile.*" "switch inferiors"
 	} else {
 	    # Two inferiors, run the execd program
 	    set expected_inf $testfile2
diff --git a/gdb/testsuite/gdb.base/gdb1056.exp b/gdb/testsuite/gdb.base/gdb1056.exp
index c960576..cff9787 100644
--- a/gdb/testsuite/gdb.base/gdb1056.exp
+++ b/gdb/testsuite/gdb.base/gdb1056.exp
@@ -39,5 +39,5 @@ gdb_test_multiple "print 1/0" "" {
 	kfail "gdb/1056" "print 1/0"
     }
 }
-gdb_test "print 1U/0" ".*Division by zero.*" "Test unsigned division by zero"
+gdb_test "print 1U/0" ".*Division by zero.*" "test unsigned division by zero"
 
diff --git a/gdb/testsuite/gdb.base/gdb11531.exp b/gdb/testsuite/gdb.base/gdb11531.exp
index 3ed5a0b..0aea181 100644
--- a/gdb/testsuite/gdb.base/gdb11531.exp
+++ b/gdb/testsuite/gdb.base/gdb11531.exp
@@ -50,7 +50,7 @@ delete_breakpoints
 
 set nl "\[\r\n\]+"
 
-gdb_test "watch myrec.x" ".*atchpoint \[0-9\]+: myrec\.x" "Set watchpoint"
+gdb_test "watch myrec.x" ".*atchpoint \[0-9\]+: myrec\.x" "set watchpoint"
 
 gdb_test "next" \
     ".*${nl}.*atchpoint \[0-9\]+: myrec\.x${nl}Old value = 0${nl}New value = 5${nl}.*" \
diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/gdb.base/kill-after-signal.exp
index 4181bec..69b27e7 100644
--- a/gdb/testsuite/gdb.base/kill-after-signal.exp
+++ b/gdb/testsuite/gdb.base/kill-after-signal.exp
@@ -37,4 +37,4 @@ if ![runto_main] {
 
 gdb_test "continue" "Program received signal SIGUSR1, .*"
 gdb_test "stepi" "\r\nhandler .*"
-gdb_test "kill" "^y" "kill" "Kill the program being debugged\\? \\(y or n\\) $" "y"
+gdb_test "kill" "^y" "kill" "kill the program being debugged\\? \\(y or n\\) $" "y"
diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index 1eaaa71..c2e113b 100644
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -149,13 +149,13 @@ gdb_test_no_output "set detach off" "set detach off"
 #
 
 for {set i 1} {$i <= 15} {incr i} {
-  gdb_test "continue" "Breakpoint .* main .*exit.*" "Run to exit $i"
+  gdb_test "continue" "Breakpoint .* main .*exit.*" "run to exit $i"
   gdb_test "info inferior" " 2 .* 3 .* 4 .* 5 .*" "info inferior $i"
   gdb_test "inferior $i + 1" "(_dl_sysinfo_int80|fork|__kernel_(v|)syscall).*" \
       "inferior $i"
 }
 
-gdb_test "continue" "Breakpoint .* main .*exit.*" "Run to exit 16"
+gdb_test "continue" "Breakpoint .* main .*exit.*" "run to exit 16"
 gdb_test "info inferior" " 2 .* 3 .* 4 .* 5 .*" "info inferior 16"
 gdb_test "inferior 2" " main .*" "restart final"
 
@@ -168,10 +168,10 @@ gdb_test "inferior 2" " main .*" "restart final"
 # 
 
 # [assumes we're at #1]
-gdb_test "detach inferior 2" "Detaching .*" "Detach 2"
-gdb_test "detach inferior 3" "Detaching .*" "Detach 3"
-gdb_test "detach inferior 4" "Detaching .*" "Detach 4"
-gdb_test "detach inferior 5" "Detaching .*" "Detach 5"
+gdb_test "detach inferior 2" "Detaching .*" "detach 2"
+gdb_test "detach inferior 3" "Detaching .*" "detach 3"
+gdb_test "detach inferior 4" "Detaching .*" "detach 4"
+gdb_test "detach inferior 5" "Detaching .*" "detach 5"
 
 # 
 # Test kill inferior
@@ -179,7 +179,7 @@ gdb_test "detach inferior 5" "Detaching .*" "Detach 5"
 
 for {set i 6} { $i <= 16} {incr i} {
     gdb_test_no_output "kill inferior $i" "Kill $i"
-    gdb_test "info inferior $i" "<null>.*" "Did kill $i"
+    gdb_test "info inferior $i" "<null>.*" "did kill $i"
 }
 
 return 0
diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp
index 45b8670..b76f445 100644
--- a/gdb/testsuite/gdb.base/overlays.exp
+++ b/gdb/testsuite/gdb.base/overlays.exp
@@ -67,7 +67,7 @@ set iptrcast [string_to_regexp "(int *)"]
 set hexx "0x\[0-9abcdefABCDEF\]+"
 
 gdb_test_no_output "overlay manual"
-gdb_test "overlay list" "No sections are mapped." "List with none mapped"
+gdb_test "overlay list" "No sections are mapped." "list with none mapped"
 
 # capture the LMA addresses of [foo bar baz grbx foox barx bazx grbxx]
 
@@ -113,39 +113,39 @@ if $data_overlays then {
 # capture the VMA addresses of [foo bar baz grbx foox barx bazx grbxx]
 
 gdb_test "overlay map .ovly0" "" 
-gdb_test "overlay list" "Section .ovly0, loaded at.*, mapped at.*" "List ovly0"
+gdb_test "overlay list" "Section .ovly0, loaded at.*, mapped at.*" "list ovly0"
 set foo_vma [get_func_address "foo"  "foo"  "foo  runtime address"]
 
 gdb_test "overlay map .ovly1" "" 
-gdb_test "overlay list" "Section .ovly1, loaded at.*, mapped at.*" "List ovly1"
+gdb_test "overlay list" "Section .ovly1, loaded at.*, mapped at.*" "list ovly1"
 set bar_vma [get_func_address "bar"  "bar"  "bar  runtime address"]
 
 gdb_test "overlay map .ovly2" "" 
-gdb_test "overlay list" "Section .ovly2, loaded at.*, mapped at.*" "List ovly2"
+gdb_test "overlay list" "Section .ovly2, loaded at.*, mapped at.*" "list ovly2"
 set baz_vma [get_func_address "baz"  "baz"  "baz  runtime address"]
 
 gdb_test "overlay map .ovly3" "" 
-gdb_test "overlay list" "Section .ovly3, loaded at.*, mapped at.*" "List ovly3"
+gdb_test "overlay list" "Section .ovly3, loaded at.*, mapped at.*" "list ovly3"
 set grbx_vma [get_func_address "grbx" "grbx" "grbx runtime address"]
 
 if $data_overlays then {
     gdb_test "overlay map .data00" "" 
-    gdb_test "overlay list" "Section .data00, loaded .*, mapped .*" "List data00"
+    gdb_test "overlay list" "Section .data00, loaded .*, mapped .*" "list data00"
     gdb_test "print \$foox_vma = &foox" \
 	".* $iptrcast 0x.*"  "foox runtime addr"
 
     gdb_test "overlay map .data01" "" 
-    gdb_test "overlay list" "Section .data01, loaded .*, mapped .*" "List data01"
+    gdb_test "overlay list" "Section .data01, loaded .*, mapped .*" "list data01"
     gdb_test "print \$barx_vma = &barx" \
 	".* $iptrcast 0x.*"  "barx runtime addr"
 
     gdb_test "overlay map .data02" "" 
-    gdb_test "overlay list" "Section .data02, loaded .*, mapped .*" "List data02"
+    gdb_test "overlay list" "Section .data02, loaded .*, mapped .*" "list data02"
     gdb_test "print \$bazx_vma = &bazx" \
 	".* $iptrcast 0x.*"  "bazx runtime addr"
 
     gdb_test "overlay map .data03" "" 
-    gdb_test "overlay list" "Section .data03, loaded .*, mapped .*" "List data03"
+    gdb_test "overlay list" "Section .data03, loaded .*, mapped .*" "list data03"
     gdb_test "print \$grbxx_vma = &grbxx" \
 	".* $iptrcast 0x.*"  "grbxx runtime addr"
 }
@@ -216,7 +216,7 @@ if $data_overlays then {
 # test automatic mode
 
 gdb_test_no_output "overlay auto"
-gdb_test "overlay list" "No sections are mapped." "List none mapped (auto)"
+gdb_test "overlay list" "No sections are mapped." "list none mapped (auto)"
 gdb_test "break foo"  "Breakpoint .*at .*file .*foo.c.*"  "break foo"
 gdb_test "break bar"  "Breakpoint .*at .*file .*bar.c.*"  "break bar"
 gdb_test "break baz"  "Breakpoint .*at .*file .*baz.c.*"  "break baz"
diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index ea913f1..a1b497c 100644
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -244,8 +244,8 @@ gdb_test "continue" \
 # be 3 then.
 #
 
-gdb_test "disable 7" "" "Disable other breakpoints"
-gdb_test "disable 5" "" "Disable other breakpoints"
+gdb_test "disable 7" "" "disable other breakpoints"
+gdb_test "disable 5" "" "disable other breakpoints"
 
 gdb_test "continue" \
 	 ".*Breakpoint.*pendfunc1.*\\\(x=3\\\) at.*pendshr.c:$bp3_loc.*printf.*;" \
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index 4ac235e..aae7c70 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -227,7 +227,7 @@ delete_breakpoints
 # test temporary breakpoint at function
 #
 
-gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
+gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "temporary breakpoint function"
 
 #
 # test break at function in file
@@ -480,7 +480,7 @@ proc test_next_with_recursion {} {
     global decimal
     global binfile
 
-    gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
+    gdb_test "kill" "" "kill program" "kill the program being debugged.*y or n. $" "y"
     delete_breakpoints
 
     gdb_test "break factorial" "Breakpoint $decimal at .*" "break at factorial"
diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp
index 557eba9..51373b3 100644
--- a/gdb/testsuite/gdb.base/testenv.exp
+++ b/gdb/testsuite/gdb.base/testenv.exp
@@ -99,7 +99,7 @@ if { ![runto_main] } {
 set bp_line [gdb_get_line_number "set breakpoint here"]
 gdb_breakpoint  $bp_line
 
-gdb_test "show env" ".*TEST_GDB_GLOBAL=.*" "Test passing TEST_GDB_GLOBAL to GDB"
+gdb_test "show env" ".*TEST_GDB_GLOBAL=.*" "test passing TEST_GDB_GLOBAL to GDB"
 # First test with only inherited TEST_GDB_GLOBAL
 gdb_test "continue" \
   ".*TEST_GDB_GLOBAL=Global environment value.*Program found 1 variables starting with TEST_GDB.*" \
diff --git a/gdb/testsuite/gdb.base/valgrind-db-attach.exp b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
index fafc7f3..e195657 100644
--- a/gdb/testsuite/gdb.base/valgrind-db-attach.exp
+++ b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
@@ -92,4 +92,4 @@ gdb_test_no_output "set width 0"
 gdb_test "bt" "in main \\(.*\\) at .*${srcfile}:$double_free"
 
 # Explicitly kill the program so it doesn't dump core when we quit->detach.
-gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
+gdb_test "kill" "" "kill program" "kill the program being debugged.*y or n. $" "y"
diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp
index 7625722..839bf84 100644
--- a/gdb/testsuite/gdb.base/watch_thread_num.exp
+++ b/gdb/testsuite/gdb.base/watch_thread_num.exp
@@ -46,8 +46,8 @@ if { ![runto main] } then {
    return
 }
 
-gdb_test "watch shared_var thread 0" "Invalid thread ID: 0" "Watchpoint on invalid thread"
-gdb_test "watch shared_var thread" "A syntax error in expression, near `thread'\." "Invalid watch syntax"
+gdb_test "watch shared_var thread 0" "Invalid thread ID: 0" "watchpoint on invalid thread"
+gdb_test "watch shared_var thread" "A syntax error in expression, near `thread'\." "invalid watch syntax"
 
 set bpexitline [gdb_get_line_number "all threads started"]
 gdb_breakpoint "$bpexitline"
@@ -56,7 +56,7 @@ gdb_continue_to_breakpoint "all threads started"
 gdb_test "break loop" "Breakpoint \[0-9\].*" \
   "Set breakpoint at loop"
 
-gdb_test "continue" ".*Breakpoint .*loop.*" "Stopped in loop"
+gdb_test "continue" ".*Breakpoint .*loop.*" "stopped in loop"
 
 gdb_test_multiple "thread" "Thread command" {
     -re ".*Current thread is (\[0-9\]*).*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
index 7a95eea..d3b7eb6 100644
--- a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
@@ -36,7 +36,7 @@ gdb_breakpoint [gdb_get_line_number "watchpoint-here"]
 gdb_continue_to_breakpoint "Place to set the watchpoint"
 
 # The condition `c == 30' is the subject being tested.
-gdb_test "watch c if c == 30" "atchpoint \[0-9\]*.*" "Place the watchpoint"
+gdb_test "watch c if c == 30" "atchpoint \[0-9\]*.*" "place the watchpoint"
 
 # We may stay either in the function itself or only at the first instruction of
 # its caller depending on the epilogue unwinder (or valid epilogue CFI) presence.
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 6e262e9..fb20a0a 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -146,7 +146,7 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count
     }
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 1 time.*" "Watchpoint hit count is 1"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 1 time.*" "watchpoint hit count is 1"
 
     gdb_test_no_output "delete \$func1_breakpoint_number"
 
@@ -154,19 +154,19 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = 1.*ival3 = count; ival4 = count;.*" "watchpoint hit, second time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 2 times.*" "Watchpoint hit count is 2"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 2 times.*" "watchpoint hit count is 2"
 
     # Continue until the next change, from 1 to 2.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 1.*New value = 2.*ival3 = count; ival4 = count;.*" "watchpoint hit, third time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 3 times.*" "Watchpoint hit count is 3"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 3 times.*" "watchpoint hit count is 3"
     
     # Continue until the next change, from 2 to 3.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 2.*New value = 3.*ival3 = count; ival4 = count;.*" "watchpoint hit, fourth time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 4 times.*" "Watchpoint hit count is 4"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 4 times.*" "watchpoint hit count is 4"
 
     # Continue until the next change, from 3 to 4.
     # Note that this one is outside the loop.
@@ -174,7 +174,7 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 3.*New value = 4.*ival3 = count; ival4 = count;.*" "watchpoint hit, fifth time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "Watchpoint hit count is 5"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "watchpoint hit count is 5"
 
     # Continue until we hit the finishing marker function.
     # Make sure we hit no more watchpoints.
@@ -432,7 +432,7 @@ proc test_complex_watchpoint {} {
 	gdb_test "watch ptr1->val" ".*\[Ww\]atchpoint \[0-9\]*: ptr1->val"
 	gdb_test "break marker5" ".*Breakpoint.*"
 
-	gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ptr1->val.*Old value = 1.*New value = 2.*" "Test complex watchpoint"
+	gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ptr1->val.*Old value = 1.*New value = 2.*" "test complex watchpoint"
 
 	# Continue until we hit the marker5 function.
 	# Make sure we hit no more watchpoints.
diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp
index 6a4b753..f6cf24d 100644
--- a/gdb/testsuite/gdb.base/watchpoints.exp
+++ b/gdb/testsuite/gdb.base/watchpoints.exp
@@ -69,25 +69,25 @@ with_test_prefix "before inferior start" {
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count; ival4 = count;.*" "watchpoint hit, first time"
 
     # Check that the ival3 hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 1 time.*" "Watchpoint hit count is 1"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 1 time.*" "watchpoint hit count is 1"
 
     # Continue until the next change for ival1, from 0 to 1.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival1.*Old value = 0.*New value = 1.*ival1 = count; ival2 = count;.*" "watchpoint ival1 hit, second time"
 
     # Check that the hit count for ival1 is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival1\r\n\[ \t]+breakpoint already hit 2 times.*" "Watchpoint ival1 hit count is 2"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival1\r\n\[ \t]+breakpoint already hit 2 times.*" "watchpoint ival1 hit count is 2"
 
     # Continue until the next change for ival3, from 0 to 1.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = 1.*ival3 = count; ival4 = count;.*" "watchpoint hit, second time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 2 times.*" "Watchpoint hit count is 2"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 2 times.*" "watchpoint hit count is 2"
 
     # Continue until the next change, from 1 to 2.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival1.*Old value = 1.*New value = 2.*ival1 = count; ival2 = count;.*" "watchpoint ival1 hit, third time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival1\r\n\[ \t]+breakpoint already hit 3 times.*" "Watchpoint ival1 hit count is 3"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival1\r\n\[ \t]+breakpoint already hit 3 times.*" "watchpoint ival1 hit count is 3"
     # Disable ival1 watchpoint
     gdb_test_no_output "disable 2" ""
  
@@ -95,13 +95,13 @@ with_test_prefix "before inferior start" {
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 1.*New value = 2.*ival3 = count; ival4 = count;.*" "watchpoint hit, third time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 3 times.*" "Watchpoint hit count is 3"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 3 times.*" "watchpoint hit count is 3"
     
     # Continue until the next change, from 2 to 3.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 2.*New value = 3.*ival3 = count; ival4 = count;.*" "watchpoint hit, fourth time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 4 times.*" "Watchpoint hit count is 4"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 4 times.*" "watchpoint hit count is 4"
 
     # Continue until the next change, from 3 to 4.
     # Note that this one is outside the loop.
@@ -109,6 +109,6 @@ with_test_prefix "before inferior start" {
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 3.*New value = 4.*ival3 = count; ival4 = count;.*" "watchpoint hit, fifth time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "Watchpoint hit count is 5"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "watchpoint hit count is 5"
 
 set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.cp/arg-reference.exp b/gdb/testsuite/gdb.cp/arg-reference.exp
index 7da075a..e43ad94 100644
--- a/gdb/testsuite/gdb.cp/arg-reference.exp
+++ b/gdb/testsuite/gdb.cp/arg-reference.exp
@@ -30,4 +30,4 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-gdb_test "ptype foo" "type = int \\\(Obj\\\)" "No false reference"
+gdb_test "ptype foo" "type = int \\\(Obj\\\)" "no false reference"
diff --git a/gdb/testsuite/gdb.cp/baseenum.exp b/gdb/testsuite/gdb.cp/baseenum.exp
index 0a9343b..16de7d2 100644
--- a/gdb/testsuite/gdb.cp/baseenum.exp
+++ b/gdb/testsuite/gdb.cp/baseenum.exp
@@ -28,7 +28,7 @@ if {![runto_main]} {
 
 gdb_breakpoint [gdb_get_line_number "breakpoint 1" $srcfile]
 gdb_continue_to_breakpoint "breakpoint 1"
-gdb_test "print X" "= A::X" "Print enum constant X of class A"
+gdb_test "print X" "= A::X" "print enum constant X of class A"
 
 gdb_breakpoint [gdb_get_line_number "breakpoint 2" $srcfile]
 gdb_continue_to_breakpoint "breakpoint 2"
diff --git a/gdb/testsuite/gdb.cp/operator.exp b/gdb/testsuite/gdb.cp/operator.exp
index fce5c37..dc3d39a 100644
--- a/gdb/testsuite/gdb.cp/operator.exp
+++ b/gdb/testsuite/gdb.cp/operator.exp
@@ -33,7 +33,7 @@ gdb_test "p a == 'a'" "= 12" "global operator overload"
 # Test ADL operator
 gdb_test "p bc == 1" "= 22" "ADL operator"
 gdb_test "p bc == 'a'" "= 23" "ADL operator overload"
-gdb_test "p B::BD::operator== (bc,'a')" "= 24" "Fully qualified explicit operator call"
+gdb_test "p B::BD::operator== (bc,'a')" "= 24" "fully qualified explicit operator call"
 
 # Test operator imported from anonymous namespace
 gdb_test "p d == 1" "= 33" "anonymous namespace operator"
diff --git a/gdb/testsuite/gdb.cp/shadow.exp b/gdb/testsuite/gdb.cp/shadow.exp
index d6970ca..bdd02b2 100644
--- a/gdb/testsuite/gdb.cp/shadow.exp
+++ b/gdb/testsuite/gdb.cp/shadow.exp
@@ -39,7 +39,7 @@ if ![runto_main] then {
 gdb_breakpoint [gdb_get_line_number "marker1"]
 gdb_continue_to_breakpoint "marker1"
 
-gdb_test "print x" "= 33" "Print class x shadowing global x"
+gdb_test "print x" "= 33" "print class x shadowing global x"
 
 
 ############################################
@@ -49,7 +49,7 @@ gdb_test "print x" "= 33" "Print class x shadowing global x"
 gdb_breakpoint [gdb_get_line_number "marker2"]
 gdb_continue_to_breakpoint "marker2"
 
-gdb_test "print x" "= 44" "Print local x shadowing class x"
+gdb_test "print x" "= 44" "print local x shadowing class x"
 
 ############################################
 # Test inner scope x is printed not outer scope
@@ -57,7 +57,7 @@ gdb_test "print x" "= 44" "Print local x shadowing class x"
 gdb_breakpoint [gdb_get_line_number "marker3"]
 gdb_continue_to_breakpoint "marker3"
 
-gdb_test "print x" "= 55" "Print inner scope x"
+gdb_test "print x" "= 55" "print inner scope x"
 
 ############################################
 # Test printing local variable is not shadowed
@@ -66,7 +66,7 @@ gdb_test "print x" "= 55" "Print inner scope x"
 gdb_breakpoint [gdb_get_line_number "marker4"]
 gdb_continue_to_breakpoint "marker4"
 
-gdb_test "print x" "= 55" "Print local x not namespace x"
+gdb_test "print x" "= 55" "print local x not namespace x"
 
 ############################################
 # Test imported namespace element is printed
@@ -79,4 +79,4 @@ if { [test_compiler_info {gcc-[0-3]-*}] ||
     setup_xfail *-*-*
 }
 
-gdb_test "print x" "= 11" "Print imported namespace x"
+gdb_test "print x" "= 11" "print imported namespace x"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
index e7fee74..43f4992 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
@@ -46,16 +46,16 @@ gdb_test_no_output "set print frame-arguments all"
 
 # (1) int_param_single_reg_loc
 gdb_continue_to_breakpoint "Stop in breakpt for test int_param_single_reg_loc"
-gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?int_param_single_reg_loc \\(operand0=<optimized out>, operand1=0xdeadbe00deadbe01, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "Backtrace for test int_param_single_reg_loc"
+gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?int_param_single_reg_loc \\(operand0=<optimized out>, operand1=0xdeadbe00deadbe01, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "backtrace for test int_param_single_reg_loc"
 
 # (2) struct_param_single_reg_loc
 gdb_continue_to_breakpoint "Stop in breakpt for struct_param_single_reg_loc"
-gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?struct_param_single_reg_loc \\(operand0={a = 0xdeadbe00deadbe01, b = <optimized out>}, operand1={a = <optimized out>, b = 0xdeadbe04deadbe05}, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "Backtrace for test struct_param_single_reg_loc"
+gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?struct_param_single_reg_loc \\(operand0={a = 0xdeadbe00deadbe01, b = <optimized out>}, operand1={a = <optimized out>, b = 0xdeadbe04deadbe05}, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "backtrace for test struct_param_single_reg_loc"
 
 # (3) struct_param_two_reg_pieces
 gdb_continue_to_breakpoint "Stop in breakpt for struct_param_two_reg_pieces"
-gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?struct_param_two_reg_pieces \\(operand0={a = 0xdeadbe04deadbe05, b = <optimized out>}, operand1={a = <optimized out>, b = 0xdeadbe00deadbe01}, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "Backtrace for test struct_param_two_reg_pieces"
+gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?struct_param_two_reg_pieces \\(operand0={a = 0xdeadbe04deadbe05, b = <optimized out>}, operand1={a = <optimized out>, b = 0xdeadbe00deadbe01}, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "backtrace for test struct_param_two_reg_pieces"
 
 # (4) int_param_two_reg_pieces
 gdb_continue_to_breakpoint "Stop in breakpt for int_param_two_reg_pieces"
-gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?int_param_two_reg_pieces \\(operand0=<optimized out>, operand1=<optimized out>, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "Backtrace for test int_param_two_reg_pieces"
+gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?int_param_two_reg_pieces \\(operand0=<optimized out>, operand1=<optimized out>, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "backtrace for test int_param_two_reg_pieces"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
index f1f36a3..f103198 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
@@ -52,7 +52,7 @@ for {set f 0} {$f < 3} {incr f} {
     }
 
     # Select frame.
-    gdb_test "frame ${f}" "#${f}.*" "Switch to frame ${f}"
+    gdb_test "frame ${f}" "#${f}.*" "switch to frame ${f}"
 
     gdb_test "p/x \$rax" ".*$pattern_rax_rbx_rcx_print.*" \
 	"print \$rax in frame ${f}"
diff --git a/gdb/testsuite/gdb.go/chan.exp b/gdb/testsuite/gdb.go/chan.exp
index 52b88e6..be903a8 100644
--- a/gdb/testsuite/gdb.go/chan.exp
+++ b/gdb/testsuite/gdb.go/chan.exp
@@ -40,7 +40,7 @@ if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
     pass "setting breakpoint 1"
 }
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
 gdb_test_no_output "disable"
 
@@ -48,4 +48,4 @@ if { [gdb_breakpoint ${srcfile}:${bp_location2}] } {
     pass "setting breakpoint 2"
 }
 
-gdb_test "cont" "Breakpoint .*:${bp_location2}.*" "Going to second breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location2}.*" "going to second breakpoint"
diff --git a/gdb/testsuite/gdb.go/hello.exp b/gdb/testsuite/gdb.go/hello.exp
index 3efb78b..666567c 100644
--- a/gdb/testsuite/gdb.go/hello.exp
+++ b/gdb/testsuite/gdb.go/hello.exp
@@ -45,7 +45,7 @@ if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
     pass "setting breakpoint 1"
 }
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
 gdb_test "print st" \
     ".* = $hex \"Hello, world!\"" \
diff --git a/gdb/testsuite/gdb.go/integers.exp b/gdb/testsuite/gdb.go/integers.exp
index b823f5a..dd28f6d 100644
--- a/gdb/testsuite/gdb.go/integers.exp
+++ b/gdb/testsuite/gdb.go/integers.exp
@@ -39,20 +39,20 @@ if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
     pass "setting breakpoint 1"
 }
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
-gdb_test "print i" ".* = 0" "Print i before assigned to 1"
+gdb_test "print i" ".* = 0" "print i before assigned to 1"
 
-gdb_test "next" "i = 1" "Next to 'i = 1' line"
-gdb_test "next" "j = 2" "Next to 'j = 2' line"
+gdb_test "next" "i = 1" "next to 'i = 1' line"
+gdb_test "next" "j = 2" "next to 'j = 2' line"
 # At that point, 
 # i should be equal to 1
 gdb_test "print i" " = 1" 
 # but j should still be equal to zero
-gdb_test "print j" " = 0" "Test j value before assignment"
+gdb_test "print j" " = 0" "test j value before assignment"
 
-gdb_test "next" "k = 3" "Next to 'k = 3' line"
-gdb_test "next" "l = k" "Next to 'l = k' line"
+gdb_test "next" "k = 3" "next to 'k = 3' line"
+gdb_test "next" "l = k" "next to 'l = k' line"
 
 #j should be equal to 2
 gdb_test "print j" " = 2"
@@ -101,7 +101,7 @@ gdb_test "print i+10*j+100*k" " = 321"
 gdb_test " print (i + 5) * (j + 7)" " = 54"
 
 gdb_test "set var i = 2" " = 2"
-gdb_test "print i" " = 2" "Testing new i value"
+gdb_test "print i" " = 2" "testing new i value"
 
 if { [gdb_breakpoint ${srcfile}:${bp_location2}] } {
     pass "setting breakpoint 2"
diff --git a/gdb/testsuite/gdb.go/methods.exp b/gdb/testsuite/gdb.go/methods.exp
index ea6a894..cb7f55a 100644
--- a/gdb/testsuite/gdb.go/methods.exp
+++ b/gdb/testsuite/gdb.go/methods.exp
@@ -40,10 +40,10 @@ if { [gdb_breakpoint ${bp_location1}] } {
     pass "setting breakpoint 1"
 }
 setup_xfail "*-*-*" ;# mangling issues IIRC
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
 if { [gdb_breakpoint ${bp_location2}] } {
     pass "setting breakpoint 2"
 }
 setup_xfail "*-*-*" ;# mangling issues IIRC
-gdb_test "cont" "Breakpoint .*:${bp_location2_regexp}.*" "Going to second breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location2_regexp}.*" "going to second breakpoint"
diff --git a/gdb/testsuite/gdb.go/package.exp b/gdb/testsuite/gdb.go/package.exp
index 1d09f1c..fc5f85d 100644
--- a/gdb/testsuite/gdb.go/package.exp
+++ b/gdb/testsuite/gdb.go/package.exp
@@ -46,4 +46,4 @@ set bp_location1_regexp {package2[.]Foo.*package2[.]go:}
 if { [gdb_breakpoint ${bp_location1}] } {
     pass "setting breakpoint 1"
 }
-gdb_test "cont" "Breakpoint .*${bp_location1_regexp}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*${bp_location1_regexp}.*" "going to first breakpoint"
diff --git a/gdb/testsuite/gdb.guile/scm-parameter.exp b/gdb/testsuite/gdb.guile/scm-parameter.exp
index 7d1a920..1afdf83 100644
--- a/gdb/testsuite/gdb.guile/scm-parameter.exp
+++ b/gdb/testsuite/gdb.guile/scm-parameter.exp
@@ -52,9 +52,9 @@ gdb_test_multiline "Simple gdb boolean parameter" \
 
 with_test_prefix "test-param" {
     gdb_test "guile (print (parameter-value test-param))" "= #t" "parameter value (true)"
-    gdb_test "show print test-param" "The state of the Test Parameter is on." "Show parameter on"
+    gdb_test "show print test-param" "The state of the Test Parameter is on." "show parameter on"
     gdb_test_no_output "set print test-param off"
-    gdb_test "show print test-param" "The state of the Test Parameter is off." "Show parameter off"
+    gdb_test "show print test-param" "The state of the Test Parameter is off." "show parameter off"
     gdb_test "guile (print (parameter-value test-param))" "= #f" "parameter value (false)"
     gdb_test "help show print test-param" "Show the state of the boolean test-param.*" "show help"
     gdb_test "help set print test-param" "Set the state of the boolean test-param.*" "set help"
@@ -187,9 +187,9 @@ gdb_test_no_output "guile (register-parameter! prev-ambig)"
 
 with_test_prefix "previously-ambiguous" {
     gdb_test "guile (print (parameter-value prev-ambig))" "= #f" "parameter value (false)"
-    gdb_test "show print s" "Command is not documented is off." "Show parameter off"
+    gdb_test "show print s" "Command is not documented is off." "show parameter off"
     gdb_test_no_output "set print s on"
-    gdb_test "show print s" "Command is not documented is on." "Show parameter on"
+    gdb_test "show print s" "Command is not documented is on." "show parameter on"
     gdb_test "guile (print (parameter-value prev-ambig))" "= #t" "parameter value (true)"
     gdb_test "help show print s" "This command is not documented." "show help"
     gdb_test "help set print s" "This command is not documented." "set help"
diff --git a/gdb/testsuite/gdb.guile/scm-progspace.exp b/gdb/testsuite/gdb.guile/scm-progspace.exp
index 47d1c02..c9ae23a 100644
--- a/gdb/testsuite/gdb.guile/scm-progspace.exp
+++ b/gdb/testsuite/gdb.guile/scm-progspace.exp
@@ -73,8 +73,8 @@ with_test_prefix "program unloaded" {
 # deleted.  We need to, for example, delete an inferior to get the progspace
 # to go away.
 
-gdb_test "add-inferior" "Added inferior 2" "Create new inferior"
-gdb_test "inferior 2" ".*" "Switch to new inferior"
+gdb_test "add-inferior" "Added inferior 2" "create new inferior"
+gdb_test "inferior 2" ".*" "switch to new inferior"
 gdb_test_no_output "remove-inferiors 1" "Remove first inferior"
 
 with_test_prefix "inferior removed" {
diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
index 282a1ce..76ec990 100644
--- a/gdb/testsuite/gdb.guile/scm-value.exp
+++ b/gdb/testsuite/gdb.guile/scm-value.exp
@@ -290,7 +290,7 @@ proc test_value_after_death {} {
     gdb_test "kill" "" "kill the inferior" \
 	"Kill the program being debugged. .y or n. $" \
 	"y"
-    gdb_test "file" "" "Discard the symbols" \
+    gdb_test "file" "" "discard the symbols" \
 	"Discard symbol table from.*y or n. $" \
 	"y"
 
diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 668572c..1a27733 100644
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -101,7 +101,7 @@ mi_expect_stop "breakpoint-hit" "thread_func" ".*" ".*" ".*" \
     "Run till MI pending breakpoint on thread_func"
 
 # Delete thread creation breakpoint to enable more than 1 thread to be created.
-mi_gdb_test "-break-delete 3" "\\^done" "Delete breakpoint 3"
+mi_gdb_test "-break-delete 3" "\\^done" "delete breakpoint 3"
 
 # Set pending breakpoint with a thread via MI.
 mi_gdb_test "-break-insert -p 2 -f pendfunc3" \
diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index ef94775..6b6ec2d 100644
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -409,7 +409,7 @@ proc_with_prefix test_setup { mode } {
 	# Add the second inferior now.  While this is not mandatory, it allows
 	# us to assume that per-inferior thread numbering will be used,
 	# simplifying test_continue_to_start a bit (Thread 1.2 and not Thread 2).
-	gdb_test "add-inferior" "Added inferior 2" "Add inferior 2"
+	gdb_test "add-inferior" "Added inferior 2" "add inferior 2"
 
 	# Prepare the first inferior for the test.
 	test_continue_to_start $mode 1
diff --git a/gdb/testsuite/gdb.multi/multi-attach.exp b/gdb/testsuite/gdb.multi/multi-attach.exp
index 91e4b5a..548270f 100644
--- a/gdb/testsuite/gdb.multi/multi-attach.exp
+++ b/gdb/testsuite/gdb.multi/multi-attach.exp
@@ -51,9 +51,9 @@ gdb_test "attach $testpid2" \
     "attach to program 2"
 gdb_test "backtrace" ".*main.*" "backtrace 2"
 
-gdb_test "kill" "" "kill inferior 2" "Kill the program being debugged.*" "y"
+gdb_test "kill" "" "kill inferior 2" "kill the program being debugged.*" "y"
 gdb_test "inferior 1" ".*Switching to inferior 1.*"
-gdb_test "kill" "" "kill inferior 1" "Kill the program being debugged.*" "y"
+gdb_test "kill" "" "kill inferior 1" "kill the program being debugged.*" "y"
 
 kill_wait_spawned_process $test_spawn_id1
 kill_wait_spawned_process $test_spawn_id2
diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tids.exp
index 12ce98a..4808b0d 100644
--- a/gdb/testsuite/gdb.multi/tids.exp
+++ b/gdb/testsuite/gdb.multi/tids.exp
@@ -409,7 +409,7 @@ if { ![skip_python_tests] } {
 # Remove the second inferior and confirm that GDB goes back to showing
 # single-number thread IDs.
 with_test_prefix "back to one inferior" {
-    gdb_test "kill inferior 2" "" "kill inferior 2" "Kill the program being debugged.*" "y"
+    gdb_test "kill inferior 2" "" "kill inferior 2" "kill the program being debugged.*" "y"
     gdb_test "thread 1.1" "Switching to thread 1\.1 .*"
     gdb_test "remove-inferior 2" ".*" "remove inferior 2"
 
diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
index 590ea5d..e33f1b5 100644
--- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
@@ -36,7 +36,7 @@ if { ![runto start_sequence] } then {
    return
 }
 
-gdb_test "frame 1" "#1.*in gen_movsd.*" "Backtracing"
+gdb_test "frame 1" "#1.*in gen_movsd.*" "backtracing"
 
 gdb_test_multiple "print operand0" "print operand0" {
     -re "\\\$$decimal = <optimized out>\r\n$gdb_prompt $" { pass "print operand0"}
diff --git a/gdb/testsuite/gdb.pascal/floats.exp b/gdb/testsuite/gdb.pascal/floats.exp
index 43065ed..bd27947 100644
--- a/gdb/testsuite/gdb.pascal/floats.exp
+++ b/gdb/testsuite/gdb.pascal/floats.exp
@@ -42,15 +42,15 @@ if { [gdb_start_cmd] < 0 } {
 
 gdb_test "" ".* at .*${srcfile}.*" "start"
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
-gdb_test "print r" ".* = 0" "Print r before assigned to 1.25"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
+gdb_test "print r" ".* = 0" "print r before assigned to 1.25"
 
-gdb_test "next" "r := 1\\.25;" "Next to 'r := 1.25' line"
-gdb_test "next" "s := 2\\.2;" "Next to 's := 2.2' line"
-gdb_test "next" "t := -3\\.2;" "Next to 't := -3.2' line"
-gdb_test "next" "u := 78\\.3;" "Next to 'u := 78.3' line"
-gdb_test "next" "l := 1;" "Next to 'l := 1' line"
-gdb_test "next" "i := 1;" "Next to 'i := 1' line"
+gdb_test "next" "r := 1\\.25;" "next to 'r := 1.25' line"
+gdb_test "next" "s := 2\\.2;" "next to 's := 2.2' line"
+gdb_test "next" "t := -3\\.2;" "next to 't := -3.2' line"
+gdb_test "next" "u := 78\\.3;" "next to 'u := 78.3' line"
+gdb_test "next" "l := 1;" "next to 'l := 1' line"
+gdb_test "next" "i := 1;" "next to 'i := 1' line"
 
 # At that point, 
 # r should be equal to 1.25
@@ -113,16 +113,16 @@ gdb_test "print 35 / 2" " = 17\\.(499.*|5|500.*)"
 # 'set r' does not work, as there are set sub-commands starting with 'r'
 # Thus we need to use 'set var r'
 gdb_test "set var r := 2.56" " := 2\\.56"
-gdb_test "print r" " = 2\\.5(599.*|6|600.*)" "Testing new r value"
+gdb_test "print r" " = 2\\.5(599.*|6|600.*)" "testing new r value"
 
 gdb_test "cont" \
 	 "Breakpoint .*:${bp_location2}.*" \
 	 "Going to second breakpoint"
-gdb_test "next" "r := cos\\(u\\);" "Advance to 'r := cos(u)' line"
-gdb_test "print u" " = 3\\.14159.*" "Test pi value"
-gdb_test "next" "s := sin\\(u\\);" "Advance to 's := sin(u)' line"
-gdb_test "print r" " = -1" "Test cos(pi) is equal to -1" 
-gdb_test "next" "" "Go past 's := sin(u)' line"
+gdb_test "next" "r := cos\\(u\\);" "advance to 'r := cos(u)' line"
+gdb_test "print u" " = 3\\.14159.*" "test pi value"
+gdb_test "next" "s := sin\\(u\\);" "advance to 's := sin(u)' line"
+gdb_test "print r" " = -1" "test cos(pi) is equal to -1"
+gdb_test "next" "" "go past 's := sin(u)' line"
 
 set msg "Test sin(pi) is equal to 0" 
 
diff --git a/gdb/testsuite/gdb.pascal/integers.exp b/gdb/testsuite/gdb.pascal/integers.exp
index ec9739c..4e62745 100644
--- a/gdb/testsuite/gdb.pascal/integers.exp
+++ b/gdb/testsuite/gdb.pascal/integers.exp
@@ -40,12 +40,12 @@ if { [gdb_start_cmd] < 0 } {
 
 gdb_test "" ".* at .*${srcfile}.*" "start"
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
-gdb_test "print i" ".* = 0" "Print i before assigned to 1"
+gdb_test "print i" ".* = 0" "print i before assigned to 1"
 
-gdb_test "next" "i := 1;" "Next to 'i := 1' line"
-gdb_test "next" "j := 2;" "Next to 'j := 2' line"
+gdb_test "next" "i := 1;" "next to 'i := 1' line"
+gdb_test "next" "j := 2;" "next to 'j := 2' line"
 # At that point, 
 # i should be equal to 1
 gdb_test "print i" " = 1" 
@@ -53,10 +53,10 @@ gdb_test "print i" " = 1"
 if { $pascal_compiler_is_gpc } {
   setup_xfail *-*-*
 }
-gdb_test "print j" " = 0" "Test j value before assignment"
+gdb_test "print j" " = 0" "test j value before assignment"
 
-gdb_test "next" "k := 3;" "Next to 'k := 3' line"
-gdb_test "next" "l := k;" "Next to 'l := k' line"
+gdb_test "next" "k := 3;" "next to 'k := 3' line"
+gdb_test "next" "l := k;" "next to 'l := k' line"
 
 #j should be equal to 2
 gdb_test "print j" " = 2"
@@ -110,7 +110,7 @@ gdb_test " print (i + 5) * (j + 7)" " = 54"
 # 'set i' does not work, as there are set sub-commands starting with 'i'
 # Thus we need to use 'set var i'
 gdb_test "set var i := 2" " := 2"
-gdb_test "print i" " = 2" "Testing new i value"
+gdb_test "print i" " = 2" "testing new i value"
 
 gdb_test "cont" \
 	 "Breakpoint .*:${bp_location2}.*" \
diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index 45e4f07..e04cb76 100644
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -39,24 +39,24 @@ gdb_continue_to_breakpoint "Block break here."
 # Test initial innermost block.
 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"
-gdb_test "python print (block.function)" "None" "First anonymous block"
-gdb_test "python print (block.start)" "${decimal}" "Check start not None"
-gdb_test "python print (block.end)" "${decimal}" "Check end not None"
+gdb_test "python print (block)" "<gdb.Block object at $hex>" "check block not None"
+gdb_test "python print (block.function)" "None" "first anonymous block"
+gdb_test "python print (block.start)" "${decimal}" "check start not None"
+gdb_test "python print (block.end)" "${decimal}" "check end not None"
 
 # Test global/static blocks
 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.is_global)" "False" "Not a global block"
-gdb_test "python print (block.is_static)" "False" "Not a static block"
+gdb_test "python print (block.is_global)" "False" "not a global block"
+gdb_test "python print (block.is_static)" "False" "not a static block"
 gdb_py_test_silent_cmd "python gblock = block.global_block" "Get block" 1
 gdb_py_test_silent_cmd "python sblock = block.static_block" "Get block" 1
-gdb_test "python print (gblock.is_global)" "True" "Is the global block"
-gdb_test "python print (sblock.is_static)" "True" "Is the static block"
+gdb_test "python print (gblock.is_global)" "True" "is the global block"
+gdb_test "python print (sblock.is_static)" "True" "is the static block"
 
 # Move up superblock(s) until we reach function block_func.
 gdb_test_no_output "python block = block.superblock" "Get superblock"
-gdb_test "python print (block.function)" "None" "Second anonymous block"
+gdb_test "python print (block.function)" "None" "second anonymous block"
 gdb_test_no_output "python block = block.superblock" "Get superblock 2"
 gdb_test "python print (block.function)" "block_func" \
          "Print superblock 2 function"
diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index 547870a..144cc4b 100644
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -49,7 +49,7 @@ gdb_test "test-objfile-events" "Object file events registered."
 
 gdb_breakpoint "main" {temporary}
 
-gdb_test "run" ".*event type: new_objfile.*new objfile name.*" "New objfile notification"
+gdb_test "run" ".*event type: new_objfile.*new objfile name.*" "new objfile notification"
 
 gdb_test_no_output "set detach-on-fork off" ""
 
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
index 8859d71..a53f2f2 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
@@ -54,4 +54,4 @@ gdb_test "python print (len(gdb.breakpoints()))" "3" "check finish BP removal"
 
 gdb_test "continue" ".*Breakpoint.* throw_exception_1.*" "continue to second exception"
 gdb_test "python ExceptionFinishBreakpoint(gdb.newest_frame())" "init ExceptionFinishBreakpoint" "set FinishBP after the exception"
-gdb_test "continue" ".*exception did not finish.*" "FinishBreakpoint with exception thrown not caught"
+gdb_test "continue" ".*exception did not finish.*" "finishBreakpoint with exception thrown not caught"
diff --git a/gdb/testsuite/gdb.python/py-parameter.exp b/gdb/testsuite/gdb.python/py-parameter.exp
index 28b5d65..35fcb7f 100644
--- a/gdb/testsuite/gdb.python/py-parameter.exp
+++ b/gdb/testsuite/gdb.python/py-parameter.exp
@@ -57,14 +57,14 @@ gdb_py_test_multiple "Simple gdb booleanparameter" \
    "test_param = TestParam ('print test-param')" ""\
    "end"
 
-gdb_test "python print (test_param.value)" "True" "Test parameter value"
-gdb_test "show print test-param" "The state of the Test Parameter is on.*" "Show parameter on"
-gdb_test "set print test-param off" "Test Parameter has been set to off" "Turn off parameter"
-gdb_test "show print test-param" "The state of the Test Parameter is off.*" "Show parameter off"
-gdb_test "python print (test_param.value)" "False" "Test parameter value"
-gdb_test "help show print test-param" "Show the state of the boolean test-param.*" "Test show help"
-gdb_test "help set print test-param" "Set the state of the boolean test-param.*" "Test set help"
-gdb_test "help set print" "set print test-param -- Set the state of the boolean test-param.*" "Test general help"
+gdb_test "python print (test_param.value)" "True" "test parameter value"
+gdb_test "show print test-param" "The state of the Test Parameter is on.*" "show parameter on"
+gdb_test "set print test-param off" "Test Parameter has been set to off" "turn off parameter"
+gdb_test "show print test-param" "The state of the Test Parameter is off.*" "show parameter off"
+gdb_test "python print (test_param.value)" "False" "test parameter value"
+gdb_test "help show print test-param" "Show the state of the boolean test-param.*" "test show help"
+gdb_test "help set print test-param" "Set the state of the boolean test-param.*" "test set help"
+gdb_test "help set print" "set print test-param -- Set the state of the boolean test-param.*" "test general help"
 
 
 # Test an enum parameter.
@@ -84,12 +84,12 @@ gdb_py_test_multiple "enum gdb parameter" \
    "test_enum_param = TestEnumParam ('print test-enum-param')" ""\
    "end"
 
-gdb_test "python print (test_enum_param.value)" "one" "Test enum parameter value"
-gdb_test "show print test-enum-param" "The state of the enum is one.*" "Show parameter is initial value"
-gdb_test "set print test-enum-param two" "The state of the enum has been set to two" "Set enum to two"
-gdb_test "show print test-enum-param" "The state of the enum is two.*" "Show parameter is new value"
-gdb_test "python print (test_enum_param.value)" "two" "Test enum parameter value"
-gdb_test "set print test-enum-param three" "Undefined item: \"three\".*" "Set invalid enum parameter" 
+gdb_test "python print (test_enum_param.value)" "one" "test enum parameter value"
+gdb_test "show print test-enum-param" "The state of the enum is one.*" "show parameter is initial value"
+gdb_test "set print test-enum-param two" "The state of the enum has been set to two" "set enum to two"
+gdb_test "show print test-enum-param" "The state of the enum is two.*" "show parameter is new value"
+gdb_test "python print (test_enum_param.value)" "two" "test enum parameter value"
+gdb_test "set print test-enum-param three" "Undefined item: \"three\".*" "set invalid enum parameter"
 
 # Test a file parameter.
 gdb_py_test_multiple "file gdb parameter" \
@@ -108,11 +108,11 @@ gdb_py_test_multiple "file gdb parameter" \
    "test_file_param = TestFileParam ('test-file-param')" ""\
    "end"
 
-gdb_test "python print (test_file_param.value)" "foo.txt" "Test file parameter value"
-gdb_test "show test-file-param" "The name of the file is foo.txt.*" "Show initial file value"
-gdb_test "set test-file-param bar.txt" "The name of the file has been changed to bar.txt" "Set new file parameter" 1
-gdb_test "show test-file-param" "The name of the file is bar.txt.*" "Show new file value"
-gdb_test "python print (test_file_param.value)" "bar.txt" "Test new file parameter value"
+gdb_test "python print (test_file_param.value)" "foo.txt" "test file parameter value"
+gdb_test "show test-file-param" "The name of the file is foo.txt.*" "show initial file value"
+gdb_test "set test-file-param bar.txt" "The name of the file has been changed to bar.txt" "set new file parameter" 1
+gdb_test "show test-file-param" "The name of the file is bar.txt.*" "show new file value"
+gdb_test "python print (test_file_param.value)" "bar.txt" "test new file parameter value"
 gdb_test "set test-file-param" "Argument required.*" 
 
 # Test a parameter that is not documented.
@@ -132,13 +132,13 @@ gdb_py_test_multiple "Simple gdb booleanparameter" \
    "test_undoc_param = TestUndocParam ('print test-undoc-param')" ""\
    "end"
 
-gdb_test "show print test-undoc-param" "The state of the Test Parameter is on.*" "Show parameter on"
-gdb_test "set print test-undoc-param off" "Test Parameter has been set to off" "Turn off parameter"
-gdb_test "show print test-undoc-param" "The state of the Test Parameter is off.*" "Show parameter off"
-gdb_test "python print (test_undoc_param.value)" "False" "Test parameter value"
-gdb_test "help show print test-undoc-param" "This command is not documented.*" "Test show help"
-gdb_test "help set print test-undoc-param" "This command is not documented.*" "Test set help"
-gdb_test "help set print" "set print test-undoc-param -- This command is not documented.*" "Test general help"
+gdb_test "show print test-undoc-param" "The state of the Test Parameter is on.*" "show parameter on"
+gdb_test "set print test-undoc-param off" "Test Parameter has been set to off" "turn off parameter"
+gdb_test "show print test-undoc-param" "The state of the Test Parameter is off.*" "show parameter off"
+gdb_test "python print (test_undoc_param.value)" "False" "test parameter value"
+gdb_test "help show print test-undoc-param" "This command is not documented.*" "test show help"
+gdb_test "help set print test-undoc-param" "This command is not documented.*" "test set help"
+gdb_test "help set print" "set print test-undoc-param -- This command is not documented.*" "test general help"
 
 # Test a parameter that is not documented in any way..
 gdb_py_test_multiple "Simple gdb booleanparameter" \
@@ -150,13 +150,13 @@ gdb_py_test_multiple "Simple gdb booleanparameter" \
    "test_nodoc_param = TestNodocParam ('print test-nodoc-param')" ""\
    "end"
 
-gdb_test "show print test-nodoc-param" "This command is not documented.*" "Show parameter on"
-gdb_test "set print test-nodoc-param off" "This command is not documented.*" "Turn off parameter"
-gdb_test "show print test-nodoc-param" "This command is not documented.*.*" "Show parameter off"
-gdb_test "python print (test_nodoc_param.value)" "False" "Test parameter value"
-gdb_test "help show print test-nodoc-param" "This command is not documented.*" "Test show help"
-gdb_test "help set print test-nodoc-param" "This command is not documented.*" "Test set help"
-gdb_test "help set print" "set print test-nodoc-param -- This command is not documented.*" "Test general help"
+gdb_test "show print test-nodoc-param" "This command is not documented.*" "show parameter on"
+gdb_test "set print test-nodoc-param off" "This command is not documented.*" "turn off parameter"
+gdb_test "show print test-nodoc-param" "This command is not documented.*.*" "show parameter off"
+gdb_test "python print (test_nodoc_param.value)" "False" "test parameter value"
+gdb_test "help show print test-nodoc-param" "This command is not documented.*" "test show help"
+gdb_test "help set print test-nodoc-param" "This command is not documented.*" "test set help"
+gdb_test "help set print" "set print test-nodoc-param -- This command is not documented.*" "test general help"
 
 # Test deprecated API. Do not use in your own implementations.
 gdb_py_test_multiple "Simple gdb booleanparameter" \
@@ -171,11 +171,11 @@ gdb_py_test_multiple "Simple gdb booleanparameter" \
    "test_param = TestParam ('print test-param')" ""\
    "end"
 
-gdb_test "python print (test_param.value)" "True" "Test parameter value"
-gdb_test "show print test-param" "State of the Test Parameter on.*" "Show parameter on"
-gdb_test "set print test-param off" "Set the state of the Test Parameter.*" "Turn off parameter"
-gdb_test "show print test-param" "State of the Test Parameter off.*" "Show parameter off"
-gdb_test "python print (test_param.value)" "False" "Test parameter value"
-gdb_test "help show print test-param" "State of the Test Parameter.*" "Test show help"
-gdb_test "help set print test-param" "Set the state of the Test Parameter.*" "Test set help"
-gdb_test "help set print" "set print test-param -- Set the state of the Test Parameter.*" "Test general help"
+gdb_test "python print (test_param.value)" "True" "test parameter value"
+gdb_test "show print test-param" "State of the Test Parameter on.*" "show parameter on"
+gdb_test "set print test-param off" "Set the state of the Test Parameter.*" "turn off parameter"
+gdb_test "show print test-param" "State of the Test Parameter off.*" "show parameter off"
+gdb_test "python print (test_param.value)" "False" "test parameter value"
+gdb_test "help show print test-param" "State of the Test Parameter.*" "test show help"
+gdb_test "help set print test-param" "Set the state of the Test Parameter.*" "test set help"
+gdb_test "help set print" "set print test-param -- Set the state of the Test Parameter.*" "test general help"
diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
index 41c4a9e..fa05962 100644
--- a/gdb/testsuite/gdb.python/py-symbol.exp
+++ b/gdb/testsuite/gdb.python/py-symbol.exp
@@ -31,8 +31,8 @@ if { [skip_python_tests] } { continue }
 # point where we don't have a current frame, and we don't want to
 # require one.
 gdb_py_test_silent_cmd "python main_func = gdb.lookup_global_symbol(\"main\")" "Lookup main" 1
-gdb_test "python print (main_func.is_function)" "True" "Test main_func.is_function"
-gdb_test "python print (gdb.lookup_global_symbol(\"junk\"))" "None" "Test lookup_global_symbol(\"junk\")"
+gdb_test "python print (main_func.is_function)" "True" "test main_func.is_function"
+gdb_test "python print (gdb.lookup_global_symbol(\"junk\"))" "None" "test lookup_global_symbol(\"junk\")"
 
 gdb_test "python print (gdb.lookup_global_symbol('main').value())" "$hex .main." \
     "print value of main"
@@ -63,23 +63,23 @@ gdb_py_test_silent_cmd "python block = frame.block()" "Get block" 0
 
 # Test is_argument attribute.
 gdb_py_test_silent_cmd "python arg = gdb.lookup_symbol(\"arg\")" "Get variable arg" 0
-gdb_test "python print (arg\[0\].is_variable)" "False" "Test arg.is_variable"
-gdb_test "python print (arg\[0\].is_constant)" "False" "Test arg.is_constant"
-gdb_test "python print (arg\[0\].is_argument)" "True" "Test arg.is_argument"
-gdb_test "python print (arg\[0\].is_function)" "False" "Test arg.is_function"
+gdb_test "python print (arg\[0\].is_variable)" "False" "test arg.is_variable"
+gdb_test "python print (arg\[0\].is_constant)" "False" "test arg.is_constant"
+gdb_test "python print (arg\[0\].is_argument)" "True" "test arg.is_argument"
+gdb_test "python print (arg\[0\].is_function)" "False" "test arg.is_function"
 
 # Test is_function attribute.
 gdb_py_test_silent_cmd "python func = block.function" "Get block function" 0
-gdb_test "python print (func.is_variable)" "False" "Test func.is_variable"
-gdb_test "python print (func.is_constant)" "False" "Test func.is_constant"
-gdb_test "python print (func.is_argument)" "False" "Test func.is_argument"
-gdb_test "python print (func.is_function)" "True" "Test func.is_function"
+gdb_test "python print (func.is_variable)" "False" "test func.is_variable"
+gdb_test "python print (func.is_constant)" "False" "test func.is_constant"
+gdb_test "python print (func.is_argument)" "False" "test func.is_argument"
+gdb_test "python print (func.is_function)" "True" "test func.is_function"
 
 # Test attributes of func.
-gdb_test "python print (func.name)" "func" "Test func.name"
-gdb_test "python print (func.print_name)" "func" "Test func.print_name"
-gdb_test "python print (func.linkage_name)" "func" "Test func.linkage_name"
-gdb_test "python print (func.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "Test func.addr_class"
+gdb_test "python print (func.name)" "func" "test func.name"
+gdb_test "python print (func.print_name)" "func" "test func.print_name"
+gdb_test "python print (func.linkage_name)" "func" "test func.linkage_name"
+gdb_test "python print (func.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "test func.addr_class"
 
 gdb_breakpoint [gdb_get_line_number "Break at end."]
 gdb_continue_to_breakpoint "Break at end for variable a" ".*Break at end.*"
@@ -87,13 +87,13 @@ gdb_py_test_silent_cmd "python frame = gdb.selected_frame()" "Get Frame" 0
 
 # Test is_variable attribute.
 gdb_py_test_silent_cmd "python a = gdb.lookup_symbol(\'a\')" "Get variable a" 0
-gdb_test "python print (a\[0\].is_variable)" "True" "Test a.is_variable"
-gdb_test "python print (a\[0\].is_constant)" "False" "Test a.is_constant"
-gdb_test "python print (a\[0\].is_argument)" "False" "Test a.is_argument"
-gdb_test "python print (a\[0\].is_function)" "False" "Test a.is_function"
+gdb_test "python print (a\[0\].is_variable)" "True" "test a.is_variable"
+gdb_test "python print (a\[0\].is_constant)" "False" "test a.is_constant"
+gdb_test "python print (a\[0\].is_argument)" "False" "test a.is_argument"
+gdb_test "python print (a\[0\].is_function)" "False" "test a.is_function"
 
 # Test attributes of a.
-gdb_test "python print (a\[0\].addr_class == gdb.SYMBOL_LOC_COMPUTED)" "True" "Test a.addr_class"
+gdb_test "python print (a\[0\].addr_class == gdb.SYMBOL_LOC_COMPUTED)" "True" "test a.addr_class"
 
 gdb_test "python print (a\[0\].value())" \
     "symbol requires a frame to compute its value.*"\
@@ -105,16 +105,16 @@ gdb_test "python print (a\[0\].needs_frame)" "True" \
 
 # Test is_constant attribute
 gdb_py_test_silent_cmd "python t = gdb.lookup_symbol(\"one\")" "Get constant t" 0
-gdb_test "python print (t\[0\].is_variable)" "False" "Test t.is_variable"
-gdb_test "python print (t\[0\].is_constant)" "True" "Test t.is_constant"
-gdb_test "python print (t\[0\].is_argument)" "False" "Test t.is_argument"
-gdb_test "python print (t\[0\].is_function)" "False" "Test t.is_function"
+gdb_test "python print (t\[0\].is_variable)" "False" "test t.is_variable"
+gdb_test "python print (t\[0\].is_constant)" "True" "test t.is_constant"
+gdb_test "python print (t\[0\].is_argument)" "False" "test t.is_argument"
+gdb_test "python print (t\[0\].is_function)" "False" "test t.is_function"
 
 # Test attributes of t.
-gdb_test "python print (t\[0\].addr_class == gdb.SYMBOL_LOC_CONST)" "True" "Test t.addr_class"
+gdb_test "python print (t\[0\].addr_class == gdb.SYMBOL_LOC_CONST)" "True" "test t.addr_class"
 
 # Test type attribute.
-gdb_test "python print (t\[0\].type)" "enum tag" "Get type"
+gdb_test "python print (t\[0\].type)" "enum tag" "get type"
 
 # Test symtab attribute.
 if { [is_remote host] } {
@@ -122,7 +122,7 @@ if { [is_remote host] } {
 } else {
     set py_symbol_c [string_to_regexp ${srcdir}/${subdir}/${srcfile}]
 }
-gdb_test "python print (t\[0\].symtab)" "${py_symbol_c}" "Get symtab"
+gdb_test "python print (t\[0\].symtab)" "${py_symbol_c}" "get symtab"
 
 # C++ tests
 # Recompile binary.
@@ -157,10 +157,10 @@ gdb_test "python print (cplusfunc.is_argument)" \
 gdb_test "python print (cplusfunc.is_function)" \
     "True" "Test cplusfunc.is_function"
 
-gdb_test "python print (cplusfunc.name)" "SimpleClass::valueofi().*" "Test method.name"
-gdb_test "python print (cplusfunc.print_name)" "SimpleClass::valueofi().*" "Test method.print_name"
-gdb_test "python print (cplusfunc.linkage_name)" "SimpleClass::valueofi().*" "Test method.linkage_name"
-gdb_test "python print (cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "Test method.addr_class"
+gdb_test "python print (cplusfunc.name)" "SimpleClass::valueofi().*" "test method.name"
+gdb_test "python print (cplusfunc.print_name)" "SimpleClass::valueofi().*" "test method.print_name"
+gdb_test "python print (cplusfunc.linkage_name)" "SimpleClass::valueofi().*" "test method.linkage_name"
+gdb_test "python print (cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "test method.addr_class"
 
 # Test is_valid when the objfile is unloaded.  This must be the last
 # test as it unloads the object file in GDB.
@@ -174,8 +174,8 @@ if ![runto_main] then {
 gdb_breakpoint [gdb_get_line_number "Break at end."]
 gdb_continue_to_breakpoint "Break at end for symbol validity" ".*Break at end.*"
 gdb_py_test_silent_cmd "python a = gdb.lookup_symbol(\'a\')" "Get variable a" 0
-gdb_test "python print (a\[0\].is_valid())" "True" "Test symbol validity"
+gdb_test "python print (a\[0\].is_valid())" "True" "test symbol validity"
 delete_breakpoints
 gdb_unload
-gdb_test "python print (a\[0\].is_valid())" "False" "Test symbol non-validity"
+gdb_test "python print (a\[0\].is_valid())" "False" "test symbol non-validity"
 gdb_test_no_output "python a = None" "Test symbol destructor"
diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp
index 95c83c9..2acfe1c 100644
--- a/gdb/testsuite/gdb.python/py-symtab.exp
+++ b/gdb/testsuite/gdb.python/py-symtab.exp
@@ -58,29 +58,29 @@ if { [is_remote host] } {
     set full_py_symbol_c [string_to_regexp testsuite/${subdir}/${srcfile}]
 }
 
-gdb_test "python print (sal.symtab)" ".*${py_symbol_c}" "Test symtab"
-gdb_test "python print (sal.pc)" "${decimal}" "Test sal.pc"
-gdb_test "python print (sal.last == (new_pc - 1))" "True" "Test sal.last"
-gdb_test "python print (sal.line)" "$line_no" "Test sal.line"
-gdb_test "python print (sal.is_valid())" "True" "Test sal.is_valid"
+gdb_test "python print (sal.symtab)" ".*${py_symbol_c}" "test symtab"
+gdb_test "python print (sal.pc)" "${decimal}" "test sal.pc"
+gdb_test "python print (sal.last == (new_pc - 1))" "True" "test sal.last"
+gdb_test "python print (sal.line)" "$line_no" "test sal.line"
+gdb_test "python print (sal.is_valid())" "True" "test sal.is_valid"
 
 # Test symbol table.
-gdb_test "python print (symtab.filename)" ".*${py_symbol_c}" "Test symtab.filename"
-gdb_test "python print (symtab.objfile)" "<gdb.Objfile object at ${hex}>" "Test symtab.objfile"
-gdb_test "python print (symtab.fullname())" ".*${full_py_symbol_c}" "Test symtab.fullname"
-gdb_test "python print (symtab.is_valid())" "True" "Test symtab.is_valid()"
-gdb_test "python print (\"qq\" in global_symbols)" "True" "Test qq in global symbols"
-gdb_test "python print (\"func\" in global_symbols)" "True" "Test func in global symbols"
-gdb_test "python print (\"main\" in global_symbols)" "True" "Test main in global symbols"
-gdb_test "python print (\"int\" in static_symbols)" "True" "Test int in static symbols"
-gdb_test "python print (\"char\" in static_symbols)" "True" "Test char in static symbols"
-gdb_test "python print (\"simple_struct\" in static_symbols)" "True" "Test simple_struct in static symbols"
+gdb_test "python print (symtab.filename)" ".*${py_symbol_c}" "test symtab.filename"
+gdb_test "python print (symtab.objfile)" "<gdb.Objfile object at ${hex}>" "test symtab.objfile"
+gdb_test "python print (symtab.fullname())" ".*${full_py_symbol_c}" "test symtab.fullname"
+gdb_test "python print (symtab.is_valid())" "True" "test symtab.is_valid()"
+gdb_test "python print (\"qq\" in global_symbols)" "True" "test qq in global symbols"
+gdb_test "python print (\"func\" in global_symbols)" "True" "test func in global symbols"
+gdb_test "python print (\"main\" in global_symbols)" "True" "test main in global symbols"
+gdb_test "python print (\"int\" in static_symbols)" "True" "test int in static symbols"
+gdb_test "python print (\"char\" in static_symbols)" "True" "test char in static symbols"
+gdb_test "python print (\"simple_struct\" in static_symbols)" "True" "test simple_struct in static symbols"
 
 # Test is_valid when the objfile is unloaded.  This must be the last
 # test as it unloads the object file in GDB.
 gdb_unload
-gdb_test "python print (sal.is_valid())" "False" "Test sal.is_valid"
-gdb_test "python print (symtab.is_valid())" "False" "Test symtab.is_valid()"
+gdb_test "python print (sal.is_valid())" "False" "test sal.is_valid"
+gdb_test "python print (symtab.is_valid())" "False" "test symtab.is_valid()"
 
 gdb_test_no_output "python sal = None" "Test sal destructor"
 gdb_test_no_output "python symtab = None" "Test symtab destructor"
diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index 61c8c2f..782bd43 100644
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -70,9 +70,9 @@ proc test_fields {lang} {
       gdb_py_test_silent_cmd "print (c)" "print value (c)" 1
       gdb_py_test_silent_cmd "python c = gdb.history (0)" "get value (c) from history" 1
       gdb_py_test_silent_cmd "python fields = c.type.fields()" "get fields from c.type" 1
-      gdb_test "python print (len(fields))" "2" "Check number of fields (c)"
-      gdb_test "python print (fields\[0\].name)" "c" "Check class field c name"
-      gdb_test "python print (fields\[1\].name)" "d" "Check class field d name"
+      gdb_test "python print (len(fields))" "2" "check number of fields (c)"
+      gdb_test "python print (fields\[0\].name)" "c" "check class field c name"
+      gdb_test "python print (fields\[1\].name)" "d" "check class field d name"
 
       gdb_test "python print (c.type == gdb.parse_and_eval('d').type)" "False"
       gdb_test "python print (c.type == gdb.parse_and_eval('d').type.fields()\[0\].type)" \
@@ -98,15 +98,15 @@ proc test_fields {lang} {
     gdb_py_test_silent_cmd "print (st)" "print value (st)" 1
     gdb_py_test_silent_cmd "python st = gdb.history (0)" "get value (st) from history" 1
     gdb_py_test_silent_cmd "python fields = st.type.fields()" "get fields from st.type" 1
-    gdb_test "python print (len(fields))" "2" "Check number of fields (st)"
-    gdb_test "python print (fields\[0\].name)" "a" "Check structure field a name"
-    gdb_test "python print (fields\[1\].name)" "b" "Check structure field b name"
+    gdb_test "python print (len(fields))" "2" "check number of fields (st)"
+    gdb_test "python print (fields\[0\].name)" "a" "check structure field a name"
+    gdb_test "python print (fields\[1\].name)" "b" "check structure field b name"
 
     # Test that unamed fields have 'None' for name.
     gdb_py_test_silent_cmd "python ss = gdb.parse_and_eval('ss')" "init ss" 1
     gdb_py_test_silent_cmd "python ss_fields = ss.type.fields()" \
       "get fields from ss.type" 1
-    gdb_test "python print(len(ss_fields))" "2" "Check length of ss_fields"
+    gdb_test "python print(len(ss_fields))" "2" "check length of ss_fields"
     gdb_test "python print(ss_fields\[0\].name is None)" "True" \
       "Check ss_fields\[0\].name"
     gdb_test "python print(ss_fields\[1\].name is None)" "True" \
@@ -117,13 +117,13 @@ proc test_fields {lang} {
       "Check that dir includes name"
 
     # Test Python mapping behavior of gdb.Type for structs/classes
-    gdb_test "python print (len(st.type))" "2" "Check number of fields (st.type)"
-    gdb_test "python print (st.type\['a'\].name)" "a" "Check fields lookup by name"
+    gdb_test "python print (len(st.type))" "2" "check number of fields (st.type)"
+    gdb_test "python print (st.type\['a'\].name)" "a" "check fields lookup by name"
     gdb_test "python print (\[v.bitpos for v in st.type.itervalues()\])" {\[0L?, 32L?\]} "Check fields iteration over values"
     gdb_test "python print (\[(n, v.bitpos) for (n, v) in st.type.items()\])" {\[\('a', 0L?\), \('b', 32L?\)\]} "Check fields items list"
-    gdb_test "python print ('a' in st.type)" "True" "Check field name exists test"
-    gdb_test "python print ('nosuch' in st.type)" "False" "Check field name nonexists test"
-    gdb_test "python print (not not st.type)" "True" "Check conversion to bool"
+    gdb_test "python print ('a' in st.type)" "True" "check field name exists test"
+    gdb_test "python print ('nosuch' in st.type)" "False" "check field name nonexists test"
+    gdb_test "python print (not not st.type)" "True" "check conversion to bool"
 
     # Test rejection of mapping operations on scalar types
     gdb_test "python print (len (st.type\['a'\].type))" "TypeError: Type is not a structure, union, enum, or function type.*"
@@ -138,8 +138,8 @@ proc test_fields {lang} {
     gdb_py_test_silent_cmd "print (ar)" "print value (ar)" 1
     gdb_py_test_silent_cmd "python ar = gdb.history (0)" "get value (ar) from history" 1
     gdb_test "python fields = ar.type.fields()"
-    gdb_test "python print (len(fields))" "1" "Check the number of fields"
-    gdb_test "python print (fields\[0\].type)" "<range type>" "Check array field type"
+    gdb_test "python print (len(fields))" "1" "check the number of fields"
+    gdb_test "python print (fields\[0\].type)" "<range type>" "check array field type"
 
     # Test gdb.Type.array.
     gdb_test "python print (ar\[0\].cast(ar\[0\].type.array(1)))" \
@@ -178,14 +178,14 @@ proc test_enums {} {
     gdb_py_test_silent_cmd "print (e)" "print value (e)" 1
     gdb_py_test_silent_cmd "python (e) = gdb.history (0)" "get value (e) from history" 1
     gdb_py_test_silent_cmd "python fields = e.type.fields()" "extract type fields from e" 1
-    gdb_test "python print (len(fields))" "3" "Check the number of enum fields"
-    gdb_test "python print (fields\[0\].name)" "v1" "Check enum field\[0\] name"
-    gdb_test "python print (fields\[1\].name)" "v2" "Check enum field\[1\]name"
+    gdb_test "python print (len(fields))" "3" "check the number of enum fields"
+    gdb_test "python print (fields\[0\].name)" "v1" "check enum field\[0\] name"
+    gdb_test "python print (fields\[1\].name)" "v2" "check enum field\[1\]name"
 
     # Ditto but by mapping operations
-    gdb_test "python print (len(e.type))" "3" "Check the number of type fields"
-    gdb_test "python print (e.type\['v1'\].name)" "v1" "Check enum field lookup by name (v1)"
-    gdb_test "python print (e.type\['v3'\].name)" "v3" "Check enum field lookup by name (v3)"
+    gdb_test "python print (len(e.type))" "3" "check the number of type fields"
+    gdb_test "python print (e.type\['v1'\].name)" "v1" "check enum field lookup by name (v1)"
+    gdb_test "python print (e.type\['v3'\].name)" "v3" "check enum field lookup by name (v3)"
     gdb_test "python print (\[v.enumval for v in e.type.itervalues()\])" {\[0L?, 1L?, 2L?\]} "Check num fields iteration over values"
     gdb_test "python print (\[(n, v.enumval) for (n, v) in e.type.items()\])" {\[\('v1', 0L?\), \('v2', 1L?\), \('v3', 2L?\)\]} "Check enum fields items list"
   }
@@ -196,9 +196,9 @@ proc test_base_class {} {
     gdb_py_test_silent_cmd "print (d)" "print value (d)" 1
     gdb_py_test_silent_cmd "python d = gdb.history (0)" "get value (d) from history" 1
     gdb_py_test_silent_cmd "python fields = d.type.fields()" "extract type fields from d" 1
-    gdb_test "python print (len(fields))" "3" "Check the number of fields"
-    gdb_test "python print (fields\[0\].is_base_class)" "True" "Check base class (fields\[0\])"
-    gdb_test "python print (fields\[1\].is_base_class)" "False" "Check base class (fields\[1\])"
+    gdb_test "python print (len(fields))" "3" "check the number of fields"
+    gdb_test "python print (fields\[0\].is_base_class)" "True" "check base class (fields\[0\])"
+    gdb_test "python print (fields\[1\].is_base_class)" "False" "check base class (fields\[1\])"
   }
 }
 
@@ -208,9 +208,9 @@ proc test_range {} {
       # Test a valid range request.
       gdb_py_test_silent_cmd "print (ar)" "print value (ar)" 1
       gdb_py_test_silent_cmd "python ar = gdb.history (0)" "get value (ar) from history" 1
-      gdb_test "python print (len(ar.type.range()))" "2" "Check correct tuple length"
-      gdb_test "python print (ar.type.range()\[0\])" "0" "Check range low bound"
-      gdb_test "python print (ar.type.range()\[1\])" "1" "Check range high bound"
+      gdb_test "python print (len(ar.type.range()))" "2" "check correct tuple length"
+      gdb_test "python print (ar.type.range()\[0\])" "0" "check range low bound"
+      gdb_test "python print (ar.type.range()\[1\])" "1" "check range high bound"
     }
 
     with_test_prefix "on ranged type" {
@@ -218,15 +218,15 @@ proc test_range {} {
       gdb_py_test_silent_cmd "print (ar)" "print value (ar)" 1
       gdb_py_test_silent_cmd "python ar = gdb.history (0)" "get value (ar) from history" 1
       gdb_py_test_silent_cmd "python fields = ar.type.fields()" "get fields" 1
-      gdb_test "python print (fields\[0\].type.range()\[0\])" "0" "Check range low bound"
-      gdb_test "python print (fields\[0\].type.range()\[1\])" "1" "Check range high bound"
+      gdb_test "python print (fields\[0\].type.range()\[0\])" "0" "check range low bound"
+      gdb_test "python print (fields\[0\].type.range()\[1\])" "1" "check range high bound"
     }
 
     with_test_prefix "on unranged value" {
       # Test where a range does not exist.
       gdb_py_test_silent_cmd "print (st)" "print value (st)" 1
       gdb_py_test_silent_cmd "python st = gdb.history (0)" "get value (st) from history" 1
-      gdb_test "python print (st.type.range())" "RuntimeError: This type does not have a range.*" "Check range for non ranged type."
+      gdb_test "python print (st.type.range())" "RuntimeError: This type does not have a range.*" "check range for non ranged type."
     }
   }
 }
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index 5395f8c..fb489e1 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -74,7 +74,7 @@ proc test_value_creation {} {
   }
 
   # Test address attribute is None in a non-addressable value
-  gdb_test "python print ('result = %s' % i.address)" "= None" "Test address attribute in non-addressable value"
+  gdb_test "python print ('result = %s' % i.address)" "= None" "test address attribute in non-addressable value"
 }
 
 proc test_value_numeric_ops {} {
@@ -250,10 +250,10 @@ proc test_value_in_inferior {} {
   }
 
   # Smoke-test is_optimized_out attribute
-  gdb_test "python print ('result = %s' % arg0.is_optimized_out)" "= False" "Test is_optimized_out attribute"
+  gdb_test "python print ('result = %s' % arg0.is_optimized_out)" "= False" "test is_optimized_out attribute"
 
   # Test address attribute
-  gdb_test "python print ('result = %s' % arg0.address)" "= 0x\[\[:xdigit:\]\]+" "Test address attribute"
+  gdb_test "python print ('result = %s' % arg0.address)" "= 0x\[\[:xdigit:\]\]+" "test address attribute"
 
   # Test displaying a variable that is temporarily at a bad address.
   # But if we can examine what's at memory address 0, then we'll also be
@@ -295,16 +295,16 @@ proc test_value_in_inferior {} {
   gdb_test "print st" "\"divide et impera\""
   gdb_py_test_silent_cmd "python st = gdb.history (0)" "get value from history" 1
   gdb_test "python print (st.string ())"  "divide et impera"  "Test string with no length"
-  gdb_test "python print (st.string (length = -1))" "divide et impera" "Test string (length = -1) is all of the string"
+  gdb_test "python print (st.string (length = -1))" "divide et impera" "test string (length = -1) is all of the string"
   gdb_test "python print (st.string (length = 6))" "divide"
-  gdb_test "python print (\"---\"+st.string (length = 0)+\"---\")" "------" "Test string (length = 0) is empty"
-  gdb_test "python print (len(st.string (length = 0)))" "0" "Test length is 0"
+  gdb_test "python print (\"---\"+st.string (length = 0)+\"---\")" "------" "test string (length = 0) is empty"
+  gdb_test "python print (len(st.string (length = 0)))" "0" "test length is 0"
 
 
   # Fetch a string that has embedded nulls.
   gdb_test "print nullst" "\"divide\\\\000et\\\\000impera\".*"
   gdb_py_test_silent_cmd "python nullst = gdb.history (0)" "get value from history" 1
-  gdb_test "python print (nullst.string ())" "divide" "Test string to first null"
+  gdb_test "python print (nullst.string ())" "divide" "test string to first null"
   # Python cannot print strings that contain the null (\0) character.
   # For the purposes of this test, use repr()
   gdb_py_test_silent_cmd "python nullst = nullst.string (length = 9)" "get string beyond null" 1
@@ -325,18 +325,18 @@ proc test_lazy_strings {} {
   gdb_py_test_silent_cmd "python sptr = gdb.history (0)" "Get value from history" 1
 
   gdb_py_test_silent_cmd "python lstr = sptr.lazy_string()" "Aquire lazy string" 1
-  gdb_test "python print (lstr.type)" "const char \*." "Test lazy-string type name equality"
-  gdb_test "python print (sptr.type)" "const char \*." "Test string type name equality"
+  gdb_test "python print (lstr.type)" "const char \*." "test lazy-string type name equality"
+  gdb_test "python print (sptr.type)" "const char \*." "test string type name equality"
 
   # Prevent symbol on address 0x0 being printed.
   gdb_test_no_output "set print symbol off"
   gdb_test "print sn" "0x0"
 
   gdb_py_test_silent_cmd "python snptr = gdb.history (0)" "Get value from history" 1
-  gdb_test "python snstr = snptr.lazy_string(length=5)" ".*Cannot create a lazy string with address.*" "Test lazy string"
+  gdb_test "python snstr = snptr.lazy_string(length=5)" ".*Cannot create a lazy string with address.*" "test lazy string"
   gdb_py_test_silent_cmd "python snstr = snptr.lazy_string(length=0)" "Succesfully create a lazy string" 1
-  gdb_test "python print (snstr.length)" "0" "Test lazy string length"
-  gdb_test "python print (snstr.address)" "0" "Test lazy string address"
+  gdb_test "python print (snstr.length)" "0" "test lazy string length"
+  gdb_test "python print (snstr.address)" "0" "test lazy string address"
 }
 
 
@@ -389,7 +389,7 @@ proc test_value_after_death {} {
   gdb_test "kill" "" "kill the inferior" \
     "Kill the program being debugged. .y or n. $" \
     "y"
-  gdb_test "file" "" "Discard the symbols" \
+  gdb_test "file" "" "discard the symbols" \
     "Discard symbol table from.*y or n. $" \
     "y"
 
@@ -428,7 +428,7 @@ proc test_subscript_regression {exefile lang} {
 	 "Obtain address" 1
      gdb_py_test_silent_cmd "python rptr = gdb.history(0)" \
 	 "Obtains value from GDB" 1
-     gdb_test "python print (rptr\[0\])" "2" "Check pointer passed as reference"
+     gdb_test "python print (rptr\[0\])" "2" "check pointer passed as reference"
 
      # Just the most basic test of dynamic_cast -- it is checked in
      # the C++ tests.
@@ -454,19 +454,19 @@ proc test_subscript_regression {exefile lang} {
      "Create a value for subscript test" 1
 
  # Try to access an int with a subscript.  This should fail.
- gdb_test "python print (intv)" "1" "Baseline print of an int Python value"
+ gdb_test "python print (intv)" "1" "baseline print of an int Python value"
  gdb_test "python print (intv\[0\])" "gdb.error: Cannot subscript requested type.*" \
      "Attempt to access an integer with a subscript"
 
  # Try to access a string with a subscript.  This should pass.
- gdb_test "python print (stringv)" "foo." "Baseline print of a string Python value"
- gdb_test "python print (stringv\[0\])" "f." "Attempt to access a string with a subscript"
+ gdb_test "python print (stringv)" "foo." "baseline print of a string Python value"
+ gdb_test "python print (stringv\[0\])" "f." "attempt to access a string with a subscript"
 
  # Try to access an int array via a pointer with a subscript.  This should pass.
  gdb_py_test_silent_cmd "print p" "Build pointer to array" 1
  gdb_py_test_silent_cmd "python pointer = gdb.history(0)" "" 1
- gdb_test "python print (pointer\[0\])" "1" "Access array via pointer with int subscript"
- gdb_test "python print (pointer\[intv\])" "2" "Access array via pointer with value subscript"
+ gdb_test "python print (pointer\[0\])" "1" "access array via pointer with int subscript"
+ gdb_test "python print (pointer\[intv\])" "2" "access array via pointer with value subscript"
 
  # Try to access a single dimension array with a subscript to the
  # result.  This should fail.
@@ -477,7 +477,7 @@ proc test_subscript_regression {exefile lang} {
  # dimensions.  This should pass.
  gdb_py_test_silent_cmd "print {\"fu \",\"foo\",\"bar\"}" "Build array" 1
  gdb_py_test_silent_cmd "python marray = gdb.history(0)" "" 1
- gdb_test "python print (marray\[1\]\[2\])" "o." "Test multiple subscript"
+ gdb_test "python print (marray\[1\]\[2\])" "o." "test multiple subscript"
 }
 
 # A few tests of gdb.parse_and_eval.
@@ -500,10 +500,10 @@ proc test_value_hash {} {
     "three = gdb.Value(3)" "" \
     "vdict = {one:\"one str\",two:\"two str\",three:\"three str\"}" "" \
     "end"
-    gdb_test "python print (vdict\[one\])" "one str" "Test dictionary hash"
-    gdb_test "python print (vdict\[two\])" "two str" "Test dictionary hash"
-    gdb_test "python print (vdict\[three\])" "three str" "Test dictionary hash"
-    gdb_test "python print (one.__hash__() == hash(one))" "True" "Test inbuilt hash"
+    gdb_test "python print (vdict\[one\])" "one str" "test dictionary hash"
+    gdb_test "python print (vdict\[two\])" "two str" "test dictionary hash"
+    gdb_test "python print (vdict\[three\])" "three str" "test dictionary hash"
+    gdb_test "python print (one.__hash__() == hash(one))" "True" "test inbuilt hash"
 }
 
 # Build C version of executable.  C++ is built later.
diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
index abe609b..5490c03 100644
--- a/gdb/testsuite/gdb.python/py-xmethods.exp
+++ b/gdb/testsuite/gdb.python/py-xmethods.exp
@@ -40,44 +40,44 @@ gdb_breakpoint [gdb_get_line_number "Break here."]
 gdb_continue_to_breakpoint "Break here" ".*Break here.*"
 
 # Tests before loading the debug methods.
-gdb_test "p a1 + a2" ".* = 15" "Before: a1 + a2"
-gdb_test "p a_plus_a" ".* = 1" "Before: a_plus_a 1"
+gdb_test "p a1 + a2" ".* = 15" "before: a1 + a2"
+gdb_test "p a_plus_a" ".* = 1" "before: a_plus_a 1"
 
-gdb_test "p a2 - a1" ".* = 5" "Before: a2 - a1"
-gdb_test "p a_minus_a" ".* = 1" "Before: a_minus_a 1"
+gdb_test "p a2 - a1" ".* = 5" "before: a2 - a1"
+gdb_test "p a_minus_a" ".* = 1" "before: a_minus_a 1"
 
-gdb_test "p b1 - a1" ".* = 25" "Before: b1 - a1"
-gdb_test "p a_minus_a" ".* = 2" "Before: a_minus_a 2"
+gdb_test "p b1 - a1" ".* = 25" "before: b1 - a1"
+gdb_test "p a_minus_a" ".* = 2" "before: a_minus_a 2"
 
-gdb_test "p a1.geta()" ".* = 5" "Before: a1.geta()"
-gdb_test "p a_geta" ".* = 1" "Before: a_geta 1"
+gdb_test "p a1.geta()" ".* = 5" "before: a1.geta()"
+gdb_test "p a_geta" ".* = 1" "before: a_geta 1"
 
-gdb_test "p ++a1" "No symbol.*" "Before: ++a1"
+gdb_test "p ++a1" "No symbol.*" "before: ++a1"
 gdb_test "p a1.getarrayind(5)" "Couldn't find method.*" \
   "Before: a1.getarrayind(5)"
 
-gdb_test "p a_ptr->geta()" ".* = 60" "Before: a_ptr->geta()"
-gdb_test "p b_geta" ".* = 1" "Before: b_geta 1"
+gdb_test "p a_ptr->geta()" ".* = 60" "before: a_ptr->geta()"
+gdb_test "p b_geta" ".* = 1" "before: b_geta 1"
 
-gdb_test "p e.geta()" ".* = 100" "Before: e.geta()"
-gdb_test "p a_geta" ".* = 2" "Before: a_geta 2"
+gdb_test "p e.geta()" ".* = 100" "before: e.geta()"
+gdb_test "p a_geta" ".* = 2" "before: a_geta 2"
 
 # Since g.size_diff operates of sizes of int and float, do not check for
 # actual result value as it could be different on different platforms.
-gdb_test "p g.size_diff<float>()" ".*" "Before: call g.size_diff<float>()"
-gdb_test "p g_size_diff" ".* = 2" "Before: g_size_diff 2"
+gdb_test "p g.size_diff<float>()" ".*" "before: call g.size_diff<float>()"
+gdb_test "p g_size_diff" ".* = 2" "before: g_size_diff 2"
 
 gdb_test "p g.size_diff<unsigned long>()" "Couldn't find method.*" \
   "Before: g.size_diff<unsigned long>()"
 
-gdb_test "p g.size_mul<2>()" ".*" "Before: g.size_mul<2>()"
-gdb_test "p g_size_mul" ".* = 2" "Before: g_size_mul 2"
+gdb_test "p g.size_mul<2>()" ".*" "before: g.size_mul<2>()"
+gdb_test "p g_size_mul" ".* = 2" "before: g_size_mul 2"
 
 gdb_test "p g.size_mul<5>()" "Couldn't find method.*" \
   "Before: g.size_mul<5>()"
 
-gdb_test "p g.mul<double>(2.0)" ".* = 10" "Before: g.mul<double>(2.0)"
-gdb_test "p g_mul" ".* = 2" "Before: g_mul 2"
+gdb_test "p g.mul<double>(2.0)" ".* = 10" "before: g.mul<double>(2.0)"
+gdb_test "p g_mul" ".* = 2" "before: g_mul 2"
 
 gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
   "Before: g.mul<char>('a')"
@@ -86,29 +86,29 @@ gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
 gdb_test_no_output "source ${xmethods_script}" "load the script file"
 
 # Tests after loading debug methods.
-gdb_test "p a1 + a2" "From Python <A_plus_A>.*15" "After: a1 + a2"
+gdb_test "p a1 + a2" "From Python <A_plus_A>.*15" "after: a1 + a2"
 
-gdb_test "p a2 - a1" ".* = 5" "After: a2 - a1"
-gdb_test "p a_minus_a" ".* = 3" "After: a_minus_a 3"
+gdb_test "p a2 - a1" ".* = 5" "after: a2 - a1"
+gdb_test "p a_minus_a" ".* = 3" "after: a_minus_a 3"
 
-gdb_test "p b1 + a1" "From Python <A_plus_A>.*35" "After: b1 + a1"
+gdb_test "p b1 + a1" "From Python <A_plus_A>.*35" "after: b1 + a1"
 
-gdb_test "p b1 - a1" ".* = 25" "After: b1 - a1"
-gdb_test "p a_minus_a" ".* = 4" "After: a_minus_a 4"
+gdb_test "p b1 - a1" ".* = 25" "after: b1 - a1"
+gdb_test "p a_minus_a" ".* = 4" "after: a_minus_a 4"
 
-gdb_test "p a1.geta()" "From Python <A_geta>.*5" "After: a1.geta()"
-gdb_test "p ++a1" "From Python <plus_plus_A>.*6" "After: ++a1"
+gdb_test "p a1.geta()" "From Python <A_geta>.*5" "after: a1.geta()"
+gdb_test "p ++a1" "From Python <plus_plus_A>.*6" "after: ++a1"
 gdb_test "p a1.getarrayind(5)" "From Python <A_getarrayind>.*5" \
   "After: a1.getarrayind(5)"
-gdb_test "P a1\[6\]" ".*int &.*6" "After a1\[\]"
-gdb_test "P b1\[7\]" ".*const int &.*7" "After b1\[\]"
+gdb_test "P a1\[6\]" ".*int &.*6" "after a1\[\]"
+gdb_test "P b1\[7\]" ".*const int &.*7" "after b1\[\]"
 # Note the following test.  Xmethods on dynamc types are not looked up
 # currently.  Hence, even though a_ptr points to a B object, the xmethod
 # defined for A objects is invoked.
-gdb_test "p a_ptr->geta()" "From Python <A_geta>.*30" "After: a_ptr->geta()"
-gdb_test "p e.geta()" "From Python <A_geta>.*100" "After: e.geta()"
-gdb_test "p e_ptr->geta()" "From Python <A_geta>.*100" "After: e_ptr->geta()"
-gdb_test "p e_ref.geta()" "From Python <A_geta>.*100" "After: e_ref.geta()"
+gdb_test "p a_ptr->geta()" "From Python <A_geta>.*30" "after: a_ptr->geta()"
+gdb_test "p e.geta()" "From Python <A_geta>.*100" "after: e.geta()"
+gdb_test "p e_ptr->geta()" "From Python <A_geta>.*100" "after: e_ptr->geta()"
+gdb_test "p e_ref.geta()" "From Python <A_geta>.*100" "after: e_ref.geta()"
 gdb_test "p e.method(10)" "From Python <E_method_int>.* = void" \
   "After: e.method(10)"
 gdb_test "p e.method('a')" "From Python <E_method_char>.* = void" \
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 2ff1f14..14cfffe 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -131,7 +131,7 @@ gdb_py_test_multiple "post event insertion" \
   "end" ""
 
 gdb_test "python print (someVal)" "1" "test post event execution"
-gdb_test "python gdb.post_event(str(1))" "RuntimeError: Posted event is not callable.*" "Test non callable class"
+gdb_test "python gdb.post_event(str(1))" "RuntimeError: Posted event is not callable.*" "test non callable class"
 
 # Test (no) pagination of the executed command.
 gdb_test "show height" {Number of lines gdb thinks are in a page is unlimited\.}
@@ -177,7 +177,7 @@ gdb_test "python print (a)" ".*aliases -- Aliases of other commands.*" "verify h
 # Test PR 12212, using InfThread.selected_thread() when no inferior is
 # loaded.
 gdb_py_test_silent_cmd "python nothread = gdb.selected_thread()" "Attempt to aquire thread with no inferior" 1
-gdb_test "python print (nothread == None)" "True" "Ensure that no threads are returned"
+gdb_test "python print (nothread == None)" "True" "ensure that no threads are returned"
 
 gdb_py_test_multiple "register atexit function" \
     "python" "" \
@@ -215,56 +215,56 @@ gdb_test "python gdb.decode_line(\"main.c:43\")" \
     "gdb.error: No source file named main.c.*" "test decode_line no source named main"
 
 gdb_py_test_silent_cmd "python symtab = gdb.decode_line()" "test decode_line current location" 1
-gdb_test "python print (len(symtab))" "2" "Test decode_line current location"
-gdb_test "python print (symtab\[0\])" "None" "Test decode_line expression parse"
-gdb_test "python print (len(symtab\[1\]))" "1" "Test decode_line current location"
+gdb_test "python print (len(symtab))" "2" "test decode_line current location"
+gdb_test "python print (symtab\[0\])" "None" "test decode_line expression parse"
+gdb_test "python print (len(symtab\[1\]))" "1" "test decode_line current location"
 
 if { [is_remote host] } {
     set python_c [string_to_regexp "python.c"]
 } else {
     set python_c [string_to_regexp "gdb.python/python.c"]
 }
-gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_c}" "Test decode_line current location filename"
-gdb_test "python print (symtab\[1\]\[0\].line)" "$lineno" "Test decode_line current location line number"
+gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_c}" "test decode_line current location filename"
+gdb_test "python print (symtab\[1\]\[0\].line)" "$lineno" "test decode_line current location line number"
 
 gdb_py_test_silent_cmd "python symtab = gdb.decode_line(\"python.c:26 if foo\")" "test decode_line python.c:26" 1
-gdb_test "python print (len(symtab))" "2" "Test decode_line python.c:26 length"
-gdb_test "python print (symtab\[0\])" "if foo" "Test decode_line expression parse"
-gdb_test "python print (len(symtab\[1\]))" "1" "Test decode_line python.c:26 length"
-gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_c}" "Test decode_line python.c:26 filename"
-gdb_test "python print (symtab\[1\]\[0\].line)" "26" "Test decode_line python.c:26 line number"
+gdb_test "python print (len(symtab))" "2" "test decode_line python.c:26 length"
+gdb_test "python print (symtab\[0\])" "if foo" "test decode_line expression parse"
+gdb_test "python print (len(symtab\[1\]))" "1" "test decode_line python.c:26 length"
+gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_c}" "test decode_line python.c:26 filename"
+gdb_test "python print (symtab\[1\]\[0\].line)" "26" "test decode_line python.c:26 line number"
 
 gdb_test "python gdb.decode_line(\"randomfunc\")" \
     "gdb.error: Function \"randomfunc\" not defined.*" "test decode_line randomfunc"
 gdb_py_test_silent_cmd "python symtab = gdb.decode_line(\"func1\")" "test decode_line func1()" 1
-gdb_test "python print (len(symtab))" "2" "Test decode_line func1 length"
-gdb_test "python print (len(symtab\[1\]))" "1" "Test decode_line func1 length"
+gdb_test "python print (len(symtab))" "2" "test decode_line func1 length"
+gdb_test "python print (len(symtab\[1\]))" "1" "test decode_line func1 length"
 
 if { [is_remote host] } {
     set python_1_c [string_to_regexp "python-1.c"]
 } else {
     set python_1_c [string_to_regexp "gdb.python/python-1.c"]
 }
-gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_1_c}" "Test decode_line func1 filename"
-gdb_test "python print (symtab\[1\]\[0\].line)" "19" "Test decode_line func1 line number"
+gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_1_c}" "test decode_line func1 filename"
+gdb_test "python print (symtab\[1\]\[0\].line)" "19" "test decode_line func1 line number"
 gdb_py_test_silent_cmd {python symtab = gdb.decode_line ("func1,func2")} \
     "test decode_line func1,func2" 1
 gdb_test {python print (symtab[0])} ",func2" "stop at comma in linespec"
 
 gdb_py_test_silent_cmd "python symtab = gdb.decode_line(\"*0\")" "Test decode_line *0" 1
-gdb_test "python print (len(symtab))" "2" "Test decode_line *0 result length"
-gdb_test "python print (symtab\[0\])" "None" "Test decode_line *0 unparsed"
-gdb_test "python print (len(symtab\[1\]))" "1" "Test decode_line *0 locations length"
-gdb_test "python print (symtab\[1\]\[0\].symtab)" "None" "Test decode_line *0 filename"
-gdb_test "python print (symtab\[1\]\[0\].pc)" "0" "Test decode_line *0 pc"
+gdb_test "python print (len(symtab))" "2" "test decode_line *0 result length"
+gdb_test "python print (symtab\[0\])" "None" "test decode_line *0 unparsed"
+gdb_test "python print (len(symtab\[1\]))" "1" "test decode_line *0 locations length"
+gdb_test "python print (symtab\[1\]\[0\].symtab)" "None" "test decode_line *0 filename"
+gdb_test "python print (symtab\[1\]\[0\].pc)" "0" "test decode_line *0 pc"
 
 # gdb.write
-gdb_test "python print (sys.stderr)" ".*gdb.GdbOutputErrorFile (instance|object) at.*" "Test stderr location"
-gdb_test "python print (sys.stdout)" ".*gdb.GdbOutputFile (instance|object) at.*" "Test stdout location"
-gdb_test "python gdb.write(\"Foo\\n\")" "Foo" "Test default write"
-gdb_test "python gdb.write(\"Error stream\\n\", stream=gdb.STDERR)" "Error stream" "Test stderr write"
-gdb_test "python gdb.write(\"Normal stream\\n\", stream=gdb.STDOUT)" "Normal stream" "Test stdout write"
-gdb_test "python gdb.write(\"Log stream\\n\", stream=gdb.STDLOG)" "Log stream" "Test stdlog write"
+gdb_test "python print (sys.stderr)" ".*gdb.GdbOutputErrorFile (instance|object) at.*" "test stderr location"
+gdb_test "python print (sys.stdout)" ".*gdb.GdbOutputFile (instance|object) at.*" "test stdout location"
+gdb_test "python gdb.write(\"Foo\\n\")" "Foo" "test default write"
+gdb_test "python gdb.write(\"Error stream\\n\", stream=gdb.STDERR)" "Error stream" "test stderr write"
+gdb_test "python gdb.write(\"Normal stream\\n\", stream=gdb.STDOUT)" "Normal stream" "test stdout write"
+gdb_test "python gdb.write(\"Log stream\\n\", stream=gdb.STDLOG)" "Log stream" "test stdlog write"
 
 # Turn on full stack printing for subsequent tests.
 gdb_py_test_silent_cmd "set python print-stack full" \
@@ -454,9 +454,9 @@ if ![runto_main] then {
 runto [gdb_get_line_number "Break at func2 call site."]
 
 gdb_py_test_silent_cmd "python line = gdb.selected_frame().find_sal().line" "Get line number of func2 call site" 1
-gdb_test "python print (gdb.find_pc_line(gdb.selected_frame().pc()).line == line)" "True" "Test find_pc_line at func2 call site"
+gdb_test "python print (gdb.find_pc_line(gdb.selected_frame().pc()).line == line)" "True" "test find_pc_line at func2 call site"
 
 gdb_py_test_silent_cmd "step" "Step into func2" 1
 gdb_py_test_silent_cmd "up" "Step out of func2" 1
 
-gdb_test "python print (gdb.find_pc_line(gdb.selected_frame().pc()).line > line)" "True" "Test find_pc_line with resume address"
+gdb_test "python print (gdb.find_pc_line(gdb.selected_frame().pc()).line > line)" "True" "test find_pc_line with resume address"
diff --git a/gdb/testsuite/gdb.reverse/break-precsave.exp b/gdb/testsuite/gdb.reverse/break-precsave.exp
index e92ec68..7140aa7 100644
--- a/gdb/testsuite/gdb.reverse/break-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/break-precsave.exp
@@ -54,7 +54,7 @@ proc precsave_tests {} {
 	"Saved core file $precsave with execution log\."  \
 	"save process recfile"
 
-    gdb_test "kill" "" "Kill process, prepare to debug log file" \
+    gdb_test "kill" "" "kill process, prepare to debug log file" \
 	"Kill the program being debugged\\? \\(y or n\\) " "y"
 
     gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
index 1d7d586..be34a43 100644
--- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
@@ -46,7 +46,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp
index 96a8d51..fcaf89c 100644
--- a/gdb/testsuite/gdb.reverse/finish-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp
@@ -47,7 +47,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/i386-precsave.exp b/gdb/testsuite/gdb.reverse/i386-precsave.exp
index 7c6c0cb..8d07f95 100644
--- a/gdb/testsuite/gdb.reverse/i386-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/i386-precsave.exp
@@ -64,7 +64,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
index e26b2f5..95e50f3 100644
--- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
@@ -72,7 +72,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
index c933003..8f72f46 100644
--- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
@@ -274,7 +274,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 3d1f4cb..cfdcadf 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -97,7 +97,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/step-precsave.exp b/gdb/testsuite/gdb.reverse/step-precsave.exp
index 92574b6..62c9489 100644
--- a/gdb/testsuite/gdb.reverse/step-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/step-precsave.exp
@@ -57,7 +57,7 @@ with_timeout_factor 10 {
 	"save process recfile"
 }
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp
index f06b662..5091200 100644
--- a/gdb/testsuite/gdb.reverse/until-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/until-precsave.exp
@@ -61,7 +61,7 @@ with_timeout_factor 10 {
 	"save process recfile"
 }
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp
index 27c6417..3c2f06e 100644
--- a/gdb/testsuite/gdb.reverse/watch-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp
@@ -47,7 +47,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp
index 1187de4..d5e9ae6 100644
--- a/gdb/testsuite/gdb.server/ext-attach.exp
+++ b/gdb/testsuite/gdb.server/ext-attach.exp
@@ -68,7 +68,7 @@ gdb_test "attach $testpid" \
     "attach to remote program 2"
 gdb_test "backtrace" ".*main.*" "backtrace 2"
 
-gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
+gdb_test "kill" "" "kill" "kill the program being debugged.*" "y"
 gdb_test_no_output "monitor exit"
 
 kill_wait_spawned_process $test_spawn_id
diff --git a/gdb/testsuite/gdb.server/ext-restart.exp b/gdb/testsuite/gdb.server/ext-restart.exp
index b21c7c5..035686c 100644
--- a/gdb/testsuite/gdb.server/ext-restart.exp
+++ b/gdb/testsuite/gdb.server/ext-restart.exp
@@ -60,6 +60,6 @@ with_test_prefix "restart" {
     }
 }
 
-gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
+gdb_test "kill" "" "kill" "kill the program being debugged.*" "y"
 
 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 223a7fb..f705629 100644
--- a/gdb/testsuite/gdb.server/ext-run.exp
+++ b/gdb/testsuite/gdb.server/ext-run.exp
@@ -61,7 +61,7 @@ if { [istarget *-*-linux*] } {
     }
 }
 
-gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
+gdb_test "kill" "" "kill" "kill the program being debugged.*" "y"
 
 gdb_load $binfile
 gdb_test "monitor help" "The following monitor commands.*" \
diff --git a/gdb/testsuite/gdb.server/ext-wrapper.exp b/gdb/testsuite/gdb.server/ext-wrapper.exp
index f3aa0e4..cd81c21 100644
--- a/gdb/testsuite/gdb.server/ext-wrapper.exp
+++ b/gdb/testsuite/gdb.server/ext-wrapper.exp
@@ -65,6 +65,6 @@ with_test_prefix "restart" {
     gdb_test "print d" "\\$${decimal} = ${hex} \"1\".*"
 }
 
-gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
+gdb_test "kill" "" "kill" "kill the program being debugged.*" "y"
 
 gdb_test_no_output "monitor exit"
diff --git a/gdb/testsuite/gdb.stabs/gdb11479.exp b/gdb/testsuite/gdb.stabs/gdb11479.exp
index ab67280..f395f10 100644
--- a/gdb/testsuite/gdb.stabs/gdb11479.exp
+++ b/gdb/testsuite/gdb.stabs/gdb11479.exp
@@ -25,8 +25,8 @@ proc do_test {version} {
         fail "can't run to main $version"
         return -1
     }
-    gdb_test "rb test" "" "Set breakpoints $version"
-    gdb_test "continue" "Breakpoint .* test2 .*" "Stop at first breakpoint $version"
+    gdb_test "rb test" "" "set breakpoints $version"
+    gdb_test "continue" "Breakpoint .* test2 .*" "stop at first breakpoint $version"
     # Check that the struct is read in correctly
     gdb_test "print *t" ".*\{x = 5, y = 25, b = 2.5\}.*" \
 	"Inspect t in test2 $version"
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index 699b26b..b8c72da 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -142,11 +142,11 @@ proc do_tests {} {
 	gdb_test "p sizeof (const70)" " = 2" "'e' constant with embedded type"
 
 	gdb_test "p constchar" " = 97 'a'" "char constant"
-        gdb_test "p constString1" " = \"Single quote String1\"" "String constant 1"
-        gdb_test "p constString2" " = \"Double quote String2\"" "String constant 2"
+        gdb_test "p constString1" " = \"Single quote String1\"" "string constant 1"
+        gdb_test "p constString2" " = \"Double quote String2\"" "string constant 2"
 
-        gdb_test "p constString3" " = \"String3 with embedded quote ' in the middle\"" "String constant 3"
-        gdb_test "p constString4" { = "String4 with embedded quote \\" in the middle"} "String constant 4"
+        gdb_test "p constString3" " = \"String3 with embedded quote ' in the middle\"" "string constant 3"
+        gdb_test "p constString4" { = "String4 with embedded quote \\" in the middle"} "string constant 4"
 	gdb_test "p bad_neg0" " = \{field0 = 42, field2 =.*field3 = 45\}" "p bad_neg0"
 
 	gdb_test "ptype inttype" "type = (unsigned int|inttype)" "ptype on inttype"
diff --git a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
index 3bac28d..d850e15 100644
--- a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
+++ b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
@@ -155,7 +155,7 @@ proc test {} {
 
 		gdb_test "detach" "Detaching from.*"
 	    } else {
-		gdb_test "kill" "" "kill process" "Kill the program being debugged.*y or n. $" "y"
+		gdb_test "kill" "" "kill process" "kill the program being debugged.*y or n. $" "y"
 	    }
 
 	    gdb_test_no_output "set breakpoint always-inserted off"
diff --git a/gdb/testsuite/gdb.threads/kill.exp b/gdb/testsuite/gdb.threads/kill.exp
index a6d8382..bc00914 100644
--- a/gdb/testsuite/gdb.threads/kill.exp
+++ b/gdb/testsuite/gdb.threads/kill.exp
@@ -68,7 +68,7 @@ proc test {threaded} {
 	#
 	# the above would mean that the remote end crashed.
 
-	gdb_test "kill" "^y" "kill program" "Kill the program being debugged\\? \\(y or n\\) $" "y"
+	gdb_test "kill" "^y" "kill program" "kill the program being debugged\\? \\(y or n\\) $" "y"
     }
 }
 
diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork.exp b/gdb/testsuite/gdb.threads/watchpoint-fork.exp
index 1682982..a21cf76 100644
--- a/gdb/testsuite/gdb.threads/watchpoint-fork.exp
+++ b/gdb/testsuite/gdb.threads/watchpoint-fork.exp
@@ -51,7 +51,7 @@ proc test {type symbol} {
 		return
 	    }
 
-	    gdb_test "watch var" "atchpoint \[0-9\]+: var" "Set the watchpoint"
+	    gdb_test "watch var" "atchpoint \[0-9\]+: var" "set the watchpoint"
 
 	    # It is never hit but it should not be left over in the fork()ed-off child.
 	    if [skip_hw_breakpoint_tests] {
@@ -102,7 +102,7 @@ proc test {type symbol} {
 		return
 	    }
 
-	    gdb_test "watch var" "atchpoint \[0-9\]+: var" "Set the watchpoint"
+	    gdb_test "watch var" "atchpoint \[0-9\]+: var" "set the watchpoint"
 
 	    # It should not be left over in the fork()ed-off child.
 	    gdb_test "$hbreak marker" {reakpoint [0-9]+.*}
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v2 5/8] Fix test names starting with uppercase using multi-line gdb_test/mi_gdb_test
  2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
                   ` (4 preceding siblings ...)
  2016-11-25 20:55 ` [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple Luis Machado
@ 2016-11-25 20:55 ` Luis Machado
  2016-11-30 20:11   ` Pedro Alves
  2016-11-25 20:55 ` [PATCH v2 2/8] Fix test names starting with uppercase using gdb_test on a single line Luis Machado
                   ` (2 subsequent siblings)
  8 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-25 20:55 UTC (permalink / raw)
  To: gdb-patches

This fixes offender testcases that have test names starting with uppercase
when using gdb_test/mi_gdb_test in a multi-line construct.

gdb/testsuite/ChangeLog
2016-11-25  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names starting with uppercase throughout the files.

	* gdb/testsuite/gdb.ada/array_return.exp
	* gdb/testsuite/gdb.ada/expr_delims.exp
	* gdb/testsuite/gdb.ada/mi_dyn_arr.exp
	* gdb/testsuite/gdb.ada/mi_interface.exp
	* gdb/testsuite/gdb.ada/mi_var_array.exp
	* gdb/testsuite/gdb.ada/watch_arg.exp
	* gdb/testsuite/gdb.arch/alpha-step.exp
	* gdb/testsuite/gdb.arch/altivec-regs.exp
	* gdb/testsuite/gdb.arch/e500-regs.exp
	* gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
	* gdb/testsuite/gdb.base/arrayidx.exp
	* gdb/testsuite/gdb.base/break.exp
	* gdb/testsuite/gdb.base/checkpoint.exp
	* gdb/testsuite/gdb.base/debug-expr.exp
	* gdb/testsuite/gdb.base/dmsym.exp
	* gdb/testsuite/gdb.base/radix.exp
	* gdb/testsuite/gdb.base/sepdebug.exp
	* gdb/testsuite/gdb.base/testenv.exp
	* gdb/testsuite/gdb.base/watch_thread_num.exp
	* gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
	* gdb/testsuite/gdb.cell/break.exp
	* gdb/testsuite/gdb.cell/ea-cache.exp
	* gdb/testsuite/gdb.compile/compile.exp
	* gdb/testsuite/gdb.cp/gdb2495.exp
	* gdb/testsuite/gdb.gdb/selftest.exp
	* gdb/testsuite/gdb.gdb/xfullpath.exp
	* gdb/testsuite/gdb.go/hello.exp
	* gdb/testsuite/gdb.go/integers.exp
	* gdb/testsuite/gdb.objc/basicclass.exp
	* gdb/testsuite/gdb.pascal/hello.exp
	* gdb/testsuite/gdb.pascal/integers.exp
	* gdb/testsuite/gdb.python/py-breakpoint.exp
	* gdb/testsuite/gdb.python/py-cmd.exp
	* gdb/testsuite/gdb.python/py-linetable.exp
	* gdb/testsuite/gdb.python/py-xmethods.exp
	* gdb/testsuite/gdb.python/python.exp
	* gdb/testsuite/gdb.reverse/consecutive-precsave.exp
	* gdb/testsuite/gdb.reverse/finish-precsave.exp
	* gdb/testsuite/gdb.reverse/i386-precsave.exp
	* gdb/testsuite/gdb.reverse/machinestate-precsave.exp
	* gdb/testsuite/gdb.reverse/sigall-precsave.exp
	* gdb/testsuite/gdb.reverse/solib-precsave.exp
	* gdb/testsuite/gdb.reverse/step-precsave.exp
	* gdb/testsuite/gdb.reverse/until-precsave.exp
	* gdb/testsuite/gdb.reverse/watch-precsave.exp
	* gdb/testsuite/gdb.threads/leader-exit.exp
	* gdb/testsuite/gdb.threads/pthreads.exp
	* gdb/testsuite/gdb.threads/wp-replication.exp
	* gdb/testsuite/gdb.trace/actions.exp
	* gdb/testsuite/gdb.trace/mi-tsv-changed.exp
	* gdb/testsuite/gdb.trace/tsv.exp
---
 gdb/testsuite/gdb.ada/array_return.exp              |  6 +++---
 gdb/testsuite/gdb.ada/expr_delims.exp               | 10 +++++-----
 gdb/testsuite/gdb.ada/mi_dyn_arr.exp                |  2 +-
 gdb/testsuite/gdb.ada/mi_interface.exp              |  2 +-
 gdb/testsuite/gdb.ada/mi_var_array.exp              |  2 +-
 gdb/testsuite/gdb.ada/watch_arg.exp                 |  4 ++--
 gdb/testsuite/gdb.arch/alpha-step.exp               |  2 +-
 gdb/testsuite/gdb.arch/altivec-regs.exp             |  4 ++--
 gdb/testsuite/gdb.arch/e500-regs.exp                |  4 ++--
 gdb/testsuite/gdb.arch/powerpc-d128-regs.exp        |  6 +++---
 gdb/testsuite/gdb.base/arrayidx.exp                 |  4 ++--
 gdb/testsuite/gdb.base/break.exp                    |  4 ++--
 gdb/testsuite/gdb.base/checkpoint.exp               | 14 +++++++-------
 gdb/testsuite/gdb.base/debug-expr.exp               |  2 +-
 gdb/testsuite/gdb.base/dmsym.exp                    |  2 +-
 gdb/testsuite/gdb.base/radix.exp                    | 10 +++++-----
 gdb/testsuite/gdb.base/sepdebug.exp                 |  6 +++---
 gdb/testsuite/gdb.base/testenv.exp                  | 12 ++++++------
 gdb/testsuite/gdb.base/watch_thread_num.exp         |  2 +-
 gdb/testsuite/gdb.base/watchpoint-cond-gone.exp     |  2 +-
 gdb/testsuite/gdb.cell/break.exp                    |  2 +-
 gdb/testsuite/gdb.cell/ea-cache.exp                 |  2 +-
 gdb/testsuite/gdb.compile/compile.exp               | 10 +++++-----
 gdb/testsuite/gdb.cp/gdb2495.exp                    | 10 +++++-----
 gdb/testsuite/gdb.gdb/selftest.exp                  |  2 +-
 gdb/testsuite/gdb.gdb/xfullpath.exp                 |  2 +-
 gdb/testsuite/gdb.go/hello.exp                      |  4 ++--
 gdb/testsuite/gdb.go/integers.exp                   |  2 +-
 gdb/testsuite/gdb.objc/basicclass.exp               |  8 ++++----
 gdb/testsuite/gdb.pascal/hello.exp                  |  4 ++--
 gdb/testsuite/gdb.pascal/integers.exp               |  2 +-
 gdb/testsuite/gdb.python/py-breakpoint.exp          |  4 ++--
 gdb/testsuite/gdb.python/py-cmd.exp                 |  2 +-
 gdb/testsuite/gdb.python/py-linetable.exp           |  4 ++--
 gdb/testsuite/gdb.python/py-xmethods.exp            |  2 +-
 gdb/testsuite/gdb.python/python.exp                 |  2 +-
 gdb/testsuite/gdb.reverse/consecutive-precsave.exp  |  2 +-
 gdb/testsuite/gdb.reverse/finish-precsave.exp       |  2 +-
 gdb/testsuite/gdb.reverse/i386-precsave.exp         |  2 +-
 gdb/testsuite/gdb.reverse/machinestate-precsave.exp |  2 +-
 gdb/testsuite/gdb.reverse/sigall-precsave.exp       |  2 +-
 gdb/testsuite/gdb.reverse/solib-precsave.exp        |  2 +-
 gdb/testsuite/gdb.reverse/step-precsave.exp         |  2 +-
 gdb/testsuite/gdb.reverse/until-precsave.exp        |  2 +-
 gdb/testsuite/gdb.reverse/watch-precsave.exp        |  2 +-
 gdb/testsuite/gdb.threads/leader-exit.exp           |  2 +-
 gdb/testsuite/gdb.threads/pthreads.exp              |  2 +-
 gdb/testsuite/gdb.threads/wp-replication.exp        |  2 +-
 gdb/testsuite/gdb.trace/actions.exp                 |  2 +-
 gdb/testsuite/gdb.trace/mi-tsv-changed.exp          |  2 +-
 gdb/testsuite/gdb.trace/tsv.exp                     | 14 +++++++-------
 51 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/array_return.exp b/gdb/testsuite/gdb.ada/array_return.exp
index f4dae48..37f2845 100644
--- a/gdb/testsuite/gdb.ada/array_return.exp
+++ b/gdb/testsuite/gdb.ada/array_return.exp
@@ -52,7 +52,7 @@ gdb_test "break create_small_float_vector" \
 
 gdb_test "cont" \
          "Breakpoint \[0-9\]+, pck.create_small \\(\\).*" \
-         "Continuing to Create_Small"
+         "continuing to Create_Small"
 
 gdb_test "finish" \
          "Value returned is \\\$\[0-9\]+ = \\(1, 1\\)" \
@@ -63,7 +63,7 @@ gdb_test "finish" \
 
 gdb_test "cont" \
          "Breakpoint \[0-9\]+, pck.create_large \\(\\).*" \
-         "Continuing to Create_Large"
+         "continuing to Create_Large"
 
 # On hppa32, the value returned is too large to be returned via a register.
 # Instead, it is returned using the struct convention, and the debugger
@@ -82,7 +82,7 @@ gdb_test "finish" \
 
 gdb_test "cont" \
          "Breakpoint \[0-9\]+, pck.create_small_float_vector \\(\\).*" \
-         "Continuing to Create_Small_Float_Vector"
+         "continuing to Create_Small_Float_Vector"
 
 gdb_test "finish" \
          "Value returned is \\\$\[0-9\]+ = \\(4.25, 4.25\\)" \
diff --git a/gdb/testsuite/gdb.ada/expr_delims.exp b/gdb/testsuite/gdb.ada/expr_delims.exp
index 4e1b962..921fb10 100644
--- a/gdb/testsuite/gdb.ada/expr_delims.exp
+++ b/gdb/testsuite/gdb.ada/expr_delims.exp
@@ -39,26 +39,26 @@ gdb_test "continue" \
 # for an expression delimiter.
 gdb_test "print thread" \
          "= 1" \
-         "Print variable 'thread'"
+         "print variable 'thread'"
 
 gdb_test_no_output "delete 1"
 
 gdb_test "watch thread" \
          ".*atchpoint \[0-9\]+: thread" \
-         "Set plain watchpoint on variable 'thread'"
+         "set plain watchpoint on variable 'thread'"
 
 # Make sure that 'if' when followed by an expression beginning
 # with 'i' works.
 gdb_test "watch thread if i = 2" \
          ".*atchpoint \[0-9\]+: thread" \
-         "Set conditional watchpoint."
+         "set conditional watchpoint."
 
 gdb_test "info break" \
          ".*${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}stop only if i = 2" \
-         "Check that watchpoint is set correctly."
+         "check that watchpoint is set correctly."
 
 # Check for right error when using both 'if' and 'thread' clauses.
 
 gdb_test "break foo.adb:$bp_location if thread = 10 thread 999" \
          ".*Unknown thread 999\\." \
-         "Combination of 'if' and 'thread' delimiters."
+         "combination of 'if' and 'thread' delimiters."
diff --git a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
index 9a7da6e..a8ce1f2 100644
--- a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
+++ b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
@@ -45,7 +45,7 @@ mi_continue_to_line \
 
 mi_gdb_test "-var-create bt * bt" \
     "\\^done,name=\"bt\",numchild=\"3\",.*" \
-    "Create bt varobj"
+    "create bt varobj"
 
 mi_gdb_test "-var-update 1 *" \
     "\\^done,changelist=\\\[\\\]" \
diff --git a/gdb/testsuite/gdb.ada/mi_interface.exp b/gdb/testsuite/gdb.ada/mi_interface.exp
index 764236a..30c85f0 100644
--- a/gdb/testsuite/gdb.ada/mi_interface.exp
+++ b/gdb/testsuite/gdb.ada/mi_interface.exp
@@ -45,7 +45,7 @@ mi_continue_to_line \
 
 mi_gdb_test "-var-create ggg1 * ggg1" \
     "\\^done,name=\"ggg1\",numchild=\"1\",value=\"{...}\",type=\"<ref> pck.gadatatype\",has_more=\"0\"" \
-    "Create ggg1 varobj"
+    "create ggg1 varobj"
 
 mi_gdb_test "-var-list-children 1 ggg1" \
     "\\^done,numchild=\"1\",children=\\\[child={name=\"ggg1.i\",exp=\"i\",numchild=\"0\",value=\"42\",type=\"integer\"}\\\],has_more=\"0\"" \
diff --git a/gdb/testsuite/gdb.ada/mi_var_array.exp b/gdb/testsuite/gdb.ada/mi_var_array.exp
index 3c7073f..01b7a61 100644
--- a/gdb/testsuite/gdb.ada/mi_var_array.exp
+++ b/gdb/testsuite/gdb.ada/mi_var_array.exp
@@ -45,7 +45,7 @@ mi_continue_to_line \
 
 mi_gdb_test "-var-create vta * vta" \
     "\\^done,name=\"vta\",numchild=\"2\",.*" \
-    "Create bt varobj"
+    "create bt varobj"
 
 mi_gdb_test "-var-list-children vta" \
     "\\^done,numchild=\"2\",children=\\\[child={name=\"vta.n\",exp=\"n\",numchild=\"0\",type=\"bar\\.int\"},child={name=\"vta.f\",exp=\"f\",numchild=\"0\",type=\"array \\(1 .. n\\) of character\"}\\\],.*" \
diff --git a/gdb/testsuite/gdb.ada/watch_arg.exp b/gdb/testsuite/gdb.ada/watch_arg.exp
index 22a6746..94f1f99 100644
--- a/gdb/testsuite/gdb.ada/watch_arg.exp
+++ b/gdb/testsuite/gdb.ada/watch_arg.exp
@@ -32,7 +32,7 @@ runto "watch.adb:$bp_location"
 
 gdb_test "watch x" \
          ".*atchpoint \[0-9\]+: x" \
-         "Set watchpoint on function argument X"
+         "set watchpoint on function argument X"
 
 # Then insert a breakpoint at the location we'd like to continue to...
 set bp_location [gdb_get_line_number "BREAK2" ${testdir}/watch.adb]
@@ -45,6 +45,6 @@ gdb_test "break watch.adb:$bp_location" \
 
 gdb_test "cont" \
          "Breakpoint \[0-9\]+, watch \\(\\).*" \
-         "Continuing to second breakpoint"
+         "continuing to second breakpoint"
 
 
diff --git a/gdb/testsuite/gdb.arch/alpha-step.exp b/gdb/testsuite/gdb.arch/alpha-step.exp
index e45ad97..16743fb 100644
--- a/gdb/testsuite/gdb.arch/alpha-step.exp
+++ b/gdb/testsuite/gdb.arch/alpha-step.exp
@@ -94,7 +94,7 @@ proc test_stepi {function } {
     
     gdb_test "x /i \$pc" \
              "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fneg.*" \
-             "Check stepi over fb$function stopped on fneg instruction"
+             "check stepi over fb$function stopped on fneg instruction"
 
 }
 
diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp
index f02ef26..51e5e7a 100644
--- a/gdb/testsuite/gdb.arch/altivec-regs.exp
+++ b/gdb/testsuite/gdb.arch/altivec-regs.exp
@@ -170,12 +170,12 @@ gdb_expect_list "info vector" ".*$gdb_prompt $" {
 
 gdb_test "break vector_fun" \
  "Breakpoint 2 at.*altivec-regs.c, line \[0-9\]+\\." \
- "Set breakpoint at vector_fun"
+ "set breakpoint at vector_fun"
 
 # Actually it is nuch easier to see these results printed in hex.
 gdb_test "set output-radix 16" \
   "Output radix now set to decimal 16, hex 10, octal 20." \
-  "Set output radix to hex"
+  "set output radix to hex"
 
 gdb_test "continue" \
   "Breakpoint 2, vector_fun .a=.0xfefefefe, 0xfefefefe, 0xfefefefe, 0xfefefefe., b=.0x1010101, 0x1010101, 0x1010101, 0x1010101.*altivec-regs.c.*vec_splat_u8.2..;" \
diff --git a/gdb/testsuite/gdb.arch/e500-regs.exp b/gdb/testsuite/gdb.arch/e500-regs.exp
index 669f366..6d535aa 100644
--- a/gdb/testsuite/gdb.arch/e500-regs.exp
+++ b/gdb/testsuite/gdb.arch/e500-regs.exp
@@ -160,12 +160,12 @@ if ![runto_main] then {
 
 gdb_test "break vector_fun" \
  "Breakpoint 2 at.*e500-regs.c, line \[0-9\]+\\." \
- "Set breakpoint at vector_fun"
+ "set breakpoint at vector_fun"
 
 # Actually it is nuch easier to see these results printed in hex.
 # gdb_test "set output-radix 16" \
 #   "Output radix now set to decimal 16, hex 10, octal 20." \
-#   "Set output radix to hex"
+#   "set output radix to hex"
 
 gdb_test "continue" \
   "Breakpoint 2, vector_fun .a=.-2, -2., b=.1, 1.*e500-regs.c.*ev_create_s32 .2, 2.;" \
diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
index 2be82c3..758c294 100644
--- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
@@ -57,14 +57,14 @@ gdb_test "print \$dl$i" "\\\$$decimal = 1\.2345678910" "print dl$i register as D
 
 gdb_test "info reg dl$i" \
 	 "dl$i\[ \]*1\.2345678910\[\t\]*\\(raw 0x2205800000000000000000049c5de09c\\)" \
-	 "Print dl$i register with the info reg command"
+	 "print dl$i register with the info reg command"
 
 gdb_test "info reg f[expr 2*$i]" \
 	 "f[expr 2*$i]\[ \]*8\.608957309287334e\-145\[\t\]*\\(raw 0x2205800000000000\\)" \
-	 "Testing lower half of dl$i register"
+	 "testing lower half of dl$i register"
 
 gdb_test "info reg f[expr 2*$i+1]" \
 	 "f[expr 2*$i+1]\[ \]*9\.7841140127686122e\-314\[\t\]*\\(raw 0x000000049c5de09c\\)" \
-	 "Testing upper half of dl$i register"
+	 "testing upper half of dl$i register"
 
 }
diff --git a/gdb/testsuite/gdb.base/arrayidx.exp b/gdb/testsuite/gdb.base/arrayidx.exp
index a2253e9..bfd186b 100644
--- a/gdb/testsuite/gdb.base/arrayidx.exp
+++ b/gdb/testsuite/gdb.base/arrayidx.exp
@@ -38,7 +38,7 @@ gdb_test_no_output "set print array-indexes off" \
 
 gdb_test "print array" \
          "\\{1, 2, 3, 4\\}" \
-         "Print array with array-indexes off"
+         "print array with array-indexes off"
 
 # Second, print the same array with the indexes
 
@@ -47,6 +47,6 @@ gdb_test_no_output "set print array-indexes on" \
 
 gdb_test "print array" \
          "\\{\\\[0\\\] = 1, \\\[1\\\] = 2, \\\[2\\\] = 3, \\\[3\\\] = 4\\}" \
-         "Print array with array-indexes on"
+         "print array with array-indexes on"
 
 
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index 26636a6..fbe4db3 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -434,7 +434,7 @@ gdb_test "tbreak $srcfile:factorial" "Temporary breakpoint.*at.* file .*$srcfile
 #
 gdb_test "tbreak $bp_location1" \
     "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location1.*" \
-    "Temporary breakpoint line number #1"
+    "temporary breakpoint line number #1"
 
 gdb_test "tbreak $bp_location6" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "temporary breakpoint line number #2"
 
@@ -443,7 +443,7 @@ gdb_test "tbreak $bp_location6" "Temporary breakpoint.*at.* file .*$srcfile, lin
 #
 gdb_test "tbreak $srcfile:$bp_location2" \
     "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location2.*" \
-    "Temporary breakpoint line number in file #1"
+    "temporary breakpoint line number in file #1"
 
 set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
 gdb_test  "tbreak $srcfile:$bp_location11" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location11.*" "Temporary breakpoint line number in file #2"
diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index ab18419..0c52092 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -154,7 +154,7 @@ gdb_test "continue" "breakpoint 3.*" "break3 one"
 
 gdb_test "shell diff -s $pi_txt $copy1_txt" \
     "Files .*pi.txt and .*copy1.txt are identical.*" \
-    "Diff input and output one"
+    "diff input and output one"
 
 #
 # And now run from various checkpoints, allowing 
@@ -207,7 +207,7 @@ gdb_test "print lines" " = 1162.*" "verify lines 7 two"
 
 gdb_test "shell diff -s $pi_txt $copy1_txt" \
     "Files .*pi.txt and .*copy1.txt are identical.*" \
-    "Diff input and output two"
+    "diff input and output two"
 
 # 
 # OK, now allow the original program to delete the output file, 
@@ -272,23 +272,23 @@ gdb_test "print ftell (out) > 100000" " = 1.*" "outfile still open 10"
 delete_breakpoints
 gdb_test "continue" \
     "Deleting copy.*$inferior_exited_re normally.*Switching to.*" \
-    "Exit, dropped into next fork one"
+    "exit, dropped into next fork one"
 
 gdb_test "continue" \
     "Deleting copy.*$inferior_exited_re normally.*Switching to.*" \
-    "Exit, dropped into next fork two"
+    "exit, dropped into next fork two"
 
 gdb_test "continue" \
     "Deleting copy.*$inferior_exited_re normally.*Switching to.*" \
-    "Exit, dropped into next fork three"
+    "exit, dropped into next fork three"
 
 gdb_test "continue" \
     "Deleting copy.*$inferior_exited_re normally.*Switching to.*" \
-    "Exit, dropped into next fork four"
+    "exit, dropped into next fork four"
 
 gdb_test "continue" \
     "Deleting copy.*$inferior_exited_re normally.*Switching to.*" \
-    "Exit, dropped into next fork five"
+    "exit, dropped into next fork five"
 
 #
 # There should be still at least five forks left
diff --git a/gdb/testsuite/gdb.base/debug-expr.exp b/gdb/testsuite/gdb.base/debug-expr.exp
index 14e44e0..f254d45 100644
--- a/gdb/testsuite/gdb.base/debug-expr.exp
+++ b/gdb/testsuite/gdb.base/debug-expr.exp
@@ -54,4 +54,4 @@ test_debug_expr "print /x {char\[4\]} array" \
 # This caused gdb to output garbage and possibly segfault
 gdb_test "print \"hello\"" \
     ".*OP_STRING\[^\r\n\]*Language-specific string type: 0.*\[\r\n\]\\$$decimal = \"hello\"\[\r\n\].*" \
-    "String evaluation with debug expr"
+    "string evaluation with debug expr"
diff --git a/gdb/testsuite/gdb.base/dmsym.exp b/gdb/testsuite/gdb.base/dmsym.exp
index 3e8d494..b071424 100644
--- a/gdb/testsuite/gdb.base/dmsym.exp
+++ b/gdb/testsuite/gdb.base/dmsym.exp
@@ -80,7 +80,7 @@ gdb_breakpoint dmsym_main.c:[gdb_get_line_number "BREAK" dmsym_main.c]
 gdb_run_cmd
 gdb_test "" \
          "Breakpoint $num, pck__foo__bar__minsym__2 \\(\\) at.*" \
-         "Run until breakpoint at BREAK"
+         "run until breakpoint at BREAK"
 
 gdb_test "continue" \
          "Breakpoint $num, main \\(\\) at.*"
diff --git a/gdb/testsuite/gdb.base/radix.exp b/gdb/testsuite/gdb.base/radix.exp
index a2ee6be..adc9ca8 100644
--- a/gdb/testsuite/gdb.base/radix.exp
+++ b/gdb/testsuite/gdb.base/radix.exp
@@ -154,21 +154,21 @@ test_output_radix 16 "10" "20"
 
 gdb_test "set radix" \
     "Input and output radices now set to decimal 10, hex a, octal 12\." \
-    "Reset radices"
+    "reset radices"
 
 gdb_test "set input-radix 0" \
     "Nonsense input radix ``decimal 0''; input radix unchanged\\." \
     "Reject input-radix 0"
 gdb_test "show input-radix" \
     "Default input radix for entering numbers is 10\\." \
-    "Input radix unchanged after rejecting 0"
+    "input radix unchanged after rejecting 0"
 
 gdb_test "set input-radix 1" \
     "Nonsense input radix ``decimal 1''; input radix unchanged\\." \
     "Reject input-radix 1"
 gdb_test "show input-radix" \
     "Default input radix for entering numbers is 10\\." \
-    "Input radix unchanged after rejecting 1"
+    "input radix unchanged after rejecting 1"
 
 gdb_test "set output-radix 0" \
     "Unsupported output radix ``decimal 0''; output radix unchanged\\." \
@@ -181,11 +181,11 @@ gdb_test "set output-radix 1" \
     "Reject output-radix 1"
 gdb_test "show output-radix" \
     "Default output radix for printing of values is 10\\." \
-    "Output radix unchanged after rejecting 1"
+    "output radix unchanged after rejecting 1"
 
 gdb_test "set radix 7" \
     "Unsupported output radix ``decimal 7''; output radix unchanged\\." \
     "set radix 7 rejected"
 gdb_test "show output-radix" \
     "Default output radix for printing of values is 10\\." \
-    "Output radix unchanged after rejection through set radix command"
+    "output radix unchanged after rejection through set radix command"
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index aae7c70..2fc7a5d 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -242,11 +242,11 @@ gdb_test "tbreak $srcfile:factorial" "Temporary breakpoint.*at.* file .*$srcfile
 
 gdb_test "tbreak $bp_location1" \
     "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location1.*" \
-    "Temporary breakpoint line number #1"
+    "temporary breakpoint line number #1"
 
 gdb_test "tbreak $bp_location6" \
     "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location6.*" \
-    "Temporary breakpoint line number #2"
+    "temporary breakpoint line number #2"
 
 #
 # test break at line number in file
@@ -254,7 +254,7 @@ gdb_test "tbreak $bp_location6" \
 
 gdb_test "tbreak $srcfile:$bp_location2" \
     "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location2.*" \
-    "Temporary breakpoint line number in file #1"
+    "temporary breakpoint line number in file #1"
 
 set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
 gdb_test  "tbreak $srcfile:$bp_location11" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location11.*" "Temporary breakpoint line number in file #2"
diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp
index 51373b3..27cfe04 100644
--- a/gdb/testsuite/gdb.base/testenv.exp
+++ b/gdb/testsuite/gdb.base/testenv.exp
@@ -49,7 +49,7 @@ gdb_breakpoint  $bp_line
 # First test with no TEST_GDB_VAR
 gdb_test "continue" \
   ".*Program found 0 variables starting with TEST_GDB.*" \
-  "Test no TEST_GDB var"
+  "test no TEST_GDB var"
 
 gdb_test_no_output "set env TEST_GDB_VAR1 test1" \
   "Set TEST_GDB_VAR1"
@@ -60,7 +60,7 @@ gdb_breakpoint  $bp_line
 # Second test with one TEST_GDB_VAR
 gdb_test "continue" \
   ".*Program found 1 variables starting with TEST_GDB.*" \
-  "Test with one TEST_GDB var"
+  "test with one TEST_GDB var"
 
 gdb_test_no_output "set env TEST_GDB_VAR2 test2" \
   "Set TEST_GDB_VAR2"
@@ -71,7 +71,7 @@ gdb_breakpoint  $bp_line
 # Third test with two TEST_GDB_VAR
 gdb_test "continue"  \
   ".*Program found 2 variables starting with TEST_GDB.*" \
-  "Test with two TEST_GDB var"
+  "test with two TEST_GDB var"
 
 gdb_test_no_output "unset env TEST_GDB_VAR1" \
   "Unset TEST_GDB_VAR1"
@@ -83,7 +83,7 @@ gdb_breakpoint  $bp_line
 # with unset command.
 gdb_test "continue"  \
   ".*Program found 1 variables starting with TEST_GDB.*" \
-  "Test with one TEST_GDB var, after unset"
+  "test with one TEST_GDB var, after unset"
 
 gdb_exit
 
@@ -103,7 +103,7 @@ gdb_test "show env" ".*TEST_GDB_GLOBAL=.*" "test passing TEST_GDB_GLOBAL to GDB"
 # First test with only inherited TEST_GDB_GLOBAL
 gdb_test "continue" \
   ".*TEST_GDB_GLOBAL=Global environment value.*Program found 1 variables starting with TEST_GDB.*" \
-  "Test with TEST_GDB_GLOBAL"
+  "test with TEST_GDB_GLOBAL"
 
 gdb_test_no_output "unset env TEST_GDB_GLOBAL" \
   "Unset TEST_GDB_GLOBAL"
@@ -114,7 +114,7 @@ gdb_breakpoint  $bp_line
 # Second test with one TEST_GDB_VAR
 gdb_test "continue" \
   ".*Program found 0 variables starting with TEST_GDB.*" \
-  "Test with TEST_GDB_GLOBAL unset"
+  "test with TEST_GDB_GLOBAL unset"
 
 gdb_exit
 
diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp
index 2077121..5973623 100644
--- a/gdb/testsuite/gdb.base/watch_thread_num.exp
+++ b/gdb/testsuite/gdb.base/watch_thread_num.exp
@@ -75,7 +75,7 @@ delete_breakpoints
 
 gdb_test "awatch shared_var thread $thread_num" \
     "Hardware access \\(read/write\\) watchpoint .*: shared_var.*" \
-    "Watchpoint on shared variable"
+    "watchpoint on shared variable"
 
 gdb_test "info breakpoint \$bpnum" \
     "stop only in thread $thread_num" \
diff --git a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
index d3b7eb6..d85a0ff 100644
--- a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
@@ -43,4 +43,4 @@ gdb_test "watch c if c == 30" "atchpoint \[0-9\]*.*" "place the watchpoint"
 
 gdb_test "finish" \
 	 "Watchpoint .* deleted because the program has left the block in.*which its expression is valid..*in (\\.?jumper|func).*" \
-	 "Catch the no longer valid watchpoint"
+	 "catch the no longer valid watchpoint"
diff --git a/gdb/testsuite/gdb.cell/break.exp b/gdb/testsuite/gdb.cell/break.exp
index 66ed698..5e7b00a 100644
--- a/gdb/testsuite/gdb.cell/break.exp
+++ b/gdb/testsuite/gdb.cell/break.exp
@@ -60,7 +60,7 @@ gdb_load ${ppu_bin}
 # shouldn't prompt for anything.
 gdb_test "delete breakpoints" \
 	 "" \
-	 "No prompt when deleting non-existing breakpoints"
+	 "no prompt when deleting non-existing breakpoints"
 
 gdb_test "break main" \
 	 "Breakpoint.*at.* file .*$testfile.c, line.*" \
diff --git a/gdb/testsuite/gdb.cell/ea-cache.exp b/gdb/testsuite/gdb.cell/ea-cache.exp
index a6b2595..54d2168 100644
--- a/gdb/testsuite/gdb.cell/ea-cache.exp
+++ b/gdb/testsuite/gdb.cell/ea-cache.exp
@@ -78,7 +78,7 @@ gdb_test "p *ppe_int_ptr" \
 # int_var and should now also contain 42 (ea cache has been flushed).
 gdb_test "t 1" \
 	 ".*Switching to thread 1.*" \
-	 "Switch to thread 1"
+	 "switch to thread 1"
 
 gdb_test "p int_var" \
 	 ".*=.*42.*" \
diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp
index 610cf7e..cec44d8 100644
--- a/gdb/testsuite/gdb.compile/compile.exp
+++ b/gdb/testsuite/gdb.compile/compile.exp
@@ -42,15 +42,15 @@ clean_restart ${testfile}
 #
 gdb_test "compile code int i=2;" \
     "The program must be running for the compile command to work.*" \
-    "Test compile code command without running inferior"
+    "test compile code command without running inferior"
 
 gdb_test "compile int i=2;" \
     "The program must be running for the compile command to work.*" \
-    "Test compile command without running inferior"
+    "test compile command without running inferior"
 
 gdb_test "compile file -r ${srcdir}/${subdir}/${testfile}-mod.c" \
     "The program must be running for the compile command to work.*" \
-    "Test compile file command without running inferior"
+    "test compile file command without running inferior"
 
 if ![runto_main] {
     return -1
@@ -79,7 +79,7 @@ gdb_test_no_output "compile -raw -- void _gdb_expr(){int i = 5;}" \
 
 gdb_test "compile -- -r  void _gdb_expr(){int i = 5;}" \
     ".* error: 'r' undeclared \\(first use in this function\\).*" \
-    "Test delimiter with -r after it"
+    "test delimiter with -r after it"
 
 gdb_test "p globalvar" " = 10" "expect 10"
 
@@ -339,7 +339,7 @@ gdb_test "compile file -r" \
     "Test compile file and raw option without a filename"
 gdb_test "compile file -z" \
     "Unknown argument.*" \
-    "Test compile file with unknown argument"
+    "test compile file with unknown argument"
 
 
 # LOC_CONST tests.
diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp
index f80c30c..dff5977 100644
--- a/gdb/testsuite/gdb.cp/gdb2495.exp
+++ b/gdb/testsuite/gdb.cp/gdb2495.exp
@@ -80,7 +80,7 @@ gdb_test "p exceptions.throw_function_with_handler()" " = 2"
 # does not handle it.  It should be rewound.
 gdb_test "p exceptions.throw_function()" \
     "The program being debugged entered a std::terminate call, .*" \
-    "Call a function that raises an exception without a handler."
+    "call a function that raises an exception without a handler."
 
 # Make sure that after rewinding we are back at the call parent.
 gdb_test "bt" \
@@ -103,12 +103,12 @@ gdb_test_multiple "set unwind-on-terminating-exception off" \
 # Check that it is turned off.
 gdb_test "show unwind-on-terminating-exception" \
     "exception is unhandled while in a call dummy is off.*" \
-    "Turn off unwind on terminating exception flag"
+    "turn off unwind on terminating exception flag"
 
 # Check that the old behaviour is restored.
 gdb_test "p exceptions.throw_function()" \
     "The program being debugged was signaled while in a function called .*" \
-    "Call a function that raises an exception with unwinding off.."
+    "call a function that raises an exception with unwinding off.."
 
 # Restart the inferior back at main.
 if ![runto_main] then {
@@ -129,7 +129,7 @@ gdb_test_multiple "set unwindonsignal on" "turn unwindonsignal on" {
 # Check that it is turned on.
 gdb_test "show unwindonsignal" \
     "signal is received while in a call dummy is on.*" \
-    "Turn on unwind on signal"
+    "turn on unwind on signal"
 
 # Check to see if new behaviour interferes with
 # normal signal handling in inferior function calls.
@@ -145,7 +145,7 @@ gdb_test_multiple "set unwindonsignal off" "turn unwindonsignal off" {
 # Check that it is actually turned off.
 gdb_test "show unwindonsignal" \
     "signal is received while in a call dummy is off.*" \
-    "Turn off unwind on signal"
+    "turn off unwind on signal"
 
 # Check to see if new behaviour interferes with
 # normal signal handling in inferior function calls.
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index 28d5493..340137a 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -274,7 +274,7 @@ proc test_with_self { } {
     # disassemble yourself
     gdb_test "x/10i main" \
 	    "x/10i.*main.*main($cxx_main_args_re)?.$decimal.*main($cxx_main_args_re)?.$decimal.*" \
-	    "Disassemble main"
+	    "disassemble main"
 
     # We'll need this when we send a ^C to GDB.  Need to do it before we
     # run the program and gdb starts saving and restoring tty states.
diff --git a/gdb/testsuite/gdb.gdb/xfullpath.exp b/gdb/testsuite/gdb.gdb/xfullpath.exp
index 7981a35..812b5ea 100644
--- a/gdb/testsuite/gdb.gdb/xfullpath.exp
+++ b/gdb/testsuite/gdb.gdb/xfullpath.exp
@@ -52,7 +52,7 @@ proc test_with_self {} {
     # An empty filename
     gdb_test "print gdb_realpath (\"\")" \
              ".\[0-9\]+ =.*\"\"" \
-             "An empty filename"
+             "an empty filename"
 
     return 0
 }
diff --git a/gdb/testsuite/gdb.go/hello.exp b/gdb/testsuite/gdb.go/hello.exp
index 666567c..192d035 100644
--- a/gdb/testsuite/gdb.go/hello.exp
+++ b/gdb/testsuite/gdb.go/hello.exp
@@ -39,7 +39,7 @@ setup_xfail "*-*-*"
 
 gdb_test "print st" \
     ".* = $hex \"\"" \
-    "Starting string check"
+    "starting string check"
 
 if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
     pass "setting breakpoint 1"
@@ -49,4 +49,4 @@ gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
 gdb_test "print st" \
     ".* = $hex \"Hello, world!\"" \
-    "String after assignment check"
+    "string after assignment check"
diff --git a/gdb/testsuite/gdb.go/integers.exp b/gdb/testsuite/gdb.go/integers.exp
index dd28f6d..d242add 100644
--- a/gdb/testsuite/gdb.go/integers.exp
+++ b/gdb/testsuite/gdb.go/integers.exp
@@ -112,4 +112,4 @@ gdb_test "cont" \
 	 "Going to second breakpoint"
 gdb_test "print i" \
 	 ".* = 5.*" \
-	 "Value of i after assignment"
+	 "value of i after assignment"
diff --git a/gdb/testsuite/gdb.objc/basicclass.exp b/gdb/testsuite/gdb.objc/basicclass.exp
index d950645..43db8e4 100644
--- a/gdb/testsuite/gdb.objc/basicclass.exp
+++ b/gdb/testsuite/gdb.objc/basicclass.exp
@@ -163,21 +163,21 @@ gdb_test continue \
 #
 gdb_test "print \[self printHi\]" \
     "Hi.*\\$\[0-9\] = \\(.*objc_object \\*\\) 0x\[0-9a-f\]+" \
-    "Call an Objective-C method with no arguments"
+    "call an Objective-C method with no arguments"
 
 gdb_test "print \[self printNumber: 42\]" \
     "42.*\\$\[0-9\] = 43" \
-    "Call an Objective-C method with one argument"
+    "call an Objective-C method with one argument"
 
 #
 # Test printing the object description
 #
 gdb_test "print-object object" \
     "BasicClass gdb test object" \
-    "Use of the print-object command"
+    "use of the print-object command"
 
 gdb_test "po self" \
     "BasicClass gdb test object" \
-    "Use of the po (print-object) command"
+    "use of the po (print-object) command"
 
 
diff --git a/gdb/testsuite/gdb.pascal/hello.exp b/gdb/testsuite/gdb.pascal/hello.exp
index c4577ee..b705dce 100644
--- a/gdb/testsuite/gdb.pascal/hello.exp
+++ b/gdb/testsuite/gdb.pascal/hello.exp
@@ -50,7 +50,7 @@ gdb_test "cont" \
          "Going to first breakpoint"
 gdb_test "print st" \
 	 ".* = ''.*" \
-	 "Empty string check"
+	 "empty string check"
 
 # This test also fails for gpc because the program
 # stops after the string has been written
@@ -63,4 +63,4 @@ gdb_test "cont" \
 	 "Going to second breakpoint"
 gdb_test "print st" \
 	 ".* = 'Hello, world!'.*" \
-	 "String after assignment check"
+	 "string after assignment check"
diff --git a/gdb/testsuite/gdb.pascal/integers.exp b/gdb/testsuite/gdb.pascal/integers.exp
index 4e62745..3d83711 100644
--- a/gdb/testsuite/gdb.pascal/integers.exp
+++ b/gdb/testsuite/gdb.pascal/integers.exp
@@ -117,4 +117,4 @@ gdb_test "cont" \
 	 "Going to second breakpoint"
 gdb_test "print i" \
 	 ".* = 5.*" \
-	 "Value of i after assignment"
+	 "value of i after assignment"
diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index 7503f5a..e7b2948 100644
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -72,7 +72,7 @@ proc test_bkpt_basic { } {
 
 	gdb_test "python print (blist\[1\].location)" \
 	    "py-breakpoint\.c:${mult_line}*" \
-	    "Check breakpoint location @mult_line"
+	    "check breakpoint location @mult_line"
 
 	# Check hit and ignore counts. 
 	gdb_test "python print (blist\[1\].hit_count)" \
@@ -392,7 +392,7 @@ proc test_bkpt_eval_funcs { } {
 
 	gdb_test "python eval_bp2.stop = stop_func"  \
 	    "RuntimeError: Only one stop condition allowed.  There is currently a GDB.*" \
-	    "Assign stop function to a breakpoint that has a condition"
+	    "assign stop function to a breakpoint that has a condition"
 
 	delete_breakpoints
 	gdb_breakpoint [gdb_get_line_number "Break at multiply."]
diff --git a/gdb/testsuite/gdb.python/py-cmd.exp b/gdb/testsuite/gdb.python/py-cmd.exp
index 0665b8e..f42fcac 100644
--- a/gdb/testsuite/gdb.python/py-cmd.exp
+++ b/gdb/testsuite/gdb.python/py-cmd.exp
@@ -179,7 +179,7 @@ gdb_py_test_multiple "expression completion command" \
 
 gdb_test "complete expr_test bar\." \
     "expr_test bar\.bc.*expr_test bar\.ij.*" \
-    "Test completion through complete command"
+    "test completion through complete command"
 
 if { [readline_is_used] } {
     set test "complete 'expr_test bar.i'"
diff --git a/gdb/testsuite/gdb.python/py-linetable.exp b/gdb/testsuite/gdb.python/py-linetable.exp
index 702c654..b65f46d 100644
--- a/gdb/testsuite/gdb.python/py-linetable.exp
+++ b/gdb/testsuite/gdb.python/py-linetable.exp
@@ -62,7 +62,7 @@ gdb_py_test_silent_cmd "python fset = lt.source_lines()" \
     "Get all source lines into a frozen set" 0
 gdb_test "python print (sorted(fset))" \
     "\\\[20, 21, 22, 24, 25, 28, 29, 30, 32, 33, 37, 39, 40, 42, 44, 45, 46\\\].*" \
-    "Test frozen set contains line numbers"
+    "test frozen set contains line numbers"
 
 # Test gdb.Linetable.has_line ()
 gdb_test "python print(lt.has_line(20))" \
@@ -73,4 +73,4 @@ gdb_test "python print(lt.has_line(44))" \
     "Test has_pcs at line 40"
 gdb_test "python print(lt.has_line(10))" \
     "False.*" \
-    "Test has_pcs at line 10"
+    "test has_pcs at line 10"
diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
index 0d7957f..cdb374f 100644
--- a/gdb/testsuite/gdb.python/py-xmethods.exp
+++ b/gdb/testsuite/gdb.python/py-xmethods.exp
@@ -125,7 +125,7 @@ gdb_test "p g.mul<double>(2.0)" "From Python G<>::mul.*" \
   "After: g.mul<double>(2.0)"
 gdb_test "p g.mul<char>('a')" "From Python G<>::mul.*" \
 gdb_test "p g_ptr->mul<char>('a')" "From Python G<>::mul.*" \
-  "After: g_ptr->mul<char>('a')"
+  "after: g_ptr->mul<char>('a')"
 
 # Tests for 'disable/enable xmethod' command.
 gdb_test_no_output "disable xmethod progspace G_methods" \
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index b657016..e789359 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -408,7 +408,7 @@ gdb_py_test_silent_cmd "set python print-stack none" \
     "Test print-stack set setting to none" 1
 gdb_test "show python print-stack" \
     "The mode of Python stack printing on error is \"none\".*" \
-    "Test print-stack show setting to none"
+    "test print-stack show setting to none"
 
 gdb_py_test_silent_cmd "set python print-stack message" \
     "Test print-stack set setting to message" 1
diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
index ff86051..f019dde 100644
--- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
@@ -38,7 +38,7 @@ if [supports_process_record] {
 set end_location  [gdb_get_line_number "end of main"  ]
 gdb_test "break $end_location" \
     "Breakpoint $decimal at .*$srcfile, line $end_location\." \
-    "BP at end of main"
+    "breakpoint at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp
index 65a3af1..efb319c 100644
--- a/gdb/testsuite/gdb.reverse/finish-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp
@@ -39,7 +39,7 @@ if [supports_process_record] {
 set breakloc [gdb_get_line_number "end of main" "$srcfile"]
 gdb_test "break $breakloc" \
     "Breakpoint $decimal at .*$srcfile, line $breakloc\." \
-    "BP at end of main"
+    "breakpoint at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
diff --git a/gdb/testsuite/gdb.reverse/i386-precsave.exp b/gdb/testsuite/gdb.reverse/i386-precsave.exp
index 81788d6..c83c2f3 100644
--- a/gdb/testsuite/gdb.reverse/i386-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/i386-precsave.exp
@@ -56,7 +56,7 @@ global decimal
 
 gdb_test "break $end_of_main" \
     "Breakpoint $decimal at .*$srcfile, line $end_of_main\." \
-    "BP at end of main"
+    "breakpoint at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
index 02f1cca..d3ca649 100644
--- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
@@ -64,7 +64,7 @@ if [supports_process_record] {
 
 gdb_test "break $endmain" \
     "Breakpoint $decimal at .*$srcfile, line $endmain\." \
-    "BP at end of main"
+    "breakpoint at end of main"
 
 gdb_test "continue" "Breakpoint .* end main .*" "run to end of main"
 
diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
index 24dff80..a05a842 100644
--- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
@@ -162,7 +162,7 @@ if [supports_process_record] {
 set breakloc [gdb_get_line_number "end of main" "$srcfile"]
 gdb_test "break $breakloc" \
     "Breakpoint $decimal at .*$srcfile, line $breakloc\." \
-    "BP at end of main"
+    "breakpoint at end of main"
 
 # Signal handlers must be disabled
 gdb_test "handle all nostop noprint"
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 8dbf355..1db4f3f 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -89,7 +89,7 @@ if [supports_process_record] {
 set end_of_main [gdb_get_line_number "end of main" ]
 gdb_test "break $end_of_main" \
     "Breakpoint $decimal at .*$srcfile, line $end_of_main\." \
-    "BP at end of main"
+    "breakpoint at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
diff --git a/gdb/testsuite/gdb.reverse/step-precsave.exp b/gdb/testsuite/gdb.reverse/step-precsave.exp
index 11a56d5..4741a59 100644
--- a/gdb/testsuite/gdb.reverse/step-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/step-precsave.exp
@@ -42,7 +42,7 @@ if [supports_process_record] {
 set end_of_main [gdb_get_line_number "end of main" ]
 gdb_test "break $end_of_main" \
     "Breakpoint $decimal at .*$srcfile, line $end_of_main\." \
-    "BP at end of main"
+    "breakpoint at end of main"
 
 # This can take awhile.
 with_timeout_factor 20 {
diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp
index 471a7e1..2934e6a 100644
--- a/gdb/testsuite/gdb.reverse/until-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/until-precsave.exp
@@ -46,7 +46,7 @@ if [supports_process_record] {
 set end_of_main [gdb_get_line_number "set breakpoint 10a here" ]
 gdb_test "break $end_of_main" \
     "Breakpoint $decimal at .*$srcfile, line $end_of_main\." \
-    "BP at end of main"
+    "breakpoint at end of main"
 
 # This can take awhile.
 with_timeout_factor 20 {
diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp
index ee24a48..25f6a42 100644
--- a/gdb/testsuite/gdb.reverse/watch-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp
@@ -39,7 +39,7 @@ if [supports_process_record] {
 set end_location  [gdb_get_line_number "end of main"  ]
 gdb_test "break $end_location" \
     "Breakpoint $decimal at .*$srcfile, line $end_location\." \
-    "BP at end of main"
+    "breakpoint at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
diff --git a/gdb/testsuite/gdb.threads/leader-exit.exp b/gdb/testsuite/gdb.threads/leader-exit.exp
index 7daea8f..f018f47 100644
--- a/gdb/testsuite/gdb.threads/leader-exit.exp
+++ b/gdb/testsuite/gdb.threads/leader-exit.exp
@@ -38,7 +38,7 @@ gdb_continue_to_breakpoint "break-here" ".* break-here .*"
 
 gdb_test "info threads" \
 	 "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n\\* 2 *Thread \[^\r\n\]* at \[^\r\n\]*" \
-	 "Single thread has been left"
+	 "single thread has been left"
 
 # Test that ctrl-c works even if the leader has exited.
 
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 2d26505..fa8ff9a 100644
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -171,7 +171,7 @@ proc test_startup {} {
     gdb_test "break thread2" "Breakpoint .* file .*$srcfile.*"
     gdb_test "continue" \
 	    "Continuing.*Breakpoint .*, thread2 \\(arg=0xdeadbeef\\).*at.*$srcfile.*" \
-	    "Continue to creation of second thread"
+	    "continue to creation of second thread"
 
     # Extract the thread id number of thread 2 from "info threads" output.
     gdb_test_multiple "info threads" "get thread 2 id" {
diff --git a/gdb/testsuite/gdb.threads/wp-replication.exp b/gdb/testsuite/gdb.threads/wp-replication.exp
index 88a2e06..9378ff8 100644
--- a/gdb/testsuite/gdb.threads/wp-replication.exp
+++ b/gdb/testsuite/gdb.threads/wp-replication.exp
@@ -102,7 +102,7 @@ delete_breakpoints
 # Prepare to create all the threads.
 gdb_test "break thread_started" \
 	 "Breakpoint \[0-9\]+ at .*: file .*${srcfile}, line .*" \
-	 "Breakpoint on thread_started"
+	 "breakpoint on thread_started"
 
 # Move all threads to where they're supposed to be for testing.
 for { set i 0 } { $i < $NR_THREADS } { incr i } {
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index f02890a..46890f5 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -212,7 +212,7 @@ gdb_test_no_output "set default-collect" \
 
 gdb_test "tvariable \$tsv" \
   "Trace state variable \\\$tsv created, with initial value 0." \
-  "Create a trace state variable"
+  "create a trace state variable"
 
 gdb_trace_setactions "5.10a: set teval action for first tracepoint" \
 	"$trcpt1" \
diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
index cf9a448..1e0e866 100644
--- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
@@ -153,7 +153,7 @@ proc test_upload_tsv { } {
 
 	gdb_test "tvariable \$tvar1" \
 	    "Trace state variable \\\$tvar1 created, with initial value 0." \
-	    "Create a trace state variable"
+	    "create a trace state variable"
 
 	gdb_test "tvariable \$tvar2 = 45" \
 	    "Trace state variable \\\$tvar2 created, with initial value 45." \
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index d9e2d6b..a976480 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -28,23 +28,23 @@ gdb_load $binfile
 
 gdb_test "tvariable \$tvar1" \
   "Trace state variable \\\$tvar1 created, with initial value 0." \
-  "Create a trace state variable"
+  "create a trace state variable"
 
 gdb_test "tvariable \$tvar2 = 45" \
   "Trace state variable \\\$tvar2 created, with initial value 45." \
-  "Create a trace state variable with initial value"
+  "create a trace state variable with initial value"
 
 gdb_test "tvariable \$tvar2 = -92" \
   "Trace state variable \\\$tvar2 now has initial value -92." \
-  "Change initial value of a trace state variable"
+  "change initial value of a trace state variable"
 
 gdb_test "tvariable \$tvar3 = 2 + 3" \
   "Trace state variable \\\$tvar3 created, with initial value 5." \
-  "Create a trace state variable with expression"
+  "create a trace state variable with expression"
 
 gdb_test "tvariable \$tvar3 = 1234567000000" \
   "Trace state variable \\\$tvar3 now has initial value 1234567000000." \
-  "Init trace state variable to a 64-bit value"
+  "init trace state variable to a 64-bit value"
 
 gdb_test "tvariable $" \
   "Must supply a non-empty variable name" \
@@ -97,7 +97,7 @@ gdb_test "delete tvariable" \
 
 gdb_test "info tvariables" \
   "No trace state variables.*" \
-  "List tvariables after deleting all"
+  "list tvariables after deleting all"
 
 # Now try running a trace.
 
@@ -120,7 +120,7 @@ if { $trcpt1 <= 0 } then {
 
 gdb_test "tvariable \$tvar5 = 15" \
   "Trace state variable \\\$tvar5 created, with initial value 15." \
-  "Create a trace state variable tvar5"
+  "create a trace state variable tvar5"
 
 gdb_trace_setactions "collect tsv for first tracepoint" \
 	"$trcpt1" \
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 2/8] Fix test names starting with uppercase using gdb_test on a single line.
  2016-11-25 20:55 ` [PATCH v2 2/8] Fix test names starting with uppercase using gdb_test on a single line Luis Machado
@ 2016-11-27 16:48   ` Yao Qi
  2016-11-28 18:13     ` [PATCH v3 " Luis Machado
  0 siblings, 1 reply; 33+ messages in thread
From: Yao Qi @ 2016-11-27 16:48 UTC (permalink / raw)
  To: Luis Machado; +Cc: gdb-patches

On Fri, Nov 25, 2016 at 02:53:58PM -0600, Luis Machado wrote:
> This fixes offender testcases that have test names starting with uppercase
> when using gdb_test in a single line construct.
> 
> gdb/testsuite/ChangeLog
> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
> 
> 	Fix test names starting with uppercase throughout the files.
> 
> 	* gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
> 	* gdb/testsuite/gdb.arch/i386-mpx.exp
> 	* gdb/testsuite/gdb.arch/i386-permbkpt.exp
> 	* gdb/testsuite/gdb.arch/pa-nullify.exp
> 	* gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
> 	* gdb/testsuite/gdb.arch/vsx-regs.exp
> 	* gdb/testsuite/gdb.base/bfp-test.exp
> 	* gdb/testsuite/gdb.base/break.exp
> 	* gdb/testsuite/gdb.base/breakpoint-shadow.exp
> 	* gdb/testsuite/gdb.base/callfuncs.exp
> 	* gdb/testsuite/gdb.base/charset.exp
> 	* gdb/testsuite/gdb.base/commands.exp
> 	* gdb/testsuite/gdb.base/completion.exp
> 	* gdb/testsuite/gdb.base/dfp-test.exp
> 	* gdb/testsuite/gdb.base/echo.exp
> 	* gdb/testsuite/gdb.base/ending-run.exp
> 	* gdb/testsuite/gdb.base/eval.exp
> 	* gdb/testsuite/gdb.base/expand-psymtabs.exp
> 	* gdb/testsuite/gdb.base/float128.exp
> 	* gdb/testsuite/gdb.base/floatn.exp
> 	* gdb/testsuite/gdb.base/foll-exec-mode.exp
> 	* gdb/testsuite/gdb.base/gdb1056.exp
> 	* gdb/testsuite/gdb.base/gdb11531.exp
> 	* gdb/testsuite/gdb.base/kill-after-signal.exp
> 	* gdb/testsuite/gdb.base/multi-forks.exp
> 	* gdb/testsuite/gdb.base/overlays.exp
> 	* gdb/testsuite/gdb.base/pending.exp
> 	* gdb/testsuite/gdb.base/sepdebug.exp
> 	* gdb/testsuite/gdb.base/testenv.exp
> 	* gdb/testsuite/gdb.base/valgrind-db-attach.exp
> 	* gdb/testsuite/gdb.base/watch_thread_num.exp
> 	* gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
> 	* gdb/testsuite/gdb.base/watchpoint.exp
> 	* gdb/testsuite/gdb.base/watchpoints.exp
> 	* gdb/testsuite/gdb.cp/arg-reference.exp
> 	* gdb/testsuite/gdb.cp/baseenum.exp
> 	* gdb/testsuite/gdb.cp/operator.exp
> 	* gdb/testsuite/gdb.cp/shadow.exp
> 	* gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
> 	* gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
> 	* gdb/testsuite/gdb.go/chan.exp
> 	* gdb/testsuite/gdb.go/hello.exp
> 	* gdb/testsuite/gdb.go/integers.exp
> 	* gdb/testsuite/gdb.go/methods.exp
> 	* gdb/testsuite/gdb.go/package.exp
> 	* gdb/testsuite/gdb.guile/scm-parameter.exp
> 	* gdb/testsuite/gdb.guile/scm-progspace.exp
> 	* gdb/testsuite/gdb.guile/scm-value.exp
> 	* gdb/testsuite/gdb.mi/mi-pending.exp
> 	* gdb/testsuite/gdb.mi/user-selected-context-sync.exp
> 	* gdb/testsuite/gdb.multi/multi-attach.exp
> 	* gdb/testsuite/gdb.multi/tids.exp
> 	* gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
> 	* gdb/testsuite/gdb.pascal/floats.exp
> 	* gdb/testsuite/gdb.pascal/integers.exp
> 	* gdb/testsuite/gdb.python/py-block.exp
> 	* gdb/testsuite/gdb.python/py-events.exp
> 	* gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
> 	* gdb/testsuite/gdb.python/py-parameter.exp
> 	* gdb/testsuite/gdb.python/py-symbol.exp
> 	* gdb/testsuite/gdb.python/py-symtab.exp
> 	* gdb/testsuite/gdb.python/py-type.exp
> 	* gdb/testsuite/gdb.python/py-value.exp
> 	* gdb/testsuite/gdb.python/py-xmethods.exp
> 	* gdb/testsuite/gdb.python/python.exp
> 	* gdb/testsuite/gdb.reverse/break-precsave.exp
> 	* gdb/testsuite/gdb.reverse/consecutive-precsave.exp
> 	* gdb/testsuite/gdb.reverse/finish-precsave.exp
> 	* gdb/testsuite/gdb.reverse/i386-precsave.exp
> 	* gdb/testsuite/gdb.reverse/machinestate-precsave.exp
> 	* gdb/testsuite/gdb.reverse/sigall-precsave.exp
> 	* gdb/testsuite/gdb.reverse/solib-precsave.exp
> 	* gdb/testsuite/gdb.reverse/step-precsave.exp
> 	* gdb/testsuite/gdb.reverse/until-precsave.exp
> 	* gdb/testsuite/gdb.reverse/watch-precsave.exp
> 	* gdb/testsuite/gdb.server/ext-attach.exp
> 	* gdb/testsuite/gdb.server/ext-restart.exp
> 	* gdb/testsuite/gdb.server/ext-run.exp
> 	* gdb/testsuite/gdb.server/ext-wrapper.exp
> 	* gdb/testsuite/gdb.stabs/gdb11479.exp
> 	* gdb/testsuite/gdb.stabs/weird.exp
> 	* gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
> 	* gdb/testsuite/gdb.threads/kill.exp
> 	* gdb/testsuite/gdb.threads/watchpoint-fork.exp

Drop "gdb/testsuite/".

>  # test break at line number in file
> @@ -670,7 +670,7 @@ proc test_next_with_recursion {} {
>      global decimal
>      global binfile
>  
> -    gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
> +    gdb_test "kill" "" "kill program" "kill the program being debugged.*y or n. $" "y"

"Kill the program" is to be matched to the output of GDB, so this change
is not needed.  There are some instances of this problem in this patch.

>      delete_breakpoints
>  
>      gdb_test "break factorial" "Breakpoint $decimal at .*" "break at factorial"
>  
 
> diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/gdb.base/kill-after-signal.exp
> index 4181bec..69b27e7 100644
> --- a/gdb/testsuite/gdb.base/kill-after-signal.exp
> +++ b/gdb/testsuite/gdb.base/kill-after-signal.exp
> @@ -37,4 +37,4 @@ if ![runto_main] {
>  
>  gdb_test "continue" "Program received signal SIGUSR1, .*"
>  gdb_test "stepi" "\r\nhandler .*"
> -gdb_test "kill" "^y" "kill" "Kill the program being debugged\\? \\(y or n\\) $" "y"
> +gdb_test "kill" "^y" "kill" "kill the program being debugged\\? \\(y or n\\) $" "y"

Likewise.

>  # test break at function in file
> @@ -480,7 +480,7 @@ proc test_next_with_recursion {} {
>      global decimal
>      global binfile
>  
> -    gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
> +    gdb_test "kill" "" "kill program" "kill the program being debugged.*y or n. $" "y"
>      delete_breakpoints
>

Likewise.

>  # Explicitly kill the program so it doesn't dump core when we quit->detach.
> -gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
> +gdb_test "kill" "" "kill program" "kill the program being debugged.*y or n. $" "y"

Likewise.
  
> -gdb_test "kill" "" "kill inferior 2" "Kill the program being debugged.*" "y"
> +gdb_test "kill" "" "kill inferior 2" "kill the program being debugged.*" "y"
>  gdb_test "inferior 1" ".*Switching to inferior 1.*"
> -gdb_test "kill" "" "kill inferior 1" "Kill the program being debugged.*" "y"
> +gdb_test "kill" "" "kill inferior 1" "kill the program being debugged.*" "y"

Likewise.

>  kill_wait_spawned_process $test_spawn_id1
>  kill_wait_spawned_process $test_spawn_id2
> diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tids.exp
> index 12ce98a..4808b0d 100644
> --- a/gdb/testsuite/gdb.multi/tids.exp
> +++ b/gdb/testsuite/gdb.multi/tids.exp
> @@ -409,7 +409,7 @@ if { ![skip_python_tests] } {
>  # Remove the second inferior and confirm that GDB goes back to showing
>  # single-number thread IDs.
>  with_test_prefix "back to one inferior" {
> -    gdb_test "kill inferior 2" "" "kill inferior 2" "Kill the program being debugged.*" "y"
> +    gdb_test "kill inferior 2" "" "kill inferior 2" "kill the program being debugged.*" "y"
>      gdb_test "thread 1.1" "Switching to thread 1\.1 .*"
>      gdb_test "remove-inferior 2" ".*" "remove inferior 2"
>

Likewise.
 
 
> -gdb_test "continue" ".*exception did not finish.*" "FinishBreakpoint with exception thrown not caught"
> +gdb_test "continue" ".*exception did not finish.*" "finishBreakpoint with exception thrown not caught"

FinishBreakpoint should be kept as-is, IMO, or we can rewrite the
message like "exception thrown not caught".

> diff --git a/gdb/testsuite/gdb.server/ext-restart.exp b/gdb/testsuite/gdb.server/ext-restart.exp
> index b21c7c5..035686c 100644
> --- a/gdb/testsuite/gdb.server/ext-restart.exp
> +++ b/gdb/testsuite/gdb.server/ext-restart.exp
> @@ -60,6 +60,6 @@ with_test_prefix "restart" {
>      }
>  }
>  
> -gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
> +gdb_test "kill" "" "kill" "kill the program being debugged.*" "y"
>

Likewise.

> --- a/gdb/testsuite/gdb.server/ext-wrapper.exp
> +++ b/gdb/testsuite/gdb.server/ext-wrapper.exp
> @@ -65,6 +65,6 @@ with_test_prefix "restart" {
>      gdb_test "print d" "\\$${decimal} = ${hex} \"1\".*"
>  }
>  
> -gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
> +gdb_test "kill" "" "kill" "kill the program being debugged.*" "y"
>  
 
>  		gdb_test "detach" "Detaching from.*"
>  	    } else {
> -		gdb_test "kill" "" "kill process" "Kill the program being debugged.*y or n. $" "y"
> +		gdb_test "kill" "" "kill process" "kill the program being debugged.*y or n. $" "y"
>  	    }
>  
>  	    gdb_test_no_output "set breakpoint always-inserted off"
> diff --git a/gdb/testsuite/gdb.threads/kill.exp b/gdb/testsuite/gdb.threads/kill.exp
> index a6d8382..bc00914 100644
> --- a/gdb/testsuite/gdb.threads/kill.exp
> +++ b/gdb/testsuite/gdb.threads/kill.exp
> @@ -68,7 +68,7 @@ proc test {threaded} {
>  	#
>  	# the above would mean that the remote end crashed.
>  
> -	gdb_test "kill" "^y" "kill program" "Kill the program being debugged\\? \\(y or n\\) $" "y"
> +	gdb_test "kill" "^y" "kill program" "kill the program being debugged\\? \\(y or n\\) $" "y"
>      }
>  }
>  

Otherwise, patch is good to me.

-- 
Yao 

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 3/8] Fix test names starting with uppercase using gdb_test_no_output
  2016-11-25 20:54 ` [PATCH v2 3/8] Fix test names starting with uppercase using gdb_test_no_output Luis Machado
@ 2016-11-27 16:58   ` Yao Qi
  0 siblings, 0 replies; 33+ messages in thread
From: Yao Qi @ 2016-11-27 16:58 UTC (permalink / raw)
  To: Luis Machado; +Cc: gdb-patches

On Fri, Nov 25, 2016 at 02:53:59PM -0600, Luis Machado wrote:
> This fixes offender testcases that have test names starting with uppercase
> when using gdb_test_no_output in a single-line construct.
> 
> gdb/testsuite/ChangeLog
> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
> 
> 	Fix test names starting with uppercase throughout the files.
> 
> 	* gdb/testsuite/gdb.base/charset.exp
> 	* gdb/testsuite/gdb.base/eval.exp
> 	* gdb/testsuite/gdb.base/multi-forks.exp
> 	* gdb/testsuite/gdb.guile/scm-progspace.exp
> 	* gdb/testsuite/gdb.opencl/datatypes.exp
> 	* gdb/testsuite/gdb.python/py-block.exp
> 	* gdb/testsuite/gdb.python/py-function.exp
> 	* gdb/testsuite/gdb.python/py-symbol.exp
> 	* gdb/testsuite/gdb.python/py-symtab.exp
> 	* gdb/testsuite/gdb.python/py-xmethods.exp
> 	* gdb/testsuite/gdb.reverse/break-precsave.exp
> 	* gdb/testsuite/gdb.reverse/break-reverse.exp
> 	* gdb/testsuite/gdb.reverse/consecutive-precsave.exp
> 	* gdb/testsuite/gdb.reverse/consecutive-reverse.exp
> 	* gdb/testsuite/gdb.reverse/finish-precsave.exp
> 	* gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
> 	* gdb/testsuite/gdb.reverse/finish-reverse.exp
> 	* gdb/testsuite/gdb.reverse/fstatat-reverse.exp
> 	* gdb/testsuite/gdb.reverse/getresuid-reverse.exp
> 	* gdb/testsuite/gdb.reverse/i386-precsave.exp
> 	* gdb/testsuite/gdb.reverse/i386-reverse.exp
> 	* gdb/testsuite/gdb.reverse/i386-sse-reverse.exp
> 	* gdb/testsuite/gdb.reverse/i387-stack-reverse.exp
> 	* gdb/testsuite/gdb.reverse/insn-reverse.exp
> 	* gdb/testsuite/gdb.reverse/machinestate-precsave.exp
> 	* gdb/testsuite/gdb.reverse/machinestate.exp
> 	* gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
> 	* gdb/testsuite/gdb.reverse/pipe-reverse.exp
> 	* gdb/testsuite/gdb.reverse/readv-reverse.exp
> 	* gdb/testsuite/gdb.reverse/recvmsg-reverse.exp
> 	* gdb/testsuite/gdb.reverse/rerun-prec.exp
> 	* gdb/testsuite/gdb.reverse/s390-mvcle.exp
> 	* gdb/testsuite/gdb.reverse/sigall-precsave.exp
> 	* gdb/testsuite/gdb.reverse/sigall-reverse.exp
> 	* gdb/testsuite/gdb.reverse/solib-precsave.exp
> 	* gdb/testsuite/gdb.reverse/solib-reverse.exp
> 	* gdb/testsuite/gdb.reverse/step-precsave.exp
> 	* gdb/testsuite/gdb.reverse/step-reverse.exp
> 	* gdb/testsuite/gdb.reverse/time-reverse.exp
> 	* gdb/testsuite/gdb.reverse/until-precsave.exp
> 	* gdb/testsuite/gdb.reverse/until-reverse.exp
> 	* gdb/testsuite/gdb.reverse/waitpid-reverse.exp
> 	* gdb/testsuite/gdb.reverse/watch-precsave.exp
> 	* gdb/testsuite/gdb.reverse/watch-reverse.exp

Please drop "gdb/testsuite/", otherwise, patch is good to me.

-- 
Yao 

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple
  2016-11-25 20:55 ` [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple Luis Machado
@ 2016-11-27 17:10   ` Yao Qi
  2016-11-28 16:06     ` Luis Machado
  0 siblings, 1 reply; 33+ messages in thread
From: Yao Qi @ 2016-11-27 17:10 UTC (permalink / raw)
  To: Luis Machado; +Cc: gdb-patches

On Fri, Nov 25, 2016 at 02:54:00PM -0600, Luis Machado wrote:
> This fixes offender testcases that have test names starting with uppercase
> when using gdb_test_multiple in a single-line construct.
> 
> gdb/testsuite/ChangeLog
> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
> 
> 	Fix test names starting with uppercase throughout the files.
> 
> 	* gdb/testsuite/gdb.arch/i386-bp_permanent.exp
> 	* gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
> 	* gdb/testsuite/gdb.base/disasm-end-cu.exp
> 	* gdb/testsuite/gdb.base/macscp.exp
> 	* gdb/testsuite/gdb.base/pending.exp
> 	* gdb/testsuite/gdb.base/watch_thread_num.exp
> 	* gdb/testsuite/gdb.cp/exception.exp
> 	* gdb/testsuite/gdb.cp/gdb2495.exp
> 	* gdb/testsuite/gdb.cp/local.exp
> 	* gdb/testsuite/gdb.python/py-evsignal.exp
> 	* gdb/testsuite/gdb.python/python.exp
> 	* gdb/testsuite/gdb.trace/tracecmd.exp

Drop "gdb/testsuite/".  Patch is good to me, but I think we need to
enforce a rule in "proc gdb_test_multiple" that test message should
start with a lower case letter, emit an ERROR if it starts with
uppercase.

-- 
Yao 

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple
  2016-11-27 17:10   ` Yao Qi
@ 2016-11-28 16:06     ` Luis Machado
  2016-11-29 14:49       ` Yao Qi
  0 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-28 16:06 UTC (permalink / raw)
  To: Yao Qi; +Cc: gdb-patches

On 11/27/2016 11:09 AM, Yao Qi wrote:
> On Fri, Nov 25, 2016 at 02:54:00PM -0600, Luis Machado wrote:
>> This fixes offender testcases that have test names starting with uppercase
>> when using gdb_test_multiple in a single-line construct.
>>
>> gdb/testsuite/ChangeLog
>> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
>>
>> 	Fix test names starting with uppercase throughout the files.
>>
>> 	* gdb/testsuite/gdb.arch/i386-bp_permanent.exp
>> 	* gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
>> 	* gdb/testsuite/gdb.base/disasm-end-cu.exp
>> 	* gdb/testsuite/gdb.base/macscp.exp
>> 	* gdb/testsuite/gdb.base/pending.exp
>> 	* gdb/testsuite/gdb.base/watch_thread_num.exp
>> 	* gdb/testsuite/gdb.cp/exception.exp
>> 	* gdb/testsuite/gdb.cp/gdb2495.exp
>> 	* gdb/testsuite/gdb.cp/local.exp
>> 	* gdb/testsuite/gdb.python/py-evsignal.exp
>> 	* gdb/testsuite/gdb.python/python.exp
>> 	* gdb/testsuite/gdb.trace/tracecmd.exp
>
> Drop "gdb/testsuite/".  Patch is good to me, but I think we need to
> enforce a rule in "proc gdb_test_multiple" that test message should
> start with a lower case letter, emit an ERROR if it starts with
> uppercase.
>

Do you mean just for gdb_test_multiple?

It can be tricky, since one is still free to start the sentences with 
something like "ARM ..." or some other technology name. So unfortunately 
we can't be too strict. I wish we could.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v3 2/8] Fix test names starting with uppercase using gdb_test on a single line.
  2016-11-27 16:48   ` Yao Qi
@ 2016-11-28 18:13     ` Luis Machado
  0 siblings, 0 replies; 33+ messages in thread
From: Luis Machado @ 2016-11-28 18:13 UTC (permalink / raw)
  To: gdb-patches, qiyaoltc

Thanks Yao. Updated patch below.

Changes in v3:
  Fixed incorrect substitutions.

This fixes offender testcases that have test names starting with uppercase
when using gdb_test in a single line construct.

gdb/testsuite/ChangeLog
2016-11-28  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names starting with uppercase throughout the files.

	* gdb.arch/i386-mpx-simple_segv.exp
	* gdb.arch/i386-mpx.exp
	* gdb.arch/i386-permbkpt.exp
	* gdb.arch/pa-nullify.exp
	* gdb.arch/powerpc-d128-regs.exp
	* gdb.arch/vsx-regs.exp
	* gdb.base/bfp-test.exp
	* gdb.base/break.exp
	* gdb.base/breakpoint-shadow.exp
	* gdb.base/callfuncs.exp
	* gdb.base/charset.exp
	* gdb.base/commands.exp
	* gdb.base/completion.exp
	* gdb.base/dfp-test.exp
	* gdb.base/echo.exp
	* gdb.base/ending-run.exp
	* gdb.base/eval.exp
	* gdb.base/expand-psymtabs.exp
	* gdb.base/float128.exp
	* gdb.base/floatn.exp
	* gdb.base/foll-exec-mode.exp
	* gdb.base/gdb1056.exp
	* gdb.base/gdb11531.exp
	* gdb.base/kill-after-signal.exp
	* gdb.base/multi-forks.exp
	* gdb.base/overlays.exp
	* gdb.base/pending.exp
	* gdb.base/sepdebug.exp
	* gdb.base/testenv.exp
	* gdb.base/valgrind-db-attach.exp
	* gdb.base/watch_thread_num.exp
	* gdb.base/watchpoint-cond-gone.exp
	* gdb.base/watchpoint.exp
	* gdb.base/watchpoints.exp
	* gdb.cp/arg-reference.exp
	* gdb.cp/baseenum.exp
	* gdb.cp/operator.exp
	* gdb.cp/shadow.exp
	* gdb.dwarf2/dw2-op-out-param.exp
	* gdb.dwarf2/dw2-reg-undefined.exp
	* gdb.go/chan.exp
	* gdb.go/hello.exp
	* gdb.go/integers.exp
	* gdb.go/methods.exp
	* gdb.go/package.exp
	* gdb.guile/scm-parameter.exp
	* gdb.guile/scm-progspace.exp
	* gdb.guile/scm-value.exp
	* gdb.mi/mi-pending.exp
	* gdb.mi/user-selected-context-sync.exp
	* gdb.multi/multi-attach.exp
	* gdb.multi/tids.exp
	* gdb.opt/clobbered-registers-O2.exp
	* gdb.pascal/floats.exp
	* gdb.pascal/integers.exp
	* gdb.python/py-block.exp
	* gdb.python/py-events.exp
	* gdb.python/py-parameter.exp
	* gdb.python/py-symbol.exp
	* gdb.python/py-symtab.exp
	* gdb.python/py-type.exp
	* gdb.python/py-value.exp
	* gdb.python/py-xmethods.exp
	* gdb.python/python.exp
	* gdb.reverse/break-precsave.exp
	* gdb.reverse/consecutive-precsave.exp
	* gdb.reverse/finish-precsave.exp
	* gdb.reverse/i386-precsave.exp
	* gdb.reverse/machinestate-precsave.exp
	* gdb.reverse/sigall-precsave.exp
	* gdb.reverse/solib-precsave.exp
	* gdb.reverse/step-precsave.exp
	* gdb.reverse/until-precsave.exp
	* gdb.reverse/watch-precsave.exp
	* gdb.server/ext-attach.exp
	* gdb.server/ext-restart.exp
	* gdb.server/ext-run.exp
	* gdb.server/ext-wrapper.exp
	* gdb.stabs/gdb11479.exp
	* gdb.stabs/weird.exp
	* gdb.threads/attach-many-short-lived-threads.exp
	* gdb.threads/kill.exp
	* gdb.threads/watchpoint-fork.exp
---
 gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp    |  6 +-
 gdb/testsuite/gdb.arch/i386-mpx.exp                | 16 ++---
 gdb/testsuite/gdb.arch/i386-permbkpt.exp           |  4 +-
 gdb/testsuite/gdb.arch/pa-nullify.exp              |  6 +-
 gdb/testsuite/gdb.arch/powerpc-d128-regs.exp       |  6 +-
 gdb/testsuite/gdb.arch/vsx-regs.exp                |  4 +-
 gdb/testsuite/gdb.base/bfp-test.exp                | 18 ++---
 gdb/testsuite/gdb.base/break.exp                   |  4 +-
 gdb/testsuite/gdb.base/breakpoint-shadow.exp       |  4 +-
 gdb/testsuite/gdb.base/callfuncs.exp               |  4 +-
 gdb/testsuite/gdb.base/charset.exp                 |  2 +-
 gdb/testsuite/gdb.base/commands.exp                |  4 +-
 gdb/testsuite/gdb.base/completion.exp              |  2 +-
 gdb/testsuite/gdb.base/dfp-test.exp                | 18 ++---
 gdb/testsuite/gdb.base/echo.exp                    |  2 +-
 gdb/testsuite/gdb.base/ending-run.exp              |  4 +-
 gdb/testsuite/gdb.base/eval.exp                    |  4 +-
 gdb/testsuite/gdb.base/expand-psymtabs.exp         |  2 +-
 gdb/testsuite/gdb.base/float128.exp                | 12 ++--
 gdb/testsuite/gdb.base/floatn.exp                  | 40 +++++------
 gdb/testsuite/gdb.base/foll-exec-mode.exp          |  2 +-
 gdb/testsuite/gdb.base/gdb1056.exp                 |  2 +-
 gdb/testsuite/gdb.base/gdb11531.exp                |  2 +-
 gdb/testsuite/gdb.base/multi-forks.exp             | 14 ++--
 gdb/testsuite/gdb.base/overlays.exp                | 20 +++---
 gdb/testsuite/gdb.base/pending.exp                 |  4 +-
 gdb/testsuite/gdb.base/sepdebug.exp                |  2 +-
 gdb/testsuite/gdb.base/testenv.exp                 |  2 +-
 gdb/testsuite/gdb.base/watch_thread_num.exp        |  6 +-
 gdb/testsuite/gdb.base/watchpoint-cond-gone.exp    |  2 +-
 gdb/testsuite/gdb.base/watchpoint.exp              | 12 ++--
 gdb/testsuite/gdb.base/watchpoints.exp             | 14 ++--
 gdb/testsuite/gdb.cp/arg-reference.exp             |  2 +-
 gdb/testsuite/gdb.cp/baseenum.exp                  |  2 +-
 gdb/testsuite/gdb.cp/operator.exp                  |  2 +-
 gdb/testsuite/gdb.cp/shadow.exp                    | 10 +--
 gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp      |  8 +--
 gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp     |  2 +-
 gdb/testsuite/gdb.go/chan.exp                      |  4 +-
 gdb/testsuite/gdb.go/hello.exp                     |  2 +-
 gdb/testsuite/gdb.go/integers.exp                  | 16 ++---
 gdb/testsuite/gdb.go/methods.exp                   |  4 +-
 gdb/testsuite/gdb.go/package.exp                   |  2 +-
 gdb/testsuite/gdb.guile/scm-parameter.exp          |  8 +--
 gdb/testsuite/gdb.guile/scm-progspace.exp          |  4 +-
 gdb/testsuite/gdb.guile/scm-value.exp              |  2 +-
 gdb/testsuite/gdb.mi/mi-pending.exp                |  2 +-
 .../gdb.mi/user-selected-context-sync.exp          |  2 +-
 gdb/testsuite/gdb.opt/clobbered-registers-O2.exp   |  2 +-
 gdb/testsuite/gdb.pascal/floats.exp                | 28 ++++----
 gdb/testsuite/gdb.pascal/integers.exp              | 16 ++---
 gdb/testsuite/gdb.python/py-block.exp              | 18 ++---
 gdb/testsuite/gdb.python/py-events.exp             |  2 +-
 gdb/testsuite/gdb.python/py-parameter.exp          | 82 +++++++++++-----------
 gdb/testsuite/gdb.python/py-symbol.exp             | 64 ++++++++---------
 gdb/testsuite/gdb.python/py-symtab.exp             | 34 ++++-----
 gdb/testsuite/gdb.python/py-type.exp               | 58 +++++++--------
 gdb/testsuite/gdb.python/py-value.exp              | 48 ++++++-------
 gdb/testsuite/gdb.python/py-xmethods.exp           | 66 ++++++++---------
 gdb/testsuite/gdb.python/python.exp                | 58 +++++++--------
 gdb/testsuite/gdb.reverse/break-precsave.exp       |  2 +-
 gdb/testsuite/gdb.reverse/consecutive-precsave.exp |  2 +-
 gdb/testsuite/gdb.reverse/finish-precsave.exp      |  2 +-
 gdb/testsuite/gdb.reverse/i386-precsave.exp        |  2 +-
 .../gdb.reverse/machinestate-precsave.exp          |  2 +-
 gdb/testsuite/gdb.reverse/sigall-precsave.exp      |  2 +-
 gdb/testsuite/gdb.reverse/solib-precsave.exp       |  2 +-
 gdb/testsuite/gdb.reverse/step-precsave.exp        |  2 +-
 gdb/testsuite/gdb.reverse/until-precsave.exp       |  2 +-
 gdb/testsuite/gdb.reverse/watch-precsave.exp       |  2 +-
 gdb/testsuite/gdb.stabs/gdb11479.exp               |  4 +-
 gdb/testsuite/gdb.stabs/weird.exp                  |  8 +--
 gdb/testsuite/gdb.threads/watchpoint-fork.exp      |  4 +-
 73 files changed, 414 insertions(+), 414 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
index 2eefc74..7729f6b 100644
--- a/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
+++ b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
@@ -73,7 +73,7 @@ with_test_prefix "$parameters" {
              ".*SIGSEGV.*Yes.*Yes.*Yes.*Segmentation fault.*"\
              "set parameters"
 
-    gdb_test "continue" ".*$violation.*" "Display"
+    gdb_test "continue" ".*$violation.*" "display"
 
     gdb_test "where" ".*#0  $hex in upper.*"\
              "should be in upper"
@@ -93,7 +93,7 @@ with_test_prefix "$parameters" {
              ".*SIGSEGV.*No.*Yes.*Yes.*Segmentation fault.*"\
              "set parameters"
 
-    gdb_test "continue" ".*$segv_with_exit.*" "Display"
+    gdb_test "continue" ".*$segv_with_exit.*" "display"
 
     gdb_test "where" "No stack." "no inferior"
 }
@@ -112,7 +112,7 @@ with_test_prefix "$parameters" {
              ".*SIGSEGV.*Yes.*Yes.*No.*Segmentation fault.*"\
              "set parameters"
 
-    gdb_test "continue" ".*$violation.*" "Display"
+    gdb_test "continue" ".*$violation.*" "display"
 
     gdb_test "where" ".*#0  $hex in upper.*"\
              "should be in upper"
diff --git a/gdb/testsuite/gdb.arch/i386-mpx.exp b/gdb/testsuite/gdb.arch/i386-mpx.exp
index 7f4727e..dc1ad56 100644
--- a/gdb/testsuite/gdb.arch/i386-mpx.exp
+++ b/gdb/testsuite/gdb.arch/i386-mpx.exp
@@ -71,30 +71,30 @@ gdb_breakpoint [ gdb_get_line_number "break here" ]
 gdb_continue_to_breakpoint "break here" ".*break here.*"
 
 set test_string ".*\\\{lbound = 0xa, ubound = 0x13\\\}.*"
-gdb_test "info register bnd0" ".*bnd0$test_string" "Pure bnd0 register"
+gdb_test "info register bnd0" ".*bnd0$test_string" "pure bnd0 register"
 
 set test_string ".*\\\{lbound = 0x14, ubound = 0x1d\\\}.*"
-gdb_test "info register bnd1" ".*bnd1$test_string" "Pure bnd1 register"
+gdb_test "info register bnd1" ".*bnd1$test_string" "pure bnd1 register"
 
 set test_string ".*\\\{lbound = 0x1e, ubound = 0x27\\\}.*"
-gdb_test "info register bnd2" ".*bnd2$test_string" "Pure bnd2 register"
+gdb_test "info register bnd2" ".*bnd2$test_string" "pure bnd2 register"
 
 set test_string ".*\\\{lbound = 0x28, ubound = 0x31\\\}.*"
-gdb_test "info register bnd3" ".*bnd3$test_string" "Pure bnd3 register"
+gdb_test "info register bnd3" ".*bnd3$test_string" "pure bnd3 register"
 
 # Read value from registers bndrs.
 
 set test_string ".*\\\{lbound = 0xa, ubound_raw = 0x\[f\]+ec\\\}.*"
-gdb_test "info register bnd0raw" ".*bnd0$test_string" "Pure bnd0r register"
+gdb_test "info register bnd0raw" ".*bnd0$test_string" "pure bnd0r register"
 
 set test_string ".*\\\{lbound = 0x14, ubound_raw = 0x\[f\]+e2\\\}.*"
-gdb_test "info register bnd1raw" ".*bnd1$test_string" "Pure bnd1r register"
+gdb_test "info register bnd1raw" ".*bnd1$test_string" "pure bnd1r register"
 
 set test_string ".*\\\{lbound = 0x1e, ubound_raw = 0x\[f\]+d8\\\}.*"
-gdb_test "info register bnd2raw" ".*bnd2$test_string" "Pure bnd2r register"
+gdb_test "info register bnd2raw" ".*bnd2$test_string" "pure bnd2r register"
 
 set test_string ".*\\\{lbound = 0x28, ubound_raw = 0x\[f\]+ce\\\}.*"
-gdb_test "info register bnd3raw" ".*bnd3$test_string" "Pure bnd3r register"
+gdb_test "info register bnd3raw" ".*bnd3$test_string" "pure bnd3r register"
 
 # Setting fields on bnds
 set test_string ".*\\\{lbound = 0xa, ubound = 0x400\\\}.*"
diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
index 083217b..c2dc620 100644
--- a/gdb/testsuite/gdb.arch/i386-permbkpt.exp
+++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
@@ -35,5 +35,5 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 
 clean_restart ${binfile}
 
-gdb_test "break main" "" "First permanent break"
-gdb_test "break main" "" "Second permanent break"
+gdb_test "break main" "" "first permanent break"
+gdb_test "break main" "" "second permanent break"
diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
index cbc66bf..9a98fe4 100644
--- a/gdb/testsuite/gdb.arch/pa-nullify.exp
+++ b/gdb/testsuite/gdb.arch/pa-nullify.exp
@@ -51,7 +51,7 @@ gdb_load ${binfile}
 # that we end up back at the caller and not at the second instruction.
 
 gdb_breakpoint foo
-gdb_test "run" "Breakpoint 1, .* in foo.*" "Breakpoint at foo"
+gdb_test "run" "Breakpoint 1, .* in foo.*" "breakpoint at foo"
 
 set test "stepi till main"
 gdb_test_multiple "stepi" "${test}" {
@@ -97,9 +97,9 @@ set foo_last "(bar - 4)"
 gdb_breakpoint "*$foo_last"
 
 gdb_test "continue" "Breakpoint \[0-9\]*,.* in foo.*"
-gdb_test "backtrace" "in foo.*in main.*" "Backtrace from last insn in foo"
+gdb_test "backtrace" "in foo.*in main.*" "backtrace from last insn in foo"
 gdb_test "stepi" "in foo.*" "stepi to nullified instruction stays in foo"
-gdb_test "backtrace" "in foo.*in main.*" "Backtrace from nullified insn"
+gdb_test "backtrace" "in foo.*in main.*" "backtrace from nullified insn"
 gdb_test "stepi" "in main.*" "stepi to main"
 
 # In the third test, we verify that backtraces from nullified instructions
diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
index 4a08f26..2be82c3 100644
--- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
@@ -44,16 +44,16 @@ if { ![runto main] } then {
    return
 }
 
-if [gdb_test "show arch" ".*currently powerpc:common.*" "Checking for PPC arch"] {
+if [gdb_test "show arch" ".*currently powerpc:common.*" "checking for PPC arch"] {
     return -1
 }
 
 gdb_test "next" ""
 
 for {set i 0} {$i < 16} {incr i 1} {
-gdb_test "set \$dl$i=d128" "" "Set dl$i register"
+gdb_test "set \$dl$i=d128" "" "set dl$i register"
 
-gdb_test "print \$dl$i" "\\\$$decimal = 1\.2345678910" "Print dl$i register as DFP"
+gdb_test "print \$dl$i" "\\\$$decimal = 1\.2345678910" "print dl$i register as DFP"
 
 gdb_test "info reg dl$i" \
 	 "dl$i\[ \]*1\.2345678910\[\t\]*\\(raw 0x2205800000000000000000049c5de09c\\)" \
diff --git a/gdb/testsuite/gdb.arch/vsx-regs.exp b/gdb/testsuite/gdb.arch/vsx-regs.exp
index 31e58e6..6c708e1 100644
--- a/gdb/testsuite/gdb.arch/vsx-regs.exp
+++ b/gdb/testsuite/gdb.arch/vsx-regs.exp
@@ -199,9 +199,9 @@ if { $core_loaded == -1 } {
 }
 
 for {set i 0} {$i < 32} {incr i 1} {
-    gdb_test "info reg vs$i" "vs$i.*$vector_register2" "Restore vs$i from core file"
+    gdb_test "info reg vs$i" "vs$i.*$vector_register2" "restore vs$i from core file"
 }
 
 for {set i 32} {$i < 64} {incr i 1} {
-    gdb_test "info reg vs$i" "vs$i.*$vector_register3" "Restore vs$i from core file"
+    gdb_test "info reg vs$i" "vs$i.*$vector_register3" "restore vs$i from core file"
 }
diff --git a/gdb/testsuite/gdb.base/bfp-test.exp b/gdb/testsuite/gdb.base/bfp-test.exp
index 4b39d39..91c7e51 100644
--- a/gdb/testsuite/gdb.base/bfp-test.exp
+++ b/gdb/testsuite/gdb.base/bfp-test.exp
@@ -35,14 +35,14 @@ gdb_breakpoint [gdb_get_line_number "return"]
 gdb_continue_to_breakpoint "return"
 
 # Print the original value of b32, b64 and b128.
-gdb_test "print b32" ".*1 = 1\.5.*" "The original value of b32 is 1.5"
-gdb_test "print b64" ".*2 = 2\.25.*" "The original value of b64 is 2.25"
-gdb_test "print b128" ".*3 = 3\.375.*" "The original value of b128 is 3.375"
+gdb_test "print b32" ".*1 = 1\.5.*" "the original value of b32 is 1.5"
+gdb_test "print b64" ".*2 = 2\.25.*" "the original value of b64 is 2.25"
+gdb_test "print b128" ".*3 = 3\.375.*" "the original value of b128 is 3.375"
 
 # Test that gdb could correctly recognize float constant expression with a suffix. 
-gdb_test "print b32=-1.5f" ".*4 = -1\.5.*" "Try to change b32 to -1.5 with 'print b32=-1.5f'"
-gdb_test "print b64=-2.25f" ".*5 = -2\.25.*" "Try to change b64 to -2.25 with 'print b64=-2.25f'"
-gdb_test "print b128=-3.375l" ".*6 = -3\.375.*" "Try to change b128 to -3.375 with 'print b128=-3.375l'"
+gdb_test "print b32=-1.5f" ".*4 = -1\.5.*" "try to change b32 to -1.5 with 'print b32=-1.5f'"
+gdb_test "print b64=-2.25f" ".*5 = -2\.25.*" "try to change b64 to -2.25 with 'print b64=-2.25f'"
+gdb_test "print b128=-3.375l" ".*6 = -3\.375.*" "try to change b128 to -3.375 with 'print b128=-3.375l'"
 
 # Test that gdb could handle the above correctly with "set var" command.
 set test "set variable b32 = 10.5f"
@@ -75,9 +75,9 @@ gdb_test_multiple "set var b128=30.375l" "$test" {
     }
 }
 
-gdb_test "print b32" ".*7 = 10\.5.*" "The value of b32 is changed to 10.5"
-gdb_test "print b64" ".*8 = 20\.25.*" "The value of b64 is changed to 20.25"
-gdb_test "print b128" ".*9 = 30\.375.*" "The value of b128 is changed to 30.375"
+gdb_test "print b32" ".*7 = 10\.5.*" "the value of b32 is changed to 10.5"
+gdb_test "print b64" ".*8 = 20\.25.*" "the value of b64 is changed to 20.25"
+gdb_test "print b128" ".*9 = 30\.375.*" "the value of b128 is changed to 30.375"
 
 # Test that gdb could handle invalid suffix correctly.
 
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index f111d58..bda8676 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -420,7 +420,7 @@ delete_breakpoints
 # test temporary breakpoint at function
 #
 
-gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
+gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "temporary breakpoint function"
 
 #
 # test break at function in file
@@ -436,7 +436,7 @@ gdb_test "tbreak $bp_location1" \
     "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location1.*" \
     "Temporary breakpoint line number #1"
 
-gdb_test "tbreak $bp_location6" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "Temporary breakpoint line number #2"
+gdb_test "tbreak $bp_location6" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "temporary breakpoint line number #2"
 
 #
 # test break at line number in file
diff --git a/gdb/testsuite/gdb.base/breakpoint-shadow.exp b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
index 610a21c..edf4b3b 100644
--- a/gdb/testsuite/gdb.base/breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
@@ -41,8 +41,8 @@ gdb_test_multiple "disass main" $test {
     }
 }
 
-gdb_test "b [gdb_get_line_number "break-first"]" "Breakpoint \[0-9\] at .*" "First breakpoint placed"
-gdb_test "b [gdb_get_line_number "break-second"]" "Breakpoint \[0-9\] at .*" "Second breakpoint placed"
+gdb_test "b [gdb_get_line_number "break-first"]" "Breakpoint \[0-9\] at .*" "first breakpoint placed"
+gdb_test "b [gdb_get_line_number "break-second"]" "Breakpoint \[0-9\] at .*" "second breakpoint placed"
 
 # Disassemble main, and compare the output to the original output
 # before breakpoints were inserted.  TEST is used as test message.
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index 8fa016a..47c0b25 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -101,7 +101,7 @@ proc do_function_calls {} {
 
 	gdb_test "p t_float_values2(3.14159,float_val2)" " = 1"
 
-	gdb_test "p t_float_many_args (float_val1, float_val2, float_val3, float_val4, float_val5, float_val6, float_val7, float_val8, float_val9, float_val10, float_val11, float_val12, float_val13, float_val14, float_val15)" " = 1" "Call function with many float arguments."
+	gdb_test "p t_float_many_args (float_val1, float_val2, float_val3, float_val4, float_val5, float_val6, float_val7, float_val8, float_val9, float_val10, float_val11, float_val12, float_val13, float_val14, float_val15)" " = 1" "call function with many float arguments."
 
 	gdb_test "p t_small_values(1,2,3,4,5,6,7,8,9,10)" " = 55"
 
@@ -111,7 +111,7 @@ proc do_function_calls {} {
 	gdb_test "p t_double_values(45.654,double_val2)" " = 1"
 	gdb_test "p t_double_values(double_val1,-67.66)" " = 1"
 
-	gdb_test "p t_double_many_args (double_val1, double_val2, double_val3, double_val4, double_val5, double_val6, double_val7, double_val8, double_val9, double_val10, double_val11, double_val12, double_val13, double_val14, double_val15)" " = 1" "Call function with many double arguments."
+	gdb_test "p t_double_many_args (double_val1, double_val2, double_val3, double_val4, double_val5, double_val6, double_val7, double_val8, double_val9, double_val10, double_val11, double_val12, double_val13, double_val14, double_val15)" " = 1" "call function with many double arguments."
 
 	gdb_test "p t_double_int(99.0, 1)" " = 0"
 	gdb_test "p t_double_int(99.0, 99)" " = 1"
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 44d5502..a376461 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -592,7 +592,7 @@ gdb_test "print 'a' == 'a' || 'b' == 'b'" \
 
 proc string_display { var_name set_prefix x_size x_type} {
   gdb_test_no_output "set ${var_name} = ${set_prefix}\"Test String\\0with zeroes\"" "Assign ${var_name} with prefix ${set_prefix}"
-  gdb_test "x /2${x_size}s ${var_name}" ".*\t${x_type}\"Test String\"\[\r\n\]+.*\t${x_type}\"with zeroes\"" "Display String ${var_name} with x/${x_size}s"
+  gdb_test "x /2${x_size}s ${var_name}" ".*\t${x_type}\"Test String\"\[\r\n\]+.*\t${x_type}\"with zeroes\"" "display String ${var_name} with x/${x_size}s"
 }
 
 if {$ucs2_ok} {
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index ee7bd38..8c06e8c 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -476,14 +476,14 @@ proc_with_prefix deprecated_command_test {} {
     gdb_test "p 5" \
 	    "Warning: 'p', an alias for the command 'print' is deprecated.*Use 'new_p'.*" \
 	    "p deprecated warning, with replacement"
-    gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away /1/"
+    gdb_test "p 5" ".\[0-9\]* = 5.*" "deprecated warning goes away /1/"
 
     gdb_test_no_output "maintenance deprecate p \"new_p\"" "maintenance deprecate p \"new_p\" /2/"
     gdb_test_no_output "maintenance deprecate print \"new_print\"" 
     gdb_test "p 5" \
 	    "Warning: command 'print' \\(p\\) is deprecated.*Use 'new_print'.*" \
 	    "both alias and command are deprecated"
-    gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away /2/"
+    gdb_test "p 5" ".\[0-9\]* = 5.*" "deprecated warning goes away /2/"
 
     gdb_test_no_output "maintenance deprecate set remote memory-read-packet-size \"srm\" " \
 	    "deprecate long command /1/"
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 10a4572..b72ccf5 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -717,7 +717,7 @@ gdb_expect {
 }
 
 # Empty COMMAND sends no newline while " " sends the newline we need.
-gdb_test " " "Source directories searched: .*" "Glob remaining of directory test"
+gdb_test " " "Source directories searched: .*" "glob remaining of directory test"
 
 gdb_test "complete file ./gdb.base/compl" \
     "file ./gdb.base/completion\\.exp.*" \
diff --git a/gdb/testsuite/gdb.base/dfp-test.exp b/gdb/testsuite/gdb.base/dfp-test.exp
index 81605be..370e90c 100644
--- a/gdb/testsuite/gdb.base/dfp-test.exp
+++ b/gdb/testsuite/gdb.base/dfp-test.exp
@@ -223,17 +223,17 @@ gdb_test "backtrace" ".*arg0_128 \\(arg0=0.1, arg1=1.0, arg2=2.0, arg3=3.0, arg4
 
 # Test calling inferior function with DFP arguments or return value.
 
-gdb_test "call arg0_32 (1.2df, 2.2df, 3.2df, 4.2df, 5.2df, 6.2df)" "Breakpoint.*arg0_32.*" "Call function with correct _Decimal32 arguments."
-gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_32 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "Backtrace function with correct _Decimal32 arguments."
-gdb_test "finish" " = 1.2" "Correct _Decimal32 return value from called function."
+gdb_test "call arg0_32 (1.2df, 2.2df, 3.2df, 4.2df, 5.2df, 6.2df)" "Breakpoint.*arg0_32.*" "call function with correct _Decimal32 arguments."
+gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_32 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "backtrace function with correct _Decimal32 arguments."
+gdb_test "finish" " = 1.2" "correct _Decimal32 return value from called function."
 
-gdb_test "call arg0_64 (1.2dd, 2.2dd, 3.2dd, 4.2dd, 5.2dd, 6.2dd)" "Breakpoint.*arg0_64.*" "Call function with correct _Decimal64 arguments."
-gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_64 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "Backtrace function with correct _Decimal64 arguments."
-gdb_test "finish" " = 1.2" "Correct _Decimal64 return value from called function."
+gdb_test "call arg0_64 (1.2dd, 2.2dd, 3.2dd, 4.2dd, 5.2dd, 6.2dd)" "Breakpoint.*arg0_64.*" "call function with correct _Decimal64 arguments."
+gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_64 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "backtrace function with correct _Decimal64 arguments."
+gdb_test "finish" " = 1.2" "correct _Decimal64 return value from called function."
 
-gdb_test "call arg0_128 (1.2dl, 2.2dl, 3.2dl, 4.2dl, 5.2dl, 6.2dl)" "Breakpoint.*arg0_128.*" "Call function with correct _Decimal128 arguments."
-gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_128 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "Backtrace function with correct _Decimal128 arguments."
-gdb_test "finish" " = 1.2" "Correct _Decimal128 return value from called function."
+gdb_test "call arg0_128 (1.2dl, 2.2dl, 3.2dl, 4.2dl, 5.2dl, 6.2dl)" "Breakpoint.*arg0_128.*" "call function with correct _Decimal128 arguments."
+gdb_test "backtrace 1" "\n#\[0-9\]+  arg0_128 \\(arg0=1.2, arg1=2.2, arg2=3.2, arg3=4.2, arg4=5.2, arg5=6.2\\).*" "backtrace function with correct _Decimal128 arguments."
+gdb_test "finish" " = 1.2" "correct _Decimal128 return value from called function."
 
 gdb_test "call decimal_dec128_align (double_val1, dec128_val2, double_val3, double_val4, double_val5, double_val6, double_val7, double_val8, double_val9, double_val10, double_val11, double_val12, double_val13, double_val14)" " = 1" \
   "Call function with mixed decimal float arguments TEST."
diff --git a/gdb/testsuite/gdb.base/echo.exp b/gdb/testsuite/gdb.base/echo.exp
index 759b4eb..b84d2d5 100644
--- a/gdb/testsuite/gdb.base/echo.exp
+++ b/gdb/testsuite/gdb.base/echo.exp
@@ -22,4 +22,4 @@ gdb_start
 # test the echo command
 #
 
-gdb_test "echo Hello world!\\n" "Hello world!" "Echo test"
+gdb_test "echo Hello world!\\n" "Hello world!" "echo test"
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 37bb39e..f94ee4b 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -74,8 +74,8 @@ gdb_test_multiple "info line ending-run.c:$break1_line" "" {
     -re ".*address (0x\[0-9a-fA-F]*).*$gdb_prompt $" {
         set line_nine $expect_out(1,string)
         gdb_test "b ending-run.c:$break1_line" ".*Breakpoint 6.*ending-run.c, line $break1_line.*"
-        gdb_test "b *$line_nine" ".*Note.*also.*Breakpoint 7.*" "Breakpoint 7 at *ending-run.c:$break1_line"
-        gdb_test "cle" ".*Deleted breakpoints 4 6 7.*" "Clear 2 by default"
+        gdb_test "b *$line_nine" ".*Note.*also.*Breakpoint 7.*" "breakpoint 7 at *ending-run.c:$break1_line"
+        gdb_test "cle" ".*Deleted breakpoints 4 6 7.*" "clear 2 by default"
     }
     -re ".*$gdb_prompt $" {
         fail "need to fix test for new compile outcome"
diff --git a/gdb/testsuite/gdb.base/eval.exp b/gdb/testsuite/gdb.base/eval.exp
index 8cda630..f47e7e3 100644
--- a/gdb/testsuite/gdb.base/eval.exp
+++ b/gdb/testsuite/gdb.base/eval.exp
@@ -18,5 +18,5 @@ gdb_start
 
 gdb_test_no_output "set \$a = 10" "Initialize \$a."
 
-gdb_test "eval \"echo %d\\n\", \$a++" "10" "First eval."
-gdb_test "eval \"echo %d\\n\", \$a*2" "22" "Second eval."
+gdb_test "eval \"echo %d\\n\", \$a++" "10" "first eval."
+gdb_test "eval \"echo %d\\n\", \$a*2" "22" "second eval."
diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.exp b/gdb/testsuite/gdb.base/expand-psymtabs.exp
index 1097d4b..59b10d5 100644
--- a/gdb/testsuite/gdb.base/expand-psymtabs.exp
+++ b/gdb/testsuite/gdb.base/expand-psymtabs.exp
@@ -44,5 +44,5 @@ if {[prepare_for_testing_full $testfile.exp \
 }
 
 set foo_bp [gdb_get_line_number "Break here"]
-gdb_test "break $foo_bp" "Breakpoint.*" "Expand psymtabs"
+gdb_test "break $foo_bp" "Breakpoint.*" "expand psymtabs"
 
diff --git a/gdb/testsuite/gdb.base/float128.exp b/gdb/testsuite/gdb.base/float128.exp
index 5907a46..a0ec4f3 100644
--- a/gdb/testsuite/gdb.base/float128.exp
+++ b/gdb/testsuite/gdb.base/float128.exp
@@ -42,13 +42,13 @@ gdb_breakpoint [gdb_get_line_number "return"]
 gdb_continue_to_breakpoint "return"
 
 # Print the original value of ld and f128
-gdb_test "print ld" ".* = 1\\.375.*" "The original value of ld is 1.375"
-gdb_test "print f128" ".* = 2\\.375.*" "The original value of f128 is 2.375"
+gdb_test "print ld" ".* = 1\\.375.*" "the original value of ld is 1.375"
+gdb_test "print f128" ".* = 2\\.375.*" "the original value of f128 is 2.375"
 
 # Test that gdb could correctly recognize float constant expression with a suffix.
 # FIXME: gdb does not yet recognize the GNU extension 'q' suffix for __float128 constants.
-gdb_test "print ld=-1.375l" ".* = -1\\.375.*" "Try to change ld to -1.375 with 'print ld=-1.375l'"
-gdb_test "print f128=-2.375l" ".* = -2\\.375.*" "Try to change f128 to -2.375 with 'print f128=-2.375l'"
+gdb_test "print ld=-1.375l" ".* = -1\\.375.*" "try to change ld to -1.375 with 'print ld=-1.375l'"
+gdb_test "print f128=-2.375l" ".* = -2\\.375.*" "try to change f128 to -2.375 with 'print f128=-2.375l'"
 
 # Test that gdb could handle the above correctly with "set var" command.
 set test "set variable ld=10.375l"
@@ -71,6 +71,6 @@ gdb_test_multiple "set var f128=20.375l" "$test" {
     }
 }
 
-gdb_test "print ld" ".* = 10\\.375.*" "The value of ld is changed to 10.375"
-gdb_test "print f128" ".* = 20\\.375.*" "The value of f128 is changed to 20.375"
+gdb_test "print ld" ".* = 10\\.375.*" "the value of ld is changed to 10.375"
+gdb_test "print f128" ".* = 20\\.375.*" "the value of f128 is changed to 20.375"
 
diff --git a/gdb/testsuite/gdb.base/floatn.exp b/gdb/testsuite/gdb.base/floatn.exp
index 0a8b4ff..aa8fddc 100644
--- a/gdb/testsuite/gdb.base/floatn.exp
+++ b/gdb/testsuite/gdb.base/floatn.exp
@@ -42,19 +42,19 @@ gdb_breakpoint [gdb_get_line_number "return"]
 gdb_continue_to_breakpoint "return"
 
 # Print the original values of f32, f64, f128, f32x, f64x.
-gdb_test "print f32" ".* = 1\\.5.*" "The original value of f32 is 1.5"
-gdb_test "print f64" ".* = 2\\.25.*" "The original value of f64 is 2.25"
-gdb_test "print f128" ".* = 3\\.375.*" "The original value of f128 is 3.375"
-gdb_test "print f32x" ".* = 10\\.5.*" "The original value of f32x is 10.5"
-gdb_test "print f64x" ".* = 20\\.25.*" "The original value of f64x is 20.25"
+gdb_test "print f32" ".* = 1\\.5.*" "the original value of f32 is 1.5"
+gdb_test "print f64" ".* = 2\\.25.*" "the original value of f64 is 2.25"
+gdb_test "print f128" ".* = 3\\.375.*" "the original value of f128 is 3.375"
+gdb_test "print f32x" ".* = 10\\.5.*" "the original value of f32x is 10.5"
+gdb_test "print f64x" ".* = 20\\.25.*" "the original value of f64x is 20.25"
 
 # Test that gdb could correctly recognize float constant expression with a suffix.
 # FIXME: gdb does not yet recognize the suffix for _FloatN/_FloatNx types.
-gdb_test "print f32=-1.5" ".* = -1\\.5.*" "Try to change f32 to -1.5 with 'print f32=-1.5'"
-gdb_test "print f64=-2.25" ".* = -2\\.25.*" "Try to change f64 to -2.25 with 'print f64=-2.25'"
-gdb_test "print f128=-3.375" ".* = -3\\.375.*" "Try to change f128 to -3.375 with 'print f128=-3.375'"
-gdb_test "print f32x=-10.5" ".* = -10\\.5.*" "Try to change f32x to -10.5 with 'print f32=-1.5x'"
-gdb_test "print f64x=-20.25" ".* = -20\\.25.*" "Try to change f64x to -20.25 with 'print f64=-2.25x'"
+gdb_test "print f32=-1.5" ".* = -1\\.5.*" "try to change f32 to -1.5 with 'print f32=-1.5'"
+gdb_test "print f64=-2.25" ".* = -2\\.25.*" "try to change f64 to -2.25 with 'print f64=-2.25'"
+gdb_test "print f128=-3.375" ".* = -3\\.375.*" "try to change f128 to -3.375 with 'print f128=-3.375'"
+gdb_test "print f32x=-10.5" ".* = -10\\.5.*" "try to change f32x to -10.5 with 'print f32=-1.5x'"
+gdb_test "print f64x=-20.25" ".* = -20\\.25.*" "try to change f64x to -20.25 with 'print f64=-2.25x'"
 
 # Test that gdb could handle the above correctly with "set var" command.
 set test "set variable f32 = 10.5"
@@ -107,18 +107,18 @@ gdb_test_multiple "set var f64x=200.25" "$test" {
     }
 }
 
-gdb_test "print f32" ".* = 10\\.5.*" "The value of f32 is changed to 10.5"
-gdb_test "print f64" ".* = 20\\.25.*" "The value of f64 is changed to 20.25"
-gdb_test "print f128" ".* = 30\\.375.*" "The value of f128 is changed to 30.375"
-gdb_test "print f32x" ".* = 100\\.5.*" "The value of f32x is changed to 100.5"
-gdb_test "print f64x" ".* = 200\\.25.*" "The value of f64x is changed to 200.25"
+gdb_test "print f32" ".* = 10\\.5.*" "the value of f32 is changed to 10.5"
+gdb_test "print f64" ".* = 20\\.25.*" "the value of f64 is changed to 20.25"
+gdb_test "print f128" ".* = 30\\.375.*" "the value of f128 is changed to 30.375"
+gdb_test "print f32x" ".* = 100\\.5.*" "the value of f32x is changed to 100.5"
+gdb_test "print f64x" ".* = 200\\.25.*" "the value of f64x is changed to 200.25"
 
 # Print the original values of c32, c64, c128, c32x, c64x.
-gdb_test "print c32" ".* = 1\\.5 \\+ 1 \\* I.*" "The original value of c32 is 1.5 + 1 * I"
-gdb_test "print c64" ".* = 2\\.25 \\+ 1 \\* I.*" "The original value of c64 is 2.25 + 1 * I"
-gdb_test "print c128" ".* = 3\\.375 \\+ 1 \\* I.*" "The original value of c128 is 3.375 + 1 * I"
-gdb_test "print c32x" ".* = 10\\.5 \\+ 1 \\* I.*" "The original value of c32x is 10.5 + 1 * I"
-gdb_test "print c64x" ".* = 20\\.25 \\+ 1 \\* I.*" "The original value of c64x is 20.25 + 1 * I"
+gdb_test "print c32" ".* = 1\\.5 \\+ 1 \\* I.*" "the original value of c32 is 1.5 + 1 * I"
+gdb_test "print c64" ".* = 2\\.25 \\+ 1 \\* I.*" "the original value of c64 is 2.25 + 1 * I"
+gdb_test "print c128" ".* = 3\\.375 \\+ 1 \\* I.*" "the original value of c128 is 3.375 + 1 * I"
+gdb_test "print c32x" ".* = 10\\.5 \\+ 1 \\* I.*" "the original value of c32x is 10.5 + 1 * I"
+gdb_test "print c64x" ".* = 20\\.25 \\+ 1 \\* I.*" "the original value of c64x is 20.25 + 1 * I"
 
 # FIXME: GDB cannot parse non-trivial complex constants yet.
 
diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp
index af417ca..2c6e379 100644
--- a/gdb/testsuite/gdb.base/foll-exec-mode.exp
+++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp
@@ -164,7 +164,7 @@ proc do_follow_exec_mode_tests { mode cmd infswitch } {
 	} elseif {$infswitch == "infswitch"} {
 	    # Two inferiors, we have switched to the original program.
 	    set expected_inf $testfile
-	    gdb_test "inferior 1" "Switching to inferior 1.*$testfile.*" "Switch inferiors"
+	    gdb_test "inferior 1" "Switching to inferior 1.*$testfile.*" "switch inferiors"
 	} else {
 	    # Two inferiors, run the execd program
 	    set expected_inf $testfile2
diff --git a/gdb/testsuite/gdb.base/gdb1056.exp b/gdb/testsuite/gdb.base/gdb1056.exp
index c960576..cff9787 100644
--- a/gdb/testsuite/gdb.base/gdb1056.exp
+++ b/gdb/testsuite/gdb.base/gdb1056.exp
@@ -39,5 +39,5 @@ gdb_test_multiple "print 1/0" "" {
 	kfail "gdb/1056" "print 1/0"
     }
 }
-gdb_test "print 1U/0" ".*Division by zero.*" "Test unsigned division by zero"
+gdb_test "print 1U/0" ".*Division by zero.*" "test unsigned division by zero"
 
diff --git a/gdb/testsuite/gdb.base/gdb11531.exp b/gdb/testsuite/gdb.base/gdb11531.exp
index 3ed5a0b..0aea181 100644
--- a/gdb/testsuite/gdb.base/gdb11531.exp
+++ b/gdb/testsuite/gdb.base/gdb11531.exp
@@ -50,7 +50,7 @@ delete_breakpoints
 
 set nl "\[\r\n\]+"
 
-gdb_test "watch myrec.x" ".*atchpoint \[0-9\]+: myrec\.x" "Set watchpoint"
+gdb_test "watch myrec.x" ".*atchpoint \[0-9\]+: myrec\.x" "set watchpoint"
 
 gdb_test "next" \
     ".*${nl}.*atchpoint \[0-9\]+: myrec\.x${nl}Old value = 0${nl}New value = 5${nl}.*" \
diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index 1eaaa71..c2e113b 100644
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -149,13 +149,13 @@ gdb_test_no_output "set detach off" "set detach off"
 #
 
 for {set i 1} {$i <= 15} {incr i} {
-  gdb_test "continue" "Breakpoint .* main .*exit.*" "Run to exit $i"
+  gdb_test "continue" "Breakpoint .* main .*exit.*" "run to exit $i"
   gdb_test "info inferior" " 2 .* 3 .* 4 .* 5 .*" "info inferior $i"
   gdb_test "inferior $i + 1" "(_dl_sysinfo_int80|fork|__kernel_(v|)syscall).*" \
       "inferior $i"
 }
 
-gdb_test "continue" "Breakpoint .* main .*exit.*" "Run to exit 16"
+gdb_test "continue" "Breakpoint .* main .*exit.*" "run to exit 16"
 gdb_test "info inferior" " 2 .* 3 .* 4 .* 5 .*" "info inferior 16"
 gdb_test "inferior 2" " main .*" "restart final"
 
@@ -168,10 +168,10 @@ gdb_test "inferior 2" " main .*" "restart final"
 # 
 
 # [assumes we're at #1]
-gdb_test "detach inferior 2" "Detaching .*" "Detach 2"
-gdb_test "detach inferior 3" "Detaching .*" "Detach 3"
-gdb_test "detach inferior 4" "Detaching .*" "Detach 4"
-gdb_test "detach inferior 5" "Detaching .*" "Detach 5"
+gdb_test "detach inferior 2" "Detaching .*" "detach 2"
+gdb_test "detach inferior 3" "Detaching .*" "detach 3"
+gdb_test "detach inferior 4" "Detaching .*" "detach 4"
+gdb_test "detach inferior 5" "Detaching .*" "detach 5"
 
 # 
 # Test kill inferior
@@ -179,7 +179,7 @@ gdb_test "detach inferior 5" "Detaching .*" "Detach 5"
 
 for {set i 6} { $i <= 16} {incr i} {
     gdb_test_no_output "kill inferior $i" "Kill $i"
-    gdb_test "info inferior $i" "<null>.*" "Did kill $i"
+    gdb_test "info inferior $i" "<null>.*" "did kill $i"
 }
 
 return 0
diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp
index 45b8670..b76f445 100644
--- a/gdb/testsuite/gdb.base/overlays.exp
+++ b/gdb/testsuite/gdb.base/overlays.exp
@@ -67,7 +67,7 @@ set iptrcast [string_to_regexp "(int *)"]
 set hexx "0x\[0-9abcdefABCDEF\]+"
 
 gdb_test_no_output "overlay manual"
-gdb_test "overlay list" "No sections are mapped." "List with none mapped"
+gdb_test "overlay list" "No sections are mapped." "list with none mapped"
 
 # capture the LMA addresses of [foo bar baz grbx foox barx bazx grbxx]
 
@@ -113,39 +113,39 @@ if $data_overlays then {
 # capture the VMA addresses of [foo bar baz grbx foox barx bazx grbxx]
 
 gdb_test "overlay map .ovly0" "" 
-gdb_test "overlay list" "Section .ovly0, loaded at.*, mapped at.*" "List ovly0"
+gdb_test "overlay list" "Section .ovly0, loaded at.*, mapped at.*" "list ovly0"
 set foo_vma [get_func_address "foo"  "foo"  "foo  runtime address"]
 
 gdb_test "overlay map .ovly1" "" 
-gdb_test "overlay list" "Section .ovly1, loaded at.*, mapped at.*" "List ovly1"
+gdb_test "overlay list" "Section .ovly1, loaded at.*, mapped at.*" "list ovly1"
 set bar_vma [get_func_address "bar"  "bar"  "bar  runtime address"]
 
 gdb_test "overlay map .ovly2" "" 
-gdb_test "overlay list" "Section .ovly2, loaded at.*, mapped at.*" "List ovly2"
+gdb_test "overlay list" "Section .ovly2, loaded at.*, mapped at.*" "list ovly2"
 set baz_vma [get_func_address "baz"  "baz"  "baz  runtime address"]
 
 gdb_test "overlay map .ovly3" "" 
-gdb_test "overlay list" "Section .ovly3, loaded at.*, mapped at.*" "List ovly3"
+gdb_test "overlay list" "Section .ovly3, loaded at.*, mapped at.*" "list ovly3"
 set grbx_vma [get_func_address "grbx" "grbx" "grbx runtime address"]
 
 if $data_overlays then {
     gdb_test "overlay map .data00" "" 
-    gdb_test "overlay list" "Section .data00, loaded .*, mapped .*" "List data00"
+    gdb_test "overlay list" "Section .data00, loaded .*, mapped .*" "list data00"
     gdb_test "print \$foox_vma = &foox" \
 	".* $iptrcast 0x.*"  "foox runtime addr"
 
     gdb_test "overlay map .data01" "" 
-    gdb_test "overlay list" "Section .data01, loaded .*, mapped .*" "List data01"
+    gdb_test "overlay list" "Section .data01, loaded .*, mapped .*" "list data01"
     gdb_test "print \$barx_vma = &barx" \
 	".* $iptrcast 0x.*"  "barx runtime addr"
 
     gdb_test "overlay map .data02" "" 
-    gdb_test "overlay list" "Section .data02, loaded .*, mapped .*" "List data02"
+    gdb_test "overlay list" "Section .data02, loaded .*, mapped .*" "list data02"
     gdb_test "print \$bazx_vma = &bazx" \
 	".* $iptrcast 0x.*"  "bazx runtime addr"
 
     gdb_test "overlay map .data03" "" 
-    gdb_test "overlay list" "Section .data03, loaded .*, mapped .*" "List data03"
+    gdb_test "overlay list" "Section .data03, loaded .*, mapped .*" "list data03"
     gdb_test "print \$grbxx_vma = &grbxx" \
 	".* $iptrcast 0x.*"  "grbxx runtime addr"
 }
@@ -216,7 +216,7 @@ if $data_overlays then {
 # test automatic mode
 
 gdb_test_no_output "overlay auto"
-gdb_test "overlay list" "No sections are mapped." "List none mapped (auto)"
+gdb_test "overlay list" "No sections are mapped." "list none mapped (auto)"
 gdb_test "break foo"  "Breakpoint .*at .*file .*foo.c.*"  "break foo"
 gdb_test "break bar"  "Breakpoint .*at .*file .*bar.c.*"  "break bar"
 gdb_test "break baz"  "Breakpoint .*at .*file .*baz.c.*"  "break baz"
diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index ea913f1..a1b497c 100644
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -244,8 +244,8 @@ gdb_test "continue" \
 # be 3 then.
 #
 
-gdb_test "disable 7" "" "Disable other breakpoints"
-gdb_test "disable 5" "" "Disable other breakpoints"
+gdb_test "disable 7" "" "disable other breakpoints"
+gdb_test "disable 5" "" "disable other breakpoints"
 
 gdb_test "continue" \
 	 ".*Breakpoint.*pendfunc1.*\\\(x=3\\\) at.*pendshr.c:$bp3_loc.*printf.*;" \
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index 4ac235e..9c8ef12 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -227,7 +227,7 @@ delete_breakpoints
 # test temporary breakpoint at function
 #
 
-gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
+gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "temporary breakpoint function"
 
 #
 # test break at function in file
diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp
index 557eba9..51373b3 100644
--- a/gdb/testsuite/gdb.base/testenv.exp
+++ b/gdb/testsuite/gdb.base/testenv.exp
@@ -99,7 +99,7 @@ if { ![runto_main] } {
 set bp_line [gdb_get_line_number "set breakpoint here"]
 gdb_breakpoint  $bp_line
 
-gdb_test "show env" ".*TEST_GDB_GLOBAL=.*" "Test passing TEST_GDB_GLOBAL to GDB"
+gdb_test "show env" ".*TEST_GDB_GLOBAL=.*" "test passing TEST_GDB_GLOBAL to GDB"
 # First test with only inherited TEST_GDB_GLOBAL
 gdb_test "continue" \
   ".*TEST_GDB_GLOBAL=Global environment value.*Program found 1 variables starting with TEST_GDB.*" \
diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp
index 7625722..839bf84 100644
--- a/gdb/testsuite/gdb.base/watch_thread_num.exp
+++ b/gdb/testsuite/gdb.base/watch_thread_num.exp
@@ -46,8 +46,8 @@ if { ![runto main] } then {
    return
 }
 
-gdb_test "watch shared_var thread 0" "Invalid thread ID: 0" "Watchpoint on invalid thread"
-gdb_test "watch shared_var thread" "A syntax error in expression, near `thread'\." "Invalid watch syntax"
+gdb_test "watch shared_var thread 0" "Invalid thread ID: 0" "watchpoint on invalid thread"
+gdb_test "watch shared_var thread" "A syntax error in expression, near `thread'\." "invalid watch syntax"
 
 set bpexitline [gdb_get_line_number "all threads started"]
 gdb_breakpoint "$bpexitline"
@@ -56,7 +56,7 @@ gdb_continue_to_breakpoint "all threads started"
 gdb_test "break loop" "Breakpoint \[0-9\].*" \
   "Set breakpoint at loop"
 
-gdb_test "continue" ".*Breakpoint .*loop.*" "Stopped in loop"
+gdb_test "continue" ".*Breakpoint .*loop.*" "stopped in loop"
 
 gdb_test_multiple "thread" "Thread command" {
     -re ".*Current thread is (\[0-9\]*).*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
index 7a95eea..d3b7eb6 100644
--- a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
@@ -36,7 +36,7 @@ gdb_breakpoint [gdb_get_line_number "watchpoint-here"]
 gdb_continue_to_breakpoint "Place to set the watchpoint"
 
 # The condition `c == 30' is the subject being tested.
-gdb_test "watch c if c == 30" "atchpoint \[0-9\]*.*" "Place the watchpoint"
+gdb_test "watch c if c == 30" "atchpoint \[0-9\]*.*" "place the watchpoint"
 
 # We may stay either in the function itself or only at the first instruction of
 # its caller depending on the epilogue unwinder (or valid epilogue CFI) presence.
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 6e262e9..fb20a0a 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -146,7 +146,7 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count
     }
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 1 time.*" "Watchpoint hit count is 1"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 1 time.*" "watchpoint hit count is 1"
 
     gdb_test_no_output "delete \$func1_breakpoint_number"
 
@@ -154,19 +154,19 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = 1.*ival3 = count; ival4 = count;.*" "watchpoint hit, second time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 2 times.*" "Watchpoint hit count is 2"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 2 times.*" "watchpoint hit count is 2"
 
     # Continue until the next change, from 1 to 2.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 1.*New value = 2.*ival3 = count; ival4 = count;.*" "watchpoint hit, third time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 3 times.*" "Watchpoint hit count is 3"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 3 times.*" "watchpoint hit count is 3"
     
     # Continue until the next change, from 2 to 3.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 2.*New value = 3.*ival3 = count; ival4 = count;.*" "watchpoint hit, fourth time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 4 times.*" "Watchpoint hit count is 4"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 4 times.*" "watchpoint hit count is 4"
 
     # Continue until the next change, from 3 to 4.
     # Note that this one is outside the loop.
@@ -174,7 +174,7 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 3.*New value = 4.*ival3 = count; ival4 = count;.*" "watchpoint hit, fifth time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "Watchpoint hit count is 5"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "watchpoint hit count is 5"
 
     # Continue until we hit the finishing marker function.
     # Make sure we hit no more watchpoints.
@@ -432,7 +432,7 @@ proc test_complex_watchpoint {} {
 	gdb_test "watch ptr1->val" ".*\[Ww\]atchpoint \[0-9\]*: ptr1->val"
 	gdb_test "break marker5" ".*Breakpoint.*"
 
-	gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ptr1->val.*Old value = 1.*New value = 2.*" "Test complex watchpoint"
+	gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ptr1->val.*Old value = 1.*New value = 2.*" "test complex watchpoint"
 
 	# Continue until we hit the marker5 function.
 	# Make sure we hit no more watchpoints.
diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp
index 6a4b753..f6cf24d 100644
--- a/gdb/testsuite/gdb.base/watchpoints.exp
+++ b/gdb/testsuite/gdb.base/watchpoints.exp
@@ -69,25 +69,25 @@ with_test_prefix "before inferior start" {
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count; ival4 = count;.*" "watchpoint hit, first time"
 
     # Check that the ival3 hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 1 time.*" "Watchpoint hit count is 1"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 1 time.*" "watchpoint hit count is 1"
 
     # Continue until the next change for ival1, from 0 to 1.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival1.*Old value = 0.*New value = 1.*ival1 = count; ival2 = count;.*" "watchpoint ival1 hit, second time"
 
     # Check that the hit count for ival1 is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival1\r\n\[ \t]+breakpoint already hit 2 times.*" "Watchpoint ival1 hit count is 2"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival1\r\n\[ \t]+breakpoint already hit 2 times.*" "watchpoint ival1 hit count is 2"
 
     # Continue until the next change for ival3, from 0 to 1.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = 1.*ival3 = count; ival4 = count;.*" "watchpoint hit, second time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 2 times.*" "Watchpoint hit count is 2"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 2 times.*" "watchpoint hit count is 2"
 
     # Continue until the next change, from 1 to 2.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival1.*Old value = 1.*New value = 2.*ival1 = count; ival2 = count;.*" "watchpoint ival1 hit, third time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival1\r\n\[ \t]+breakpoint already hit 3 times.*" "Watchpoint ival1 hit count is 3"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival1\r\n\[ \t]+breakpoint already hit 3 times.*" "watchpoint ival1 hit count is 3"
     # Disable ival1 watchpoint
     gdb_test_no_output "disable 2" ""
  
@@ -95,13 +95,13 @@ with_test_prefix "before inferior start" {
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 1.*New value = 2.*ival3 = count; ival4 = count;.*" "watchpoint hit, third time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 3 times.*" "Watchpoint hit count is 3"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 3 times.*" "watchpoint hit count is 3"
     
     # Continue until the next change, from 2 to 3.
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 2.*New value = 3.*ival3 = count; ival4 = count;.*" "watchpoint hit, fourth time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 4 times.*" "Watchpoint hit count is 4"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 4 times.*" "watchpoint hit count is 4"
 
     # Continue until the next change, from 3 to 4.
     # Note that this one is outside the loop.
@@ -109,6 +109,6 @@ with_test_prefix "before inferior start" {
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 3.*New value = 4.*ival3 = count; ival4 = count;.*" "watchpoint hit, fifth time"
 
     # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "Watchpoint hit count is 5"
+    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "watchpoint hit count is 5"
 
 set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.cp/arg-reference.exp b/gdb/testsuite/gdb.cp/arg-reference.exp
index 7da075a..e43ad94 100644
--- a/gdb/testsuite/gdb.cp/arg-reference.exp
+++ b/gdb/testsuite/gdb.cp/arg-reference.exp
@@ -30,4 +30,4 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-gdb_test "ptype foo" "type = int \\\(Obj\\\)" "No false reference"
+gdb_test "ptype foo" "type = int \\\(Obj\\\)" "no false reference"
diff --git a/gdb/testsuite/gdb.cp/baseenum.exp b/gdb/testsuite/gdb.cp/baseenum.exp
index 0a9343b..16de7d2 100644
--- a/gdb/testsuite/gdb.cp/baseenum.exp
+++ b/gdb/testsuite/gdb.cp/baseenum.exp
@@ -28,7 +28,7 @@ if {![runto_main]} {
 
 gdb_breakpoint [gdb_get_line_number "breakpoint 1" $srcfile]
 gdb_continue_to_breakpoint "breakpoint 1"
-gdb_test "print X" "= A::X" "Print enum constant X of class A"
+gdb_test "print X" "= A::X" "print enum constant X of class A"
 
 gdb_breakpoint [gdb_get_line_number "breakpoint 2" $srcfile]
 gdb_continue_to_breakpoint "breakpoint 2"
diff --git a/gdb/testsuite/gdb.cp/operator.exp b/gdb/testsuite/gdb.cp/operator.exp
index fce5c37..dc3d39a 100644
--- a/gdb/testsuite/gdb.cp/operator.exp
+++ b/gdb/testsuite/gdb.cp/operator.exp
@@ -33,7 +33,7 @@ gdb_test "p a == 'a'" "= 12" "global operator overload"
 # Test ADL operator
 gdb_test "p bc == 1" "= 22" "ADL operator"
 gdb_test "p bc == 'a'" "= 23" "ADL operator overload"
-gdb_test "p B::BD::operator== (bc,'a')" "= 24" "Fully qualified explicit operator call"
+gdb_test "p B::BD::operator== (bc,'a')" "= 24" "fully qualified explicit operator call"
 
 # Test operator imported from anonymous namespace
 gdb_test "p d == 1" "= 33" "anonymous namespace operator"
diff --git a/gdb/testsuite/gdb.cp/shadow.exp b/gdb/testsuite/gdb.cp/shadow.exp
index d6970ca..bdd02b2 100644
--- a/gdb/testsuite/gdb.cp/shadow.exp
+++ b/gdb/testsuite/gdb.cp/shadow.exp
@@ -39,7 +39,7 @@ if ![runto_main] then {
 gdb_breakpoint [gdb_get_line_number "marker1"]
 gdb_continue_to_breakpoint "marker1"
 
-gdb_test "print x" "= 33" "Print class x shadowing global x"
+gdb_test "print x" "= 33" "print class x shadowing global x"
 
 
 ############################################
@@ -49,7 +49,7 @@ gdb_test "print x" "= 33" "Print class x shadowing global x"
 gdb_breakpoint [gdb_get_line_number "marker2"]
 gdb_continue_to_breakpoint "marker2"
 
-gdb_test "print x" "= 44" "Print local x shadowing class x"
+gdb_test "print x" "= 44" "print local x shadowing class x"
 
 ############################################
 # Test inner scope x is printed not outer scope
@@ -57,7 +57,7 @@ gdb_test "print x" "= 44" "Print local x shadowing class x"
 gdb_breakpoint [gdb_get_line_number "marker3"]
 gdb_continue_to_breakpoint "marker3"
 
-gdb_test "print x" "= 55" "Print inner scope x"
+gdb_test "print x" "= 55" "print inner scope x"
 
 ############################################
 # Test printing local variable is not shadowed
@@ -66,7 +66,7 @@ gdb_test "print x" "= 55" "Print inner scope x"
 gdb_breakpoint [gdb_get_line_number "marker4"]
 gdb_continue_to_breakpoint "marker4"
 
-gdb_test "print x" "= 55" "Print local x not namespace x"
+gdb_test "print x" "= 55" "print local x not namespace x"
 
 ############################################
 # Test imported namespace element is printed
@@ -79,4 +79,4 @@ if { [test_compiler_info {gcc-[0-3]-*}] ||
     setup_xfail *-*-*
 }
 
-gdb_test "print x" "= 11" "Print imported namespace x"
+gdb_test "print x" "= 11" "print imported namespace x"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
index e7fee74..43f4992 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
@@ -46,16 +46,16 @@ gdb_test_no_output "set print frame-arguments all"
 
 # (1) int_param_single_reg_loc
 gdb_continue_to_breakpoint "Stop in breakpt for test int_param_single_reg_loc"
-gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?int_param_single_reg_loc \\(operand0=<optimized out>, operand1=0xdeadbe00deadbe01, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "Backtrace for test int_param_single_reg_loc"
+gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?int_param_single_reg_loc \\(operand0=<optimized out>, operand1=0xdeadbe00deadbe01, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "backtrace for test int_param_single_reg_loc"
 
 # (2) struct_param_single_reg_loc
 gdb_continue_to_breakpoint "Stop in breakpt for struct_param_single_reg_loc"
-gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?struct_param_single_reg_loc \\(operand0={a = 0xdeadbe00deadbe01, b = <optimized out>}, operand1={a = <optimized out>, b = 0xdeadbe04deadbe05}, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "Backtrace for test struct_param_single_reg_loc"
+gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?struct_param_single_reg_loc \\(operand0={a = 0xdeadbe00deadbe01, b = <optimized out>}, operand1={a = <optimized out>, b = 0xdeadbe04deadbe05}, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "backtrace for test struct_param_single_reg_loc"
 
 # (3) struct_param_two_reg_pieces
 gdb_continue_to_breakpoint "Stop in breakpt for struct_param_two_reg_pieces"
-gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?struct_param_two_reg_pieces \\(operand0={a = 0xdeadbe04deadbe05, b = <optimized out>}, operand1={a = <optimized out>, b = 0xdeadbe00deadbe01}, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "Backtrace for test struct_param_two_reg_pieces"
+gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?struct_param_two_reg_pieces \\(operand0={a = 0xdeadbe04deadbe05, b = <optimized out>}, operand1={a = <optimized out>, b = 0xdeadbe00deadbe01}, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "backtrace for test struct_param_two_reg_pieces"
 
 # (4) int_param_two_reg_pieces
 gdb_continue_to_breakpoint "Stop in breakpt for int_param_two_reg_pieces"
-gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?int_param_two_reg_pieces \\(operand0=<optimized out>, operand1=<optimized out>, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "Backtrace for test int_param_two_reg_pieces"
+gdb_test "bt" "#0  ($hex in )?breakpt \\(\\)\r\n#1  ($hex in )?int_param_two_reg_pieces \\(operand0=<optimized out>, operand1=<optimized out>, operand2=<optimized out>\\)\r\n#2  ($hex in )?main \\(\\)" "backtrace for test int_param_two_reg_pieces"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
index f1f36a3..f103198 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
@@ -52,7 +52,7 @@ for {set f 0} {$f < 3} {incr f} {
     }
 
     # Select frame.
-    gdb_test "frame ${f}" "#${f}.*" "Switch to frame ${f}"
+    gdb_test "frame ${f}" "#${f}.*" "switch to frame ${f}"
 
     gdb_test "p/x \$rax" ".*$pattern_rax_rbx_rcx_print.*" \
 	"print \$rax in frame ${f}"
diff --git a/gdb/testsuite/gdb.go/chan.exp b/gdb/testsuite/gdb.go/chan.exp
index 52b88e6..be903a8 100644
--- a/gdb/testsuite/gdb.go/chan.exp
+++ b/gdb/testsuite/gdb.go/chan.exp
@@ -40,7 +40,7 @@ if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
     pass "setting breakpoint 1"
 }
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
 gdb_test_no_output "disable"
 
@@ -48,4 +48,4 @@ if { [gdb_breakpoint ${srcfile}:${bp_location2}] } {
     pass "setting breakpoint 2"
 }
 
-gdb_test "cont" "Breakpoint .*:${bp_location2}.*" "Going to second breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location2}.*" "going to second breakpoint"
diff --git a/gdb/testsuite/gdb.go/hello.exp b/gdb/testsuite/gdb.go/hello.exp
index 3efb78b..666567c 100644
--- a/gdb/testsuite/gdb.go/hello.exp
+++ b/gdb/testsuite/gdb.go/hello.exp
@@ -45,7 +45,7 @@ if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
     pass "setting breakpoint 1"
 }
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
 gdb_test "print st" \
     ".* = $hex \"Hello, world!\"" \
diff --git a/gdb/testsuite/gdb.go/integers.exp b/gdb/testsuite/gdb.go/integers.exp
index b823f5a..dd28f6d 100644
--- a/gdb/testsuite/gdb.go/integers.exp
+++ b/gdb/testsuite/gdb.go/integers.exp
@@ -39,20 +39,20 @@ if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
     pass "setting breakpoint 1"
 }
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
-gdb_test "print i" ".* = 0" "Print i before assigned to 1"
+gdb_test "print i" ".* = 0" "print i before assigned to 1"
 
-gdb_test "next" "i = 1" "Next to 'i = 1' line"
-gdb_test "next" "j = 2" "Next to 'j = 2' line"
+gdb_test "next" "i = 1" "next to 'i = 1' line"
+gdb_test "next" "j = 2" "next to 'j = 2' line"
 # At that point, 
 # i should be equal to 1
 gdb_test "print i" " = 1" 
 # but j should still be equal to zero
-gdb_test "print j" " = 0" "Test j value before assignment"
+gdb_test "print j" " = 0" "test j value before assignment"
 
-gdb_test "next" "k = 3" "Next to 'k = 3' line"
-gdb_test "next" "l = k" "Next to 'l = k' line"
+gdb_test "next" "k = 3" "next to 'k = 3' line"
+gdb_test "next" "l = k" "next to 'l = k' line"
 
 #j should be equal to 2
 gdb_test "print j" " = 2"
@@ -101,7 +101,7 @@ gdb_test "print i+10*j+100*k" " = 321"
 gdb_test " print (i + 5) * (j + 7)" " = 54"
 
 gdb_test "set var i = 2" " = 2"
-gdb_test "print i" " = 2" "Testing new i value"
+gdb_test "print i" " = 2" "testing new i value"
 
 if { [gdb_breakpoint ${srcfile}:${bp_location2}] } {
     pass "setting breakpoint 2"
diff --git a/gdb/testsuite/gdb.go/methods.exp b/gdb/testsuite/gdb.go/methods.exp
index ea6a894..cb7f55a 100644
--- a/gdb/testsuite/gdb.go/methods.exp
+++ b/gdb/testsuite/gdb.go/methods.exp
@@ -40,10 +40,10 @@ if { [gdb_breakpoint ${bp_location1}] } {
     pass "setting breakpoint 1"
 }
 setup_xfail "*-*-*" ;# mangling issues IIRC
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
 if { [gdb_breakpoint ${bp_location2}] } {
     pass "setting breakpoint 2"
 }
 setup_xfail "*-*-*" ;# mangling issues IIRC
-gdb_test "cont" "Breakpoint .*:${bp_location2_regexp}.*" "Going to second breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location2_regexp}.*" "going to second breakpoint"
diff --git a/gdb/testsuite/gdb.go/package.exp b/gdb/testsuite/gdb.go/package.exp
index 1d09f1c..fc5f85d 100644
--- a/gdb/testsuite/gdb.go/package.exp
+++ b/gdb/testsuite/gdb.go/package.exp
@@ -46,4 +46,4 @@ set bp_location1_regexp {package2[.]Foo.*package2[.]go:}
 if { [gdb_breakpoint ${bp_location1}] } {
     pass "setting breakpoint 1"
 }
-gdb_test "cont" "Breakpoint .*${bp_location1_regexp}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*${bp_location1_regexp}.*" "going to first breakpoint"
diff --git a/gdb/testsuite/gdb.guile/scm-parameter.exp b/gdb/testsuite/gdb.guile/scm-parameter.exp
index 7d1a920..1afdf83 100644
--- a/gdb/testsuite/gdb.guile/scm-parameter.exp
+++ b/gdb/testsuite/gdb.guile/scm-parameter.exp
@@ -52,9 +52,9 @@ gdb_test_multiline "Simple gdb boolean parameter" \
 
 with_test_prefix "test-param" {
     gdb_test "guile (print (parameter-value test-param))" "= #t" "parameter value (true)"
-    gdb_test "show print test-param" "The state of the Test Parameter is on." "Show parameter on"
+    gdb_test "show print test-param" "The state of the Test Parameter is on." "show parameter on"
     gdb_test_no_output "set print test-param off"
-    gdb_test "show print test-param" "The state of the Test Parameter is off." "Show parameter off"
+    gdb_test "show print test-param" "The state of the Test Parameter is off." "show parameter off"
     gdb_test "guile (print (parameter-value test-param))" "= #f" "parameter value (false)"
     gdb_test "help show print test-param" "Show the state of the boolean test-param.*" "show help"
     gdb_test "help set print test-param" "Set the state of the boolean test-param.*" "set help"
@@ -187,9 +187,9 @@ gdb_test_no_output "guile (register-parameter! prev-ambig)"
 
 with_test_prefix "previously-ambiguous" {
     gdb_test "guile (print (parameter-value prev-ambig))" "= #f" "parameter value (false)"
-    gdb_test "show print s" "Command is not documented is off." "Show parameter off"
+    gdb_test "show print s" "Command is not documented is off." "show parameter off"
     gdb_test_no_output "set print s on"
-    gdb_test "show print s" "Command is not documented is on." "Show parameter on"
+    gdb_test "show print s" "Command is not documented is on." "show parameter on"
     gdb_test "guile (print (parameter-value prev-ambig))" "= #t" "parameter value (true)"
     gdb_test "help show print s" "This command is not documented." "show help"
     gdb_test "help set print s" "This command is not documented." "set help"
diff --git a/gdb/testsuite/gdb.guile/scm-progspace.exp b/gdb/testsuite/gdb.guile/scm-progspace.exp
index 47d1c02..c9ae23a 100644
--- a/gdb/testsuite/gdb.guile/scm-progspace.exp
+++ b/gdb/testsuite/gdb.guile/scm-progspace.exp
@@ -73,8 +73,8 @@ with_test_prefix "program unloaded" {
 # deleted.  We need to, for example, delete an inferior to get the progspace
 # to go away.
 
-gdb_test "add-inferior" "Added inferior 2" "Create new inferior"
-gdb_test "inferior 2" ".*" "Switch to new inferior"
+gdb_test "add-inferior" "Added inferior 2" "create new inferior"
+gdb_test "inferior 2" ".*" "switch to new inferior"
 gdb_test_no_output "remove-inferiors 1" "Remove first inferior"
 
 with_test_prefix "inferior removed" {
diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
index 282a1ce..76ec990 100644
--- a/gdb/testsuite/gdb.guile/scm-value.exp
+++ b/gdb/testsuite/gdb.guile/scm-value.exp
@@ -290,7 +290,7 @@ proc test_value_after_death {} {
     gdb_test "kill" "" "kill the inferior" \
 	"Kill the program being debugged. .y or n. $" \
 	"y"
-    gdb_test "file" "" "Discard the symbols" \
+    gdb_test "file" "" "discard the symbols" \
 	"Discard symbol table from.*y or n. $" \
 	"y"
 
diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 668572c..1a27733 100644
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -101,7 +101,7 @@ mi_expect_stop "breakpoint-hit" "thread_func" ".*" ".*" ".*" \
     "Run till MI pending breakpoint on thread_func"
 
 # Delete thread creation breakpoint to enable more than 1 thread to be created.
-mi_gdb_test "-break-delete 3" "\\^done" "Delete breakpoint 3"
+mi_gdb_test "-break-delete 3" "\\^done" "delete breakpoint 3"
 
 # Set pending breakpoint with a thread via MI.
 mi_gdb_test "-break-insert -p 2 -f pendfunc3" \
diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index ef94775..6b6ec2d 100644
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -409,7 +409,7 @@ proc_with_prefix test_setup { mode } {
 	# Add the second inferior now.  While this is not mandatory, it allows
 	# us to assume that per-inferior thread numbering will be used,
 	# simplifying test_continue_to_start a bit (Thread 1.2 and not Thread 2).
-	gdb_test "add-inferior" "Added inferior 2" "Add inferior 2"
+	gdb_test "add-inferior" "Added inferior 2" "add inferior 2"
 
 	# Prepare the first inferior for the test.
 	test_continue_to_start $mode 1
diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
index 590ea5d..e33f1b5 100644
--- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
@@ -36,7 +36,7 @@ if { ![runto start_sequence] } then {
    return
 }
 
-gdb_test "frame 1" "#1.*in gen_movsd.*" "Backtracing"
+gdb_test "frame 1" "#1.*in gen_movsd.*" "backtracing"
 
 gdb_test_multiple "print operand0" "print operand0" {
     -re "\\\$$decimal = <optimized out>\r\n$gdb_prompt $" { pass "print operand0"}
diff --git a/gdb/testsuite/gdb.pascal/floats.exp b/gdb/testsuite/gdb.pascal/floats.exp
index 43065ed..bd27947 100644
--- a/gdb/testsuite/gdb.pascal/floats.exp
+++ b/gdb/testsuite/gdb.pascal/floats.exp
@@ -42,15 +42,15 @@ if { [gdb_start_cmd] < 0 } {
 
 gdb_test "" ".* at .*${srcfile}.*" "start"
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
-gdb_test "print r" ".* = 0" "Print r before assigned to 1.25"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
+gdb_test "print r" ".* = 0" "print r before assigned to 1.25"
 
-gdb_test "next" "r := 1\\.25;" "Next to 'r := 1.25' line"
-gdb_test "next" "s := 2\\.2;" "Next to 's := 2.2' line"
-gdb_test "next" "t := -3\\.2;" "Next to 't := -3.2' line"
-gdb_test "next" "u := 78\\.3;" "Next to 'u := 78.3' line"
-gdb_test "next" "l := 1;" "Next to 'l := 1' line"
-gdb_test "next" "i := 1;" "Next to 'i := 1' line"
+gdb_test "next" "r := 1\\.25;" "next to 'r := 1.25' line"
+gdb_test "next" "s := 2\\.2;" "next to 's := 2.2' line"
+gdb_test "next" "t := -3\\.2;" "next to 't := -3.2' line"
+gdb_test "next" "u := 78\\.3;" "next to 'u := 78.3' line"
+gdb_test "next" "l := 1;" "next to 'l := 1' line"
+gdb_test "next" "i := 1;" "next to 'i := 1' line"
 
 # At that point, 
 # r should be equal to 1.25
@@ -113,16 +113,16 @@ gdb_test "print 35 / 2" " = 17\\.(499.*|5|500.*)"
 # 'set r' does not work, as there are set sub-commands starting with 'r'
 # Thus we need to use 'set var r'
 gdb_test "set var r := 2.56" " := 2\\.56"
-gdb_test "print r" " = 2\\.5(599.*|6|600.*)" "Testing new r value"
+gdb_test "print r" " = 2\\.5(599.*|6|600.*)" "testing new r value"
 
 gdb_test "cont" \
 	 "Breakpoint .*:${bp_location2}.*" \
 	 "Going to second breakpoint"
-gdb_test "next" "r := cos\\(u\\);" "Advance to 'r := cos(u)' line"
-gdb_test "print u" " = 3\\.14159.*" "Test pi value"
-gdb_test "next" "s := sin\\(u\\);" "Advance to 's := sin(u)' line"
-gdb_test "print r" " = -1" "Test cos(pi) is equal to -1" 
-gdb_test "next" "" "Go past 's := sin(u)' line"
+gdb_test "next" "r := cos\\(u\\);" "advance to 'r := cos(u)' line"
+gdb_test "print u" " = 3\\.14159.*" "test pi value"
+gdb_test "next" "s := sin\\(u\\);" "advance to 's := sin(u)' line"
+gdb_test "print r" " = -1" "test cos(pi) is equal to -1"
+gdb_test "next" "" "go past 's := sin(u)' line"
 
 set msg "Test sin(pi) is equal to 0" 
 
diff --git a/gdb/testsuite/gdb.pascal/integers.exp b/gdb/testsuite/gdb.pascal/integers.exp
index ec9739c..4e62745 100644
--- a/gdb/testsuite/gdb.pascal/integers.exp
+++ b/gdb/testsuite/gdb.pascal/integers.exp
@@ -40,12 +40,12 @@ if { [gdb_start_cmd] < 0 } {
 
 gdb_test "" ".* at .*${srcfile}.*" "start"
 
-gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "going to first breakpoint"
 
-gdb_test "print i" ".* = 0" "Print i before assigned to 1"
+gdb_test "print i" ".* = 0" "print i before assigned to 1"
 
-gdb_test "next" "i := 1;" "Next to 'i := 1' line"
-gdb_test "next" "j := 2;" "Next to 'j := 2' line"
+gdb_test "next" "i := 1;" "next to 'i := 1' line"
+gdb_test "next" "j := 2;" "next to 'j := 2' line"
 # At that point, 
 # i should be equal to 1
 gdb_test "print i" " = 1" 
@@ -53,10 +53,10 @@ gdb_test "print i" " = 1"
 if { $pascal_compiler_is_gpc } {
   setup_xfail *-*-*
 }
-gdb_test "print j" " = 0" "Test j value before assignment"
+gdb_test "print j" " = 0" "test j value before assignment"
 
-gdb_test "next" "k := 3;" "Next to 'k := 3' line"
-gdb_test "next" "l := k;" "Next to 'l := k' line"
+gdb_test "next" "k := 3;" "next to 'k := 3' line"
+gdb_test "next" "l := k;" "next to 'l := k' line"
 
 #j should be equal to 2
 gdb_test "print j" " = 2"
@@ -110,7 +110,7 @@ gdb_test " print (i + 5) * (j + 7)" " = 54"
 # 'set i' does not work, as there are set sub-commands starting with 'i'
 # Thus we need to use 'set var i'
 gdb_test "set var i := 2" " := 2"
-gdb_test "print i" " = 2" "Testing new i value"
+gdb_test "print i" " = 2" "testing new i value"
 
 gdb_test "cont" \
 	 "Breakpoint .*:${bp_location2}.*" \
diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index 45e4f07..e04cb76 100644
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -39,24 +39,24 @@ gdb_continue_to_breakpoint "Block break here."
 # Test initial innermost block.
 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"
-gdb_test "python print (block.function)" "None" "First anonymous block"
-gdb_test "python print (block.start)" "${decimal}" "Check start not None"
-gdb_test "python print (block.end)" "${decimal}" "Check end not None"
+gdb_test "python print (block)" "<gdb.Block object at $hex>" "check block not None"
+gdb_test "python print (block.function)" "None" "first anonymous block"
+gdb_test "python print (block.start)" "${decimal}" "check start not None"
+gdb_test "python print (block.end)" "${decimal}" "check end not None"
 
 # Test global/static blocks
 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.is_global)" "False" "Not a global block"
-gdb_test "python print (block.is_static)" "False" "Not a static block"
+gdb_test "python print (block.is_global)" "False" "not a global block"
+gdb_test "python print (block.is_static)" "False" "not a static block"
 gdb_py_test_silent_cmd "python gblock = block.global_block" "Get block" 1
 gdb_py_test_silent_cmd "python sblock = block.static_block" "Get block" 1
-gdb_test "python print (gblock.is_global)" "True" "Is the global block"
-gdb_test "python print (sblock.is_static)" "True" "Is the static block"
+gdb_test "python print (gblock.is_global)" "True" "is the global block"
+gdb_test "python print (sblock.is_static)" "True" "is the static block"
 
 # Move up superblock(s) until we reach function block_func.
 gdb_test_no_output "python block = block.superblock" "Get superblock"
-gdb_test "python print (block.function)" "None" "Second anonymous block"
+gdb_test "python print (block.function)" "None" "second anonymous block"
 gdb_test_no_output "python block = block.superblock" "Get superblock 2"
 gdb_test "python print (block.function)" "block_func" \
          "Print superblock 2 function"
diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index 547870a..144cc4b 100644
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -49,7 +49,7 @@ gdb_test "test-objfile-events" "Object file events registered."
 
 gdb_breakpoint "main" {temporary}
 
-gdb_test "run" ".*event type: new_objfile.*new objfile name.*" "New objfile notification"
+gdb_test "run" ".*event type: new_objfile.*new objfile name.*" "new objfile notification"
 
 gdb_test_no_output "set detach-on-fork off" ""
 
diff --git a/gdb/testsuite/gdb.python/py-parameter.exp b/gdb/testsuite/gdb.python/py-parameter.exp
index 28b5d65..35fcb7f 100644
--- a/gdb/testsuite/gdb.python/py-parameter.exp
+++ b/gdb/testsuite/gdb.python/py-parameter.exp
@@ -57,14 +57,14 @@ gdb_py_test_multiple "Simple gdb booleanparameter" \
    "test_param = TestParam ('print test-param')" ""\
    "end"
 
-gdb_test "python print (test_param.value)" "True" "Test parameter value"
-gdb_test "show print test-param" "The state of the Test Parameter is on.*" "Show parameter on"
-gdb_test "set print test-param off" "Test Parameter has been set to off" "Turn off parameter"
-gdb_test "show print test-param" "The state of the Test Parameter is off.*" "Show parameter off"
-gdb_test "python print (test_param.value)" "False" "Test parameter value"
-gdb_test "help show print test-param" "Show the state of the boolean test-param.*" "Test show help"
-gdb_test "help set print test-param" "Set the state of the boolean test-param.*" "Test set help"
-gdb_test "help set print" "set print test-param -- Set the state of the boolean test-param.*" "Test general help"
+gdb_test "python print (test_param.value)" "True" "test parameter value"
+gdb_test "show print test-param" "The state of the Test Parameter is on.*" "show parameter on"
+gdb_test "set print test-param off" "Test Parameter has been set to off" "turn off parameter"
+gdb_test "show print test-param" "The state of the Test Parameter is off.*" "show parameter off"
+gdb_test "python print (test_param.value)" "False" "test parameter value"
+gdb_test "help show print test-param" "Show the state of the boolean test-param.*" "test show help"
+gdb_test "help set print test-param" "Set the state of the boolean test-param.*" "test set help"
+gdb_test "help set print" "set print test-param -- Set the state of the boolean test-param.*" "test general help"
 
 
 # Test an enum parameter.
@@ -84,12 +84,12 @@ gdb_py_test_multiple "enum gdb parameter" \
    "test_enum_param = TestEnumParam ('print test-enum-param')" ""\
    "end"
 
-gdb_test "python print (test_enum_param.value)" "one" "Test enum parameter value"
-gdb_test "show print test-enum-param" "The state of the enum is one.*" "Show parameter is initial value"
-gdb_test "set print test-enum-param two" "The state of the enum has been set to two" "Set enum to two"
-gdb_test "show print test-enum-param" "The state of the enum is two.*" "Show parameter is new value"
-gdb_test "python print (test_enum_param.value)" "two" "Test enum parameter value"
-gdb_test "set print test-enum-param three" "Undefined item: \"three\".*" "Set invalid enum parameter" 
+gdb_test "python print (test_enum_param.value)" "one" "test enum parameter value"
+gdb_test "show print test-enum-param" "The state of the enum is one.*" "show parameter is initial value"
+gdb_test "set print test-enum-param two" "The state of the enum has been set to two" "set enum to two"
+gdb_test "show print test-enum-param" "The state of the enum is two.*" "show parameter is new value"
+gdb_test "python print (test_enum_param.value)" "two" "test enum parameter value"
+gdb_test "set print test-enum-param three" "Undefined item: \"three\".*" "set invalid enum parameter"
 
 # Test a file parameter.
 gdb_py_test_multiple "file gdb parameter" \
@@ -108,11 +108,11 @@ gdb_py_test_multiple "file gdb parameter" \
    "test_file_param = TestFileParam ('test-file-param')" ""\
    "end"
 
-gdb_test "python print (test_file_param.value)" "foo.txt" "Test file parameter value"
-gdb_test "show test-file-param" "The name of the file is foo.txt.*" "Show initial file value"
-gdb_test "set test-file-param bar.txt" "The name of the file has been changed to bar.txt" "Set new file parameter" 1
-gdb_test "show test-file-param" "The name of the file is bar.txt.*" "Show new file value"
-gdb_test "python print (test_file_param.value)" "bar.txt" "Test new file parameter value"
+gdb_test "python print (test_file_param.value)" "foo.txt" "test file parameter value"
+gdb_test "show test-file-param" "The name of the file is foo.txt.*" "show initial file value"
+gdb_test "set test-file-param bar.txt" "The name of the file has been changed to bar.txt" "set new file parameter" 1
+gdb_test "show test-file-param" "The name of the file is bar.txt.*" "show new file value"
+gdb_test "python print (test_file_param.value)" "bar.txt" "test new file parameter value"
 gdb_test "set test-file-param" "Argument required.*" 
 
 # Test a parameter that is not documented.
@@ -132,13 +132,13 @@ gdb_py_test_multiple "Simple gdb booleanparameter" \
    "test_undoc_param = TestUndocParam ('print test-undoc-param')" ""\
    "end"
 
-gdb_test "show print test-undoc-param" "The state of the Test Parameter is on.*" "Show parameter on"
-gdb_test "set print test-undoc-param off" "Test Parameter has been set to off" "Turn off parameter"
-gdb_test "show print test-undoc-param" "The state of the Test Parameter is off.*" "Show parameter off"
-gdb_test "python print (test_undoc_param.value)" "False" "Test parameter value"
-gdb_test "help show print test-undoc-param" "This command is not documented.*" "Test show help"
-gdb_test "help set print test-undoc-param" "This command is not documented.*" "Test set help"
-gdb_test "help set print" "set print test-undoc-param -- This command is not documented.*" "Test general help"
+gdb_test "show print test-undoc-param" "The state of the Test Parameter is on.*" "show parameter on"
+gdb_test "set print test-undoc-param off" "Test Parameter has been set to off" "turn off parameter"
+gdb_test "show print test-undoc-param" "The state of the Test Parameter is off.*" "show parameter off"
+gdb_test "python print (test_undoc_param.value)" "False" "test parameter value"
+gdb_test "help show print test-undoc-param" "This command is not documented.*" "test show help"
+gdb_test "help set print test-undoc-param" "This command is not documented.*" "test set help"
+gdb_test "help set print" "set print test-undoc-param -- This command is not documented.*" "test general help"
 
 # Test a parameter that is not documented in any way..
 gdb_py_test_multiple "Simple gdb booleanparameter" \
@@ -150,13 +150,13 @@ gdb_py_test_multiple "Simple gdb booleanparameter" \
    "test_nodoc_param = TestNodocParam ('print test-nodoc-param')" ""\
    "end"
 
-gdb_test "show print test-nodoc-param" "This command is not documented.*" "Show parameter on"
-gdb_test "set print test-nodoc-param off" "This command is not documented.*" "Turn off parameter"
-gdb_test "show print test-nodoc-param" "This command is not documented.*.*" "Show parameter off"
-gdb_test "python print (test_nodoc_param.value)" "False" "Test parameter value"
-gdb_test "help show print test-nodoc-param" "This command is not documented.*" "Test show help"
-gdb_test "help set print test-nodoc-param" "This command is not documented.*" "Test set help"
-gdb_test "help set print" "set print test-nodoc-param -- This command is not documented.*" "Test general help"
+gdb_test "show print test-nodoc-param" "This command is not documented.*" "show parameter on"
+gdb_test "set print test-nodoc-param off" "This command is not documented.*" "turn off parameter"
+gdb_test "show print test-nodoc-param" "This command is not documented.*.*" "show parameter off"
+gdb_test "python print (test_nodoc_param.value)" "False" "test parameter value"
+gdb_test "help show print test-nodoc-param" "This command is not documented.*" "test show help"
+gdb_test "help set print test-nodoc-param" "This command is not documented.*" "test set help"
+gdb_test "help set print" "set print test-nodoc-param -- This command is not documented.*" "test general help"
 
 # Test deprecated API. Do not use in your own implementations.
 gdb_py_test_multiple "Simple gdb booleanparameter" \
@@ -171,11 +171,11 @@ gdb_py_test_multiple "Simple gdb booleanparameter" \
    "test_param = TestParam ('print test-param')" ""\
    "end"
 
-gdb_test "python print (test_param.value)" "True" "Test parameter value"
-gdb_test "show print test-param" "State of the Test Parameter on.*" "Show parameter on"
-gdb_test "set print test-param off" "Set the state of the Test Parameter.*" "Turn off parameter"
-gdb_test "show print test-param" "State of the Test Parameter off.*" "Show parameter off"
-gdb_test "python print (test_param.value)" "False" "Test parameter value"
-gdb_test "help show print test-param" "State of the Test Parameter.*" "Test show help"
-gdb_test "help set print test-param" "Set the state of the Test Parameter.*" "Test set help"
-gdb_test "help set print" "set print test-param -- Set the state of the Test Parameter.*" "Test general help"
+gdb_test "python print (test_param.value)" "True" "test parameter value"
+gdb_test "show print test-param" "State of the Test Parameter on.*" "show parameter on"
+gdb_test "set print test-param off" "Set the state of the Test Parameter.*" "turn off parameter"
+gdb_test "show print test-param" "State of the Test Parameter off.*" "show parameter off"
+gdb_test "python print (test_param.value)" "False" "test parameter value"
+gdb_test "help show print test-param" "State of the Test Parameter.*" "test show help"
+gdb_test "help set print test-param" "Set the state of the Test Parameter.*" "test set help"
+gdb_test "help set print" "set print test-param -- Set the state of the Test Parameter.*" "test general help"
diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
index 41c4a9e..fa05962 100644
--- a/gdb/testsuite/gdb.python/py-symbol.exp
+++ b/gdb/testsuite/gdb.python/py-symbol.exp
@@ -31,8 +31,8 @@ if { [skip_python_tests] } { continue }
 # point where we don't have a current frame, and we don't want to
 # require one.
 gdb_py_test_silent_cmd "python main_func = gdb.lookup_global_symbol(\"main\")" "Lookup main" 1
-gdb_test "python print (main_func.is_function)" "True" "Test main_func.is_function"
-gdb_test "python print (gdb.lookup_global_symbol(\"junk\"))" "None" "Test lookup_global_symbol(\"junk\")"
+gdb_test "python print (main_func.is_function)" "True" "test main_func.is_function"
+gdb_test "python print (gdb.lookup_global_symbol(\"junk\"))" "None" "test lookup_global_symbol(\"junk\")"
 
 gdb_test "python print (gdb.lookup_global_symbol('main').value())" "$hex .main." \
     "print value of main"
@@ -63,23 +63,23 @@ gdb_py_test_silent_cmd "python block = frame.block()" "Get block" 0
 
 # Test is_argument attribute.
 gdb_py_test_silent_cmd "python arg = gdb.lookup_symbol(\"arg\")" "Get variable arg" 0
-gdb_test "python print (arg\[0\].is_variable)" "False" "Test arg.is_variable"
-gdb_test "python print (arg\[0\].is_constant)" "False" "Test arg.is_constant"
-gdb_test "python print (arg\[0\].is_argument)" "True" "Test arg.is_argument"
-gdb_test "python print (arg\[0\].is_function)" "False" "Test arg.is_function"
+gdb_test "python print (arg\[0\].is_variable)" "False" "test arg.is_variable"
+gdb_test "python print (arg\[0\].is_constant)" "False" "test arg.is_constant"
+gdb_test "python print (arg\[0\].is_argument)" "True" "test arg.is_argument"
+gdb_test "python print (arg\[0\].is_function)" "False" "test arg.is_function"
 
 # Test is_function attribute.
 gdb_py_test_silent_cmd "python func = block.function" "Get block function" 0
-gdb_test "python print (func.is_variable)" "False" "Test func.is_variable"
-gdb_test "python print (func.is_constant)" "False" "Test func.is_constant"
-gdb_test "python print (func.is_argument)" "False" "Test func.is_argument"
-gdb_test "python print (func.is_function)" "True" "Test func.is_function"
+gdb_test "python print (func.is_variable)" "False" "test func.is_variable"
+gdb_test "python print (func.is_constant)" "False" "test func.is_constant"
+gdb_test "python print (func.is_argument)" "False" "test func.is_argument"
+gdb_test "python print (func.is_function)" "True" "test func.is_function"
 
 # Test attributes of func.
-gdb_test "python print (func.name)" "func" "Test func.name"
-gdb_test "python print (func.print_name)" "func" "Test func.print_name"
-gdb_test "python print (func.linkage_name)" "func" "Test func.linkage_name"
-gdb_test "python print (func.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "Test func.addr_class"
+gdb_test "python print (func.name)" "func" "test func.name"
+gdb_test "python print (func.print_name)" "func" "test func.print_name"
+gdb_test "python print (func.linkage_name)" "func" "test func.linkage_name"
+gdb_test "python print (func.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "test func.addr_class"
 
 gdb_breakpoint [gdb_get_line_number "Break at end."]
 gdb_continue_to_breakpoint "Break at end for variable a" ".*Break at end.*"
@@ -87,13 +87,13 @@ gdb_py_test_silent_cmd "python frame = gdb.selected_frame()" "Get Frame" 0
 
 # Test is_variable attribute.
 gdb_py_test_silent_cmd "python a = gdb.lookup_symbol(\'a\')" "Get variable a" 0
-gdb_test "python print (a\[0\].is_variable)" "True" "Test a.is_variable"
-gdb_test "python print (a\[0\].is_constant)" "False" "Test a.is_constant"
-gdb_test "python print (a\[0\].is_argument)" "False" "Test a.is_argument"
-gdb_test "python print (a\[0\].is_function)" "False" "Test a.is_function"
+gdb_test "python print (a\[0\].is_variable)" "True" "test a.is_variable"
+gdb_test "python print (a\[0\].is_constant)" "False" "test a.is_constant"
+gdb_test "python print (a\[0\].is_argument)" "False" "test a.is_argument"
+gdb_test "python print (a\[0\].is_function)" "False" "test a.is_function"
 
 # Test attributes of a.
-gdb_test "python print (a\[0\].addr_class == gdb.SYMBOL_LOC_COMPUTED)" "True" "Test a.addr_class"
+gdb_test "python print (a\[0\].addr_class == gdb.SYMBOL_LOC_COMPUTED)" "True" "test a.addr_class"
 
 gdb_test "python print (a\[0\].value())" \
     "symbol requires a frame to compute its value.*"\
@@ -105,16 +105,16 @@ gdb_test "python print (a\[0\].needs_frame)" "True" \
 
 # Test is_constant attribute
 gdb_py_test_silent_cmd "python t = gdb.lookup_symbol(\"one\")" "Get constant t" 0
-gdb_test "python print (t\[0\].is_variable)" "False" "Test t.is_variable"
-gdb_test "python print (t\[0\].is_constant)" "True" "Test t.is_constant"
-gdb_test "python print (t\[0\].is_argument)" "False" "Test t.is_argument"
-gdb_test "python print (t\[0\].is_function)" "False" "Test t.is_function"
+gdb_test "python print (t\[0\].is_variable)" "False" "test t.is_variable"
+gdb_test "python print (t\[0\].is_constant)" "True" "test t.is_constant"
+gdb_test "python print (t\[0\].is_argument)" "False" "test t.is_argument"
+gdb_test "python print (t\[0\].is_function)" "False" "test t.is_function"
 
 # Test attributes of t.
-gdb_test "python print (t\[0\].addr_class == gdb.SYMBOL_LOC_CONST)" "True" "Test t.addr_class"
+gdb_test "python print (t\[0\].addr_class == gdb.SYMBOL_LOC_CONST)" "True" "test t.addr_class"
 
 # Test type attribute.
-gdb_test "python print (t\[0\].type)" "enum tag" "Get type"
+gdb_test "python print (t\[0\].type)" "enum tag" "get type"
 
 # Test symtab attribute.
 if { [is_remote host] } {
@@ -122,7 +122,7 @@ if { [is_remote host] } {
 } else {
     set py_symbol_c [string_to_regexp ${srcdir}/${subdir}/${srcfile}]
 }
-gdb_test "python print (t\[0\].symtab)" "${py_symbol_c}" "Get symtab"
+gdb_test "python print (t\[0\].symtab)" "${py_symbol_c}" "get symtab"
 
 # C++ tests
 # Recompile binary.
@@ -157,10 +157,10 @@ gdb_test "python print (cplusfunc.is_argument)" \
 gdb_test "python print (cplusfunc.is_function)" \
     "True" "Test cplusfunc.is_function"
 
-gdb_test "python print (cplusfunc.name)" "SimpleClass::valueofi().*" "Test method.name"
-gdb_test "python print (cplusfunc.print_name)" "SimpleClass::valueofi().*" "Test method.print_name"
-gdb_test "python print (cplusfunc.linkage_name)" "SimpleClass::valueofi().*" "Test method.linkage_name"
-gdb_test "python print (cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "Test method.addr_class"
+gdb_test "python print (cplusfunc.name)" "SimpleClass::valueofi().*" "test method.name"
+gdb_test "python print (cplusfunc.print_name)" "SimpleClass::valueofi().*" "test method.print_name"
+gdb_test "python print (cplusfunc.linkage_name)" "SimpleClass::valueofi().*" "test method.linkage_name"
+gdb_test "python print (cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "test method.addr_class"
 
 # Test is_valid when the objfile is unloaded.  This must be the last
 # test as it unloads the object file in GDB.
@@ -174,8 +174,8 @@ if ![runto_main] then {
 gdb_breakpoint [gdb_get_line_number "Break at end."]
 gdb_continue_to_breakpoint "Break at end for symbol validity" ".*Break at end.*"
 gdb_py_test_silent_cmd "python a = gdb.lookup_symbol(\'a\')" "Get variable a" 0
-gdb_test "python print (a\[0\].is_valid())" "True" "Test symbol validity"
+gdb_test "python print (a\[0\].is_valid())" "True" "test symbol validity"
 delete_breakpoints
 gdb_unload
-gdb_test "python print (a\[0\].is_valid())" "False" "Test symbol non-validity"
+gdb_test "python print (a\[0\].is_valid())" "False" "test symbol non-validity"
 gdb_test_no_output "python a = None" "Test symbol destructor"
diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp
index 95c83c9..2acfe1c 100644
--- a/gdb/testsuite/gdb.python/py-symtab.exp
+++ b/gdb/testsuite/gdb.python/py-symtab.exp
@@ -58,29 +58,29 @@ if { [is_remote host] } {
     set full_py_symbol_c [string_to_regexp testsuite/${subdir}/${srcfile}]
 }
 
-gdb_test "python print (sal.symtab)" ".*${py_symbol_c}" "Test symtab"
-gdb_test "python print (sal.pc)" "${decimal}" "Test sal.pc"
-gdb_test "python print (sal.last == (new_pc - 1))" "True" "Test sal.last"
-gdb_test "python print (sal.line)" "$line_no" "Test sal.line"
-gdb_test "python print (sal.is_valid())" "True" "Test sal.is_valid"
+gdb_test "python print (sal.symtab)" ".*${py_symbol_c}" "test symtab"
+gdb_test "python print (sal.pc)" "${decimal}" "test sal.pc"
+gdb_test "python print (sal.last == (new_pc - 1))" "True" "test sal.last"
+gdb_test "python print (sal.line)" "$line_no" "test sal.line"
+gdb_test "python print (sal.is_valid())" "True" "test sal.is_valid"
 
 # Test symbol table.
-gdb_test "python print (symtab.filename)" ".*${py_symbol_c}" "Test symtab.filename"
-gdb_test "python print (symtab.objfile)" "<gdb.Objfile object at ${hex}>" "Test symtab.objfile"
-gdb_test "python print (symtab.fullname())" ".*${full_py_symbol_c}" "Test symtab.fullname"
-gdb_test "python print (symtab.is_valid())" "True" "Test symtab.is_valid()"
-gdb_test "python print (\"qq\" in global_symbols)" "True" "Test qq in global symbols"
-gdb_test "python print (\"func\" in global_symbols)" "True" "Test func in global symbols"
-gdb_test "python print (\"main\" in global_symbols)" "True" "Test main in global symbols"
-gdb_test "python print (\"int\" in static_symbols)" "True" "Test int in static symbols"
-gdb_test "python print (\"char\" in static_symbols)" "True" "Test char in static symbols"
-gdb_test "python print (\"simple_struct\" in static_symbols)" "True" "Test simple_struct in static symbols"
+gdb_test "python print (symtab.filename)" ".*${py_symbol_c}" "test symtab.filename"
+gdb_test "python print (symtab.objfile)" "<gdb.Objfile object at ${hex}>" "test symtab.objfile"
+gdb_test "python print (symtab.fullname())" ".*${full_py_symbol_c}" "test symtab.fullname"
+gdb_test "python print (symtab.is_valid())" "True" "test symtab.is_valid()"
+gdb_test "python print (\"qq\" in global_symbols)" "True" "test qq in global symbols"
+gdb_test "python print (\"func\" in global_symbols)" "True" "test func in global symbols"
+gdb_test "python print (\"main\" in global_symbols)" "True" "test main in global symbols"
+gdb_test "python print (\"int\" in static_symbols)" "True" "test int in static symbols"
+gdb_test "python print (\"char\" in static_symbols)" "True" "test char in static symbols"
+gdb_test "python print (\"simple_struct\" in static_symbols)" "True" "test simple_struct in static symbols"
 
 # Test is_valid when the objfile is unloaded.  This must be the last
 # test as it unloads the object file in GDB.
 gdb_unload
-gdb_test "python print (sal.is_valid())" "False" "Test sal.is_valid"
-gdb_test "python print (symtab.is_valid())" "False" "Test symtab.is_valid()"
+gdb_test "python print (sal.is_valid())" "False" "test sal.is_valid"
+gdb_test "python print (symtab.is_valid())" "False" "test symtab.is_valid()"
 
 gdb_test_no_output "python sal = None" "Test sal destructor"
 gdb_test_no_output "python symtab = None" "Test symtab destructor"
diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index 61c8c2f..782bd43 100644
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -70,9 +70,9 @@ proc test_fields {lang} {
       gdb_py_test_silent_cmd "print (c)" "print value (c)" 1
       gdb_py_test_silent_cmd "python c = gdb.history (0)" "get value (c) from history" 1
       gdb_py_test_silent_cmd "python fields = c.type.fields()" "get fields from c.type" 1
-      gdb_test "python print (len(fields))" "2" "Check number of fields (c)"
-      gdb_test "python print (fields\[0\].name)" "c" "Check class field c name"
-      gdb_test "python print (fields\[1\].name)" "d" "Check class field d name"
+      gdb_test "python print (len(fields))" "2" "check number of fields (c)"
+      gdb_test "python print (fields\[0\].name)" "c" "check class field c name"
+      gdb_test "python print (fields\[1\].name)" "d" "check class field d name"
 
       gdb_test "python print (c.type == gdb.parse_and_eval('d').type)" "False"
       gdb_test "python print (c.type == gdb.parse_and_eval('d').type.fields()\[0\].type)" \
@@ -98,15 +98,15 @@ proc test_fields {lang} {
     gdb_py_test_silent_cmd "print (st)" "print value (st)" 1
     gdb_py_test_silent_cmd "python st = gdb.history (0)" "get value (st) from history" 1
     gdb_py_test_silent_cmd "python fields = st.type.fields()" "get fields from st.type" 1
-    gdb_test "python print (len(fields))" "2" "Check number of fields (st)"
-    gdb_test "python print (fields\[0\].name)" "a" "Check structure field a name"
-    gdb_test "python print (fields\[1\].name)" "b" "Check structure field b name"
+    gdb_test "python print (len(fields))" "2" "check number of fields (st)"
+    gdb_test "python print (fields\[0\].name)" "a" "check structure field a name"
+    gdb_test "python print (fields\[1\].name)" "b" "check structure field b name"
 
     # Test that unamed fields have 'None' for name.
     gdb_py_test_silent_cmd "python ss = gdb.parse_and_eval('ss')" "init ss" 1
     gdb_py_test_silent_cmd "python ss_fields = ss.type.fields()" \
       "get fields from ss.type" 1
-    gdb_test "python print(len(ss_fields))" "2" "Check length of ss_fields"
+    gdb_test "python print(len(ss_fields))" "2" "check length of ss_fields"
     gdb_test "python print(ss_fields\[0\].name is None)" "True" \
       "Check ss_fields\[0\].name"
     gdb_test "python print(ss_fields\[1\].name is None)" "True" \
@@ -117,13 +117,13 @@ proc test_fields {lang} {
       "Check that dir includes name"
 
     # Test Python mapping behavior of gdb.Type for structs/classes
-    gdb_test "python print (len(st.type))" "2" "Check number of fields (st.type)"
-    gdb_test "python print (st.type\['a'\].name)" "a" "Check fields lookup by name"
+    gdb_test "python print (len(st.type))" "2" "check number of fields (st.type)"
+    gdb_test "python print (st.type\['a'\].name)" "a" "check fields lookup by name"
     gdb_test "python print (\[v.bitpos for v in st.type.itervalues()\])" {\[0L?, 32L?\]} "Check fields iteration over values"
     gdb_test "python print (\[(n, v.bitpos) for (n, v) in st.type.items()\])" {\[\('a', 0L?\), \('b', 32L?\)\]} "Check fields items list"
-    gdb_test "python print ('a' in st.type)" "True" "Check field name exists test"
-    gdb_test "python print ('nosuch' in st.type)" "False" "Check field name nonexists test"
-    gdb_test "python print (not not st.type)" "True" "Check conversion to bool"
+    gdb_test "python print ('a' in st.type)" "True" "check field name exists test"
+    gdb_test "python print ('nosuch' in st.type)" "False" "check field name nonexists test"
+    gdb_test "python print (not not st.type)" "True" "check conversion to bool"
 
     # Test rejection of mapping operations on scalar types
     gdb_test "python print (len (st.type\['a'\].type))" "TypeError: Type is not a structure, union, enum, or function type.*"
@@ -138,8 +138,8 @@ proc test_fields {lang} {
     gdb_py_test_silent_cmd "print (ar)" "print value (ar)" 1
     gdb_py_test_silent_cmd "python ar = gdb.history (0)" "get value (ar) from history" 1
     gdb_test "python fields = ar.type.fields()"
-    gdb_test "python print (len(fields))" "1" "Check the number of fields"
-    gdb_test "python print (fields\[0\].type)" "<range type>" "Check array field type"
+    gdb_test "python print (len(fields))" "1" "check the number of fields"
+    gdb_test "python print (fields\[0\].type)" "<range type>" "check array field type"
 
     # Test gdb.Type.array.
     gdb_test "python print (ar\[0\].cast(ar\[0\].type.array(1)))" \
@@ -178,14 +178,14 @@ proc test_enums {} {
     gdb_py_test_silent_cmd "print (e)" "print value (e)" 1
     gdb_py_test_silent_cmd "python (e) = gdb.history (0)" "get value (e) from history" 1
     gdb_py_test_silent_cmd "python fields = e.type.fields()" "extract type fields from e" 1
-    gdb_test "python print (len(fields))" "3" "Check the number of enum fields"
-    gdb_test "python print (fields\[0\].name)" "v1" "Check enum field\[0\] name"
-    gdb_test "python print (fields\[1\].name)" "v2" "Check enum field\[1\]name"
+    gdb_test "python print (len(fields))" "3" "check the number of enum fields"
+    gdb_test "python print (fields\[0\].name)" "v1" "check enum field\[0\] name"
+    gdb_test "python print (fields\[1\].name)" "v2" "check enum field\[1\]name"
 
     # Ditto but by mapping operations
-    gdb_test "python print (len(e.type))" "3" "Check the number of type fields"
-    gdb_test "python print (e.type\['v1'\].name)" "v1" "Check enum field lookup by name (v1)"
-    gdb_test "python print (e.type\['v3'\].name)" "v3" "Check enum field lookup by name (v3)"
+    gdb_test "python print (len(e.type))" "3" "check the number of type fields"
+    gdb_test "python print (e.type\['v1'\].name)" "v1" "check enum field lookup by name (v1)"
+    gdb_test "python print (e.type\['v3'\].name)" "v3" "check enum field lookup by name (v3)"
     gdb_test "python print (\[v.enumval for v in e.type.itervalues()\])" {\[0L?, 1L?, 2L?\]} "Check num fields iteration over values"
     gdb_test "python print (\[(n, v.enumval) for (n, v) in e.type.items()\])" {\[\('v1', 0L?\), \('v2', 1L?\), \('v3', 2L?\)\]} "Check enum fields items list"
   }
@@ -196,9 +196,9 @@ proc test_base_class {} {
     gdb_py_test_silent_cmd "print (d)" "print value (d)" 1
     gdb_py_test_silent_cmd "python d = gdb.history (0)" "get value (d) from history" 1
     gdb_py_test_silent_cmd "python fields = d.type.fields()" "extract type fields from d" 1
-    gdb_test "python print (len(fields))" "3" "Check the number of fields"
-    gdb_test "python print (fields\[0\].is_base_class)" "True" "Check base class (fields\[0\])"
-    gdb_test "python print (fields\[1\].is_base_class)" "False" "Check base class (fields\[1\])"
+    gdb_test "python print (len(fields))" "3" "check the number of fields"
+    gdb_test "python print (fields\[0\].is_base_class)" "True" "check base class (fields\[0\])"
+    gdb_test "python print (fields\[1\].is_base_class)" "False" "check base class (fields\[1\])"
   }
 }
 
@@ -208,9 +208,9 @@ proc test_range {} {
       # Test a valid range request.
       gdb_py_test_silent_cmd "print (ar)" "print value (ar)" 1
       gdb_py_test_silent_cmd "python ar = gdb.history (0)" "get value (ar) from history" 1
-      gdb_test "python print (len(ar.type.range()))" "2" "Check correct tuple length"
-      gdb_test "python print (ar.type.range()\[0\])" "0" "Check range low bound"
-      gdb_test "python print (ar.type.range()\[1\])" "1" "Check range high bound"
+      gdb_test "python print (len(ar.type.range()))" "2" "check correct tuple length"
+      gdb_test "python print (ar.type.range()\[0\])" "0" "check range low bound"
+      gdb_test "python print (ar.type.range()\[1\])" "1" "check range high bound"
     }
 
     with_test_prefix "on ranged type" {
@@ -218,15 +218,15 @@ proc test_range {} {
       gdb_py_test_silent_cmd "print (ar)" "print value (ar)" 1
       gdb_py_test_silent_cmd "python ar = gdb.history (0)" "get value (ar) from history" 1
       gdb_py_test_silent_cmd "python fields = ar.type.fields()" "get fields" 1
-      gdb_test "python print (fields\[0\].type.range()\[0\])" "0" "Check range low bound"
-      gdb_test "python print (fields\[0\].type.range()\[1\])" "1" "Check range high bound"
+      gdb_test "python print (fields\[0\].type.range()\[0\])" "0" "check range low bound"
+      gdb_test "python print (fields\[0\].type.range()\[1\])" "1" "check range high bound"
     }
 
     with_test_prefix "on unranged value" {
       # Test where a range does not exist.
       gdb_py_test_silent_cmd "print (st)" "print value (st)" 1
       gdb_py_test_silent_cmd "python st = gdb.history (0)" "get value (st) from history" 1
-      gdb_test "python print (st.type.range())" "RuntimeError: This type does not have a range.*" "Check range for non ranged type."
+      gdb_test "python print (st.type.range())" "RuntimeError: This type does not have a range.*" "check range for non ranged type."
     }
   }
 }
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index 5395f8c..fb489e1 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -74,7 +74,7 @@ proc test_value_creation {} {
   }
 
   # Test address attribute is None in a non-addressable value
-  gdb_test "python print ('result = %s' % i.address)" "= None" "Test address attribute in non-addressable value"
+  gdb_test "python print ('result = %s' % i.address)" "= None" "test address attribute in non-addressable value"
 }
 
 proc test_value_numeric_ops {} {
@@ -250,10 +250,10 @@ proc test_value_in_inferior {} {
   }
 
   # Smoke-test is_optimized_out attribute
-  gdb_test "python print ('result = %s' % arg0.is_optimized_out)" "= False" "Test is_optimized_out attribute"
+  gdb_test "python print ('result = %s' % arg0.is_optimized_out)" "= False" "test is_optimized_out attribute"
 
   # Test address attribute
-  gdb_test "python print ('result = %s' % arg0.address)" "= 0x\[\[:xdigit:\]\]+" "Test address attribute"
+  gdb_test "python print ('result = %s' % arg0.address)" "= 0x\[\[:xdigit:\]\]+" "test address attribute"
 
   # Test displaying a variable that is temporarily at a bad address.
   # But if we can examine what's at memory address 0, then we'll also be
@@ -295,16 +295,16 @@ proc test_value_in_inferior {} {
   gdb_test "print st" "\"divide et impera\""
   gdb_py_test_silent_cmd "python st = gdb.history (0)" "get value from history" 1
   gdb_test "python print (st.string ())"  "divide et impera"  "Test string with no length"
-  gdb_test "python print (st.string (length = -1))" "divide et impera" "Test string (length = -1) is all of the string"
+  gdb_test "python print (st.string (length = -1))" "divide et impera" "test string (length = -1) is all of the string"
   gdb_test "python print (st.string (length = 6))" "divide"
-  gdb_test "python print (\"---\"+st.string (length = 0)+\"---\")" "------" "Test string (length = 0) is empty"
-  gdb_test "python print (len(st.string (length = 0)))" "0" "Test length is 0"
+  gdb_test "python print (\"---\"+st.string (length = 0)+\"---\")" "------" "test string (length = 0) is empty"
+  gdb_test "python print (len(st.string (length = 0)))" "0" "test length is 0"
 
 
   # Fetch a string that has embedded nulls.
   gdb_test "print nullst" "\"divide\\\\000et\\\\000impera\".*"
   gdb_py_test_silent_cmd "python nullst = gdb.history (0)" "get value from history" 1
-  gdb_test "python print (nullst.string ())" "divide" "Test string to first null"
+  gdb_test "python print (nullst.string ())" "divide" "test string to first null"
   # Python cannot print strings that contain the null (\0) character.
   # For the purposes of this test, use repr()
   gdb_py_test_silent_cmd "python nullst = nullst.string (length = 9)" "get string beyond null" 1
@@ -325,18 +325,18 @@ proc test_lazy_strings {} {
   gdb_py_test_silent_cmd "python sptr = gdb.history (0)" "Get value from history" 1
 
   gdb_py_test_silent_cmd "python lstr = sptr.lazy_string()" "Aquire lazy string" 1
-  gdb_test "python print (lstr.type)" "const char \*." "Test lazy-string type name equality"
-  gdb_test "python print (sptr.type)" "const char \*." "Test string type name equality"
+  gdb_test "python print (lstr.type)" "const char \*." "test lazy-string type name equality"
+  gdb_test "python print (sptr.type)" "const char \*." "test string type name equality"
 
   # Prevent symbol on address 0x0 being printed.
   gdb_test_no_output "set print symbol off"
   gdb_test "print sn" "0x0"
 
   gdb_py_test_silent_cmd "python snptr = gdb.history (0)" "Get value from history" 1
-  gdb_test "python snstr = snptr.lazy_string(length=5)" ".*Cannot create a lazy string with address.*" "Test lazy string"
+  gdb_test "python snstr = snptr.lazy_string(length=5)" ".*Cannot create a lazy string with address.*" "test lazy string"
   gdb_py_test_silent_cmd "python snstr = snptr.lazy_string(length=0)" "Succesfully create a lazy string" 1
-  gdb_test "python print (snstr.length)" "0" "Test lazy string length"
-  gdb_test "python print (snstr.address)" "0" "Test lazy string address"
+  gdb_test "python print (snstr.length)" "0" "test lazy string length"
+  gdb_test "python print (snstr.address)" "0" "test lazy string address"
 }
 
 
@@ -389,7 +389,7 @@ proc test_value_after_death {} {
   gdb_test "kill" "" "kill the inferior" \
     "Kill the program being debugged. .y or n. $" \
     "y"
-  gdb_test "file" "" "Discard the symbols" \
+  gdb_test "file" "" "discard the symbols" \
     "Discard symbol table from.*y or n. $" \
     "y"
 
@@ -428,7 +428,7 @@ proc test_subscript_regression {exefile lang} {
 	 "Obtain address" 1
      gdb_py_test_silent_cmd "python rptr = gdb.history(0)" \
 	 "Obtains value from GDB" 1
-     gdb_test "python print (rptr\[0\])" "2" "Check pointer passed as reference"
+     gdb_test "python print (rptr\[0\])" "2" "check pointer passed as reference"
 
      # Just the most basic test of dynamic_cast -- it is checked in
      # the C++ tests.
@@ -454,19 +454,19 @@ proc test_subscript_regression {exefile lang} {
      "Create a value for subscript test" 1
 
  # Try to access an int with a subscript.  This should fail.
- gdb_test "python print (intv)" "1" "Baseline print of an int Python value"
+ gdb_test "python print (intv)" "1" "baseline print of an int Python value"
  gdb_test "python print (intv\[0\])" "gdb.error: Cannot subscript requested type.*" \
      "Attempt to access an integer with a subscript"
 
  # Try to access a string with a subscript.  This should pass.
- gdb_test "python print (stringv)" "foo." "Baseline print of a string Python value"
- gdb_test "python print (stringv\[0\])" "f." "Attempt to access a string with a subscript"
+ gdb_test "python print (stringv)" "foo." "baseline print of a string Python value"
+ gdb_test "python print (stringv\[0\])" "f." "attempt to access a string with a subscript"
 
  # Try to access an int array via a pointer with a subscript.  This should pass.
  gdb_py_test_silent_cmd "print p" "Build pointer to array" 1
  gdb_py_test_silent_cmd "python pointer = gdb.history(0)" "" 1
- gdb_test "python print (pointer\[0\])" "1" "Access array via pointer with int subscript"
- gdb_test "python print (pointer\[intv\])" "2" "Access array via pointer with value subscript"
+ gdb_test "python print (pointer\[0\])" "1" "access array via pointer with int subscript"
+ gdb_test "python print (pointer\[intv\])" "2" "access array via pointer with value subscript"
 
  # Try to access a single dimension array with a subscript to the
  # result.  This should fail.
@@ -477,7 +477,7 @@ proc test_subscript_regression {exefile lang} {
  # dimensions.  This should pass.
  gdb_py_test_silent_cmd "print {\"fu \",\"foo\",\"bar\"}" "Build array" 1
  gdb_py_test_silent_cmd "python marray = gdb.history(0)" "" 1
- gdb_test "python print (marray\[1\]\[2\])" "o." "Test multiple subscript"
+ gdb_test "python print (marray\[1\]\[2\])" "o." "test multiple subscript"
 }
 
 # A few tests of gdb.parse_and_eval.
@@ -500,10 +500,10 @@ proc test_value_hash {} {
     "three = gdb.Value(3)" "" \
     "vdict = {one:\"one str\",two:\"two str\",three:\"three str\"}" "" \
     "end"
-    gdb_test "python print (vdict\[one\])" "one str" "Test dictionary hash"
-    gdb_test "python print (vdict\[two\])" "two str" "Test dictionary hash"
-    gdb_test "python print (vdict\[three\])" "three str" "Test dictionary hash"
-    gdb_test "python print (one.__hash__() == hash(one))" "True" "Test inbuilt hash"
+    gdb_test "python print (vdict\[one\])" "one str" "test dictionary hash"
+    gdb_test "python print (vdict\[two\])" "two str" "test dictionary hash"
+    gdb_test "python print (vdict\[three\])" "three str" "test dictionary hash"
+    gdb_test "python print (one.__hash__() == hash(one))" "True" "test inbuilt hash"
 }
 
 # Build C version of executable.  C++ is built later.
diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
index abe609b..5490c03 100644
--- a/gdb/testsuite/gdb.python/py-xmethods.exp
+++ b/gdb/testsuite/gdb.python/py-xmethods.exp
@@ -40,44 +40,44 @@ gdb_breakpoint [gdb_get_line_number "Break here."]
 gdb_continue_to_breakpoint "Break here" ".*Break here.*"
 
 # Tests before loading the debug methods.
-gdb_test "p a1 + a2" ".* = 15" "Before: a1 + a2"
-gdb_test "p a_plus_a" ".* = 1" "Before: a_plus_a 1"
+gdb_test "p a1 + a2" ".* = 15" "before: a1 + a2"
+gdb_test "p a_plus_a" ".* = 1" "before: a_plus_a 1"
 
-gdb_test "p a2 - a1" ".* = 5" "Before: a2 - a1"
-gdb_test "p a_minus_a" ".* = 1" "Before: a_minus_a 1"
+gdb_test "p a2 - a1" ".* = 5" "before: a2 - a1"
+gdb_test "p a_minus_a" ".* = 1" "before: a_minus_a 1"
 
-gdb_test "p b1 - a1" ".* = 25" "Before: b1 - a1"
-gdb_test "p a_minus_a" ".* = 2" "Before: a_minus_a 2"
+gdb_test "p b1 - a1" ".* = 25" "before: b1 - a1"
+gdb_test "p a_minus_a" ".* = 2" "before: a_minus_a 2"
 
-gdb_test "p a1.geta()" ".* = 5" "Before: a1.geta()"
-gdb_test "p a_geta" ".* = 1" "Before: a_geta 1"
+gdb_test "p a1.geta()" ".* = 5" "before: a1.geta()"
+gdb_test "p a_geta" ".* = 1" "before: a_geta 1"
 
-gdb_test "p ++a1" "No symbol.*" "Before: ++a1"
+gdb_test "p ++a1" "No symbol.*" "before: ++a1"
 gdb_test "p a1.getarrayind(5)" "Couldn't find method.*" \
   "Before: a1.getarrayind(5)"
 
-gdb_test "p a_ptr->geta()" ".* = 60" "Before: a_ptr->geta()"
-gdb_test "p b_geta" ".* = 1" "Before: b_geta 1"
+gdb_test "p a_ptr->geta()" ".* = 60" "before: a_ptr->geta()"
+gdb_test "p b_geta" ".* = 1" "before: b_geta 1"
 
-gdb_test "p e.geta()" ".* = 100" "Before: e.geta()"
-gdb_test "p a_geta" ".* = 2" "Before: a_geta 2"
+gdb_test "p e.geta()" ".* = 100" "before: e.geta()"
+gdb_test "p a_geta" ".* = 2" "before: a_geta 2"
 
 # Since g.size_diff operates of sizes of int and float, do not check for
 # actual result value as it could be different on different platforms.
-gdb_test "p g.size_diff<float>()" ".*" "Before: call g.size_diff<float>()"
-gdb_test "p g_size_diff" ".* = 2" "Before: g_size_diff 2"
+gdb_test "p g.size_diff<float>()" ".*" "before: call g.size_diff<float>()"
+gdb_test "p g_size_diff" ".* = 2" "before: g_size_diff 2"
 
 gdb_test "p g.size_diff<unsigned long>()" "Couldn't find method.*" \
   "Before: g.size_diff<unsigned long>()"
 
-gdb_test "p g.size_mul<2>()" ".*" "Before: g.size_mul<2>()"
-gdb_test "p g_size_mul" ".* = 2" "Before: g_size_mul 2"
+gdb_test "p g.size_mul<2>()" ".*" "before: g.size_mul<2>()"
+gdb_test "p g_size_mul" ".* = 2" "before: g_size_mul 2"
 
 gdb_test "p g.size_mul<5>()" "Couldn't find method.*" \
   "Before: g.size_mul<5>()"
 
-gdb_test "p g.mul<double>(2.0)" ".* = 10" "Before: g.mul<double>(2.0)"
-gdb_test "p g_mul" ".* = 2" "Before: g_mul 2"
+gdb_test "p g.mul<double>(2.0)" ".* = 10" "before: g.mul<double>(2.0)"
+gdb_test "p g_mul" ".* = 2" "before: g_mul 2"
 
 gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
   "Before: g.mul<char>('a')"
@@ -86,29 +86,29 @@ gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
 gdb_test_no_output "source ${xmethods_script}" "load the script file"
 
 # Tests after loading debug methods.
-gdb_test "p a1 + a2" "From Python <A_plus_A>.*15" "After: a1 + a2"
+gdb_test "p a1 + a2" "From Python <A_plus_A>.*15" "after: a1 + a2"
 
-gdb_test "p a2 - a1" ".* = 5" "After: a2 - a1"
-gdb_test "p a_minus_a" ".* = 3" "After: a_minus_a 3"
+gdb_test "p a2 - a1" ".* = 5" "after: a2 - a1"
+gdb_test "p a_minus_a" ".* = 3" "after: a_minus_a 3"
 
-gdb_test "p b1 + a1" "From Python <A_plus_A>.*35" "After: b1 + a1"
+gdb_test "p b1 + a1" "From Python <A_plus_A>.*35" "after: b1 + a1"
 
-gdb_test "p b1 - a1" ".* = 25" "After: b1 - a1"
-gdb_test "p a_minus_a" ".* = 4" "After: a_minus_a 4"
+gdb_test "p b1 - a1" ".* = 25" "after: b1 - a1"
+gdb_test "p a_minus_a" ".* = 4" "after: a_minus_a 4"
 
-gdb_test "p a1.geta()" "From Python <A_geta>.*5" "After: a1.geta()"
-gdb_test "p ++a1" "From Python <plus_plus_A>.*6" "After: ++a1"
+gdb_test "p a1.geta()" "From Python <A_geta>.*5" "after: a1.geta()"
+gdb_test "p ++a1" "From Python <plus_plus_A>.*6" "after: ++a1"
 gdb_test "p a1.getarrayind(5)" "From Python <A_getarrayind>.*5" \
   "After: a1.getarrayind(5)"
-gdb_test "P a1\[6\]" ".*int &.*6" "After a1\[\]"
-gdb_test "P b1\[7\]" ".*const int &.*7" "After b1\[\]"
+gdb_test "P a1\[6\]" ".*int &.*6" "after a1\[\]"
+gdb_test "P b1\[7\]" ".*const int &.*7" "after b1\[\]"
 # Note the following test.  Xmethods on dynamc types are not looked up
 # currently.  Hence, even though a_ptr points to a B object, the xmethod
 # defined for A objects is invoked.
-gdb_test "p a_ptr->geta()" "From Python <A_geta>.*30" "After: a_ptr->geta()"
-gdb_test "p e.geta()" "From Python <A_geta>.*100" "After: e.geta()"
-gdb_test "p e_ptr->geta()" "From Python <A_geta>.*100" "After: e_ptr->geta()"
-gdb_test "p e_ref.geta()" "From Python <A_geta>.*100" "After: e_ref.geta()"
+gdb_test "p a_ptr->geta()" "From Python <A_geta>.*30" "after: a_ptr->geta()"
+gdb_test "p e.geta()" "From Python <A_geta>.*100" "after: e.geta()"
+gdb_test "p e_ptr->geta()" "From Python <A_geta>.*100" "after: e_ptr->geta()"
+gdb_test "p e_ref.geta()" "From Python <A_geta>.*100" "after: e_ref.geta()"
 gdb_test "p e.method(10)" "From Python <E_method_int>.* = void" \
   "After: e.method(10)"
 gdb_test "p e.method('a')" "From Python <E_method_char>.* = void" \
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 2ff1f14..14cfffe 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -131,7 +131,7 @@ gdb_py_test_multiple "post event insertion" \
   "end" ""
 
 gdb_test "python print (someVal)" "1" "test post event execution"
-gdb_test "python gdb.post_event(str(1))" "RuntimeError: Posted event is not callable.*" "Test non callable class"
+gdb_test "python gdb.post_event(str(1))" "RuntimeError: Posted event is not callable.*" "test non callable class"
 
 # Test (no) pagination of the executed command.
 gdb_test "show height" {Number of lines gdb thinks are in a page is unlimited\.}
@@ -177,7 +177,7 @@ gdb_test "python print (a)" ".*aliases -- Aliases of other commands.*" "verify h
 # Test PR 12212, using InfThread.selected_thread() when no inferior is
 # loaded.
 gdb_py_test_silent_cmd "python nothread = gdb.selected_thread()" "Attempt to aquire thread with no inferior" 1
-gdb_test "python print (nothread == None)" "True" "Ensure that no threads are returned"
+gdb_test "python print (nothread == None)" "True" "ensure that no threads are returned"
 
 gdb_py_test_multiple "register atexit function" \
     "python" "" \
@@ -215,56 +215,56 @@ gdb_test "python gdb.decode_line(\"main.c:43\")" \
     "gdb.error: No source file named main.c.*" "test decode_line no source named main"
 
 gdb_py_test_silent_cmd "python symtab = gdb.decode_line()" "test decode_line current location" 1
-gdb_test "python print (len(symtab))" "2" "Test decode_line current location"
-gdb_test "python print (symtab\[0\])" "None" "Test decode_line expression parse"
-gdb_test "python print (len(symtab\[1\]))" "1" "Test decode_line current location"
+gdb_test "python print (len(symtab))" "2" "test decode_line current location"
+gdb_test "python print (symtab\[0\])" "None" "test decode_line expression parse"
+gdb_test "python print (len(symtab\[1\]))" "1" "test decode_line current location"
 
 if { [is_remote host] } {
     set python_c [string_to_regexp "python.c"]
 } else {
     set python_c [string_to_regexp "gdb.python/python.c"]
 }
-gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_c}" "Test decode_line current location filename"
-gdb_test "python print (symtab\[1\]\[0\].line)" "$lineno" "Test decode_line current location line number"
+gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_c}" "test decode_line current location filename"
+gdb_test "python print (symtab\[1\]\[0\].line)" "$lineno" "test decode_line current location line number"
 
 gdb_py_test_silent_cmd "python symtab = gdb.decode_line(\"python.c:26 if foo\")" "test decode_line python.c:26" 1
-gdb_test "python print (len(symtab))" "2" "Test decode_line python.c:26 length"
-gdb_test "python print (symtab\[0\])" "if foo" "Test decode_line expression parse"
-gdb_test "python print (len(symtab\[1\]))" "1" "Test decode_line python.c:26 length"
-gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_c}" "Test decode_line python.c:26 filename"
-gdb_test "python print (symtab\[1\]\[0\].line)" "26" "Test decode_line python.c:26 line number"
+gdb_test "python print (len(symtab))" "2" "test decode_line python.c:26 length"
+gdb_test "python print (symtab\[0\])" "if foo" "test decode_line expression parse"
+gdb_test "python print (len(symtab\[1\]))" "1" "test decode_line python.c:26 length"
+gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_c}" "test decode_line python.c:26 filename"
+gdb_test "python print (symtab\[1\]\[0\].line)" "26" "test decode_line python.c:26 line number"
 
 gdb_test "python gdb.decode_line(\"randomfunc\")" \
     "gdb.error: Function \"randomfunc\" not defined.*" "test decode_line randomfunc"
 gdb_py_test_silent_cmd "python symtab = gdb.decode_line(\"func1\")" "test decode_line func1()" 1
-gdb_test "python print (len(symtab))" "2" "Test decode_line func1 length"
-gdb_test "python print (len(symtab\[1\]))" "1" "Test decode_line func1 length"
+gdb_test "python print (len(symtab))" "2" "test decode_line func1 length"
+gdb_test "python print (len(symtab\[1\]))" "1" "test decode_line func1 length"
 
 if { [is_remote host] } {
     set python_1_c [string_to_regexp "python-1.c"]
 } else {
     set python_1_c [string_to_regexp "gdb.python/python-1.c"]
 }
-gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_1_c}" "Test decode_line func1 filename"
-gdb_test "python print (symtab\[1\]\[0\].line)" "19" "Test decode_line func1 line number"
+gdb_test "python print (symtab\[1\]\[0\].symtab)" ".*${python_1_c}" "test decode_line func1 filename"
+gdb_test "python print (symtab\[1\]\[0\].line)" "19" "test decode_line func1 line number"
 gdb_py_test_silent_cmd {python symtab = gdb.decode_line ("func1,func2")} \
     "test decode_line func1,func2" 1
 gdb_test {python print (symtab[0])} ",func2" "stop at comma in linespec"
 
 gdb_py_test_silent_cmd "python symtab = gdb.decode_line(\"*0\")" "Test decode_line *0" 1
-gdb_test "python print (len(symtab))" "2" "Test decode_line *0 result length"
-gdb_test "python print (symtab\[0\])" "None" "Test decode_line *0 unparsed"
-gdb_test "python print (len(symtab\[1\]))" "1" "Test decode_line *0 locations length"
-gdb_test "python print (symtab\[1\]\[0\].symtab)" "None" "Test decode_line *0 filename"
-gdb_test "python print (symtab\[1\]\[0\].pc)" "0" "Test decode_line *0 pc"
+gdb_test "python print (len(symtab))" "2" "test decode_line *0 result length"
+gdb_test "python print (symtab\[0\])" "None" "test decode_line *0 unparsed"
+gdb_test "python print (len(symtab\[1\]))" "1" "test decode_line *0 locations length"
+gdb_test "python print (symtab\[1\]\[0\].symtab)" "None" "test decode_line *0 filename"
+gdb_test "python print (symtab\[1\]\[0\].pc)" "0" "test decode_line *0 pc"
 
 # gdb.write
-gdb_test "python print (sys.stderr)" ".*gdb.GdbOutputErrorFile (instance|object) at.*" "Test stderr location"
-gdb_test "python print (sys.stdout)" ".*gdb.GdbOutputFile (instance|object) at.*" "Test stdout location"
-gdb_test "python gdb.write(\"Foo\\n\")" "Foo" "Test default write"
-gdb_test "python gdb.write(\"Error stream\\n\", stream=gdb.STDERR)" "Error stream" "Test stderr write"
-gdb_test "python gdb.write(\"Normal stream\\n\", stream=gdb.STDOUT)" "Normal stream" "Test stdout write"
-gdb_test "python gdb.write(\"Log stream\\n\", stream=gdb.STDLOG)" "Log stream" "Test stdlog write"
+gdb_test "python print (sys.stderr)" ".*gdb.GdbOutputErrorFile (instance|object) at.*" "test stderr location"
+gdb_test "python print (sys.stdout)" ".*gdb.GdbOutputFile (instance|object) at.*" "test stdout location"
+gdb_test "python gdb.write(\"Foo\\n\")" "Foo" "test default write"
+gdb_test "python gdb.write(\"Error stream\\n\", stream=gdb.STDERR)" "Error stream" "test stderr write"
+gdb_test "python gdb.write(\"Normal stream\\n\", stream=gdb.STDOUT)" "Normal stream" "test stdout write"
+gdb_test "python gdb.write(\"Log stream\\n\", stream=gdb.STDLOG)" "Log stream" "test stdlog write"
 
 # Turn on full stack printing for subsequent tests.
 gdb_py_test_silent_cmd "set python print-stack full" \
@@ -454,9 +454,9 @@ if ![runto_main] then {
 runto [gdb_get_line_number "Break at func2 call site."]
 
 gdb_py_test_silent_cmd "python line = gdb.selected_frame().find_sal().line" "Get line number of func2 call site" 1
-gdb_test "python print (gdb.find_pc_line(gdb.selected_frame().pc()).line == line)" "True" "Test find_pc_line at func2 call site"
+gdb_test "python print (gdb.find_pc_line(gdb.selected_frame().pc()).line == line)" "True" "test find_pc_line at func2 call site"
 
 gdb_py_test_silent_cmd "step" "Step into func2" 1
 gdb_py_test_silent_cmd "up" "Step out of func2" 1
 
-gdb_test "python print (gdb.find_pc_line(gdb.selected_frame().pc()).line > line)" "True" "Test find_pc_line with resume address"
+gdb_test "python print (gdb.find_pc_line(gdb.selected_frame().pc()).line > line)" "True" "test find_pc_line with resume address"
diff --git a/gdb/testsuite/gdb.reverse/break-precsave.exp b/gdb/testsuite/gdb.reverse/break-precsave.exp
index e92ec68..7140aa7 100644
--- a/gdb/testsuite/gdb.reverse/break-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/break-precsave.exp
@@ -54,7 +54,7 @@ proc precsave_tests {} {
 	"Saved core file $precsave with execution log\."  \
 	"save process recfile"
 
-    gdb_test "kill" "" "Kill process, prepare to debug log file" \
+    gdb_test "kill" "" "kill process, prepare to debug log file" \
 	"Kill the program being debugged\\? \\(y or n\\) " "y"
 
     gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
index 1d7d586..be34a43 100644
--- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
@@ -46,7 +46,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp
index 96a8d51..fcaf89c 100644
--- a/gdb/testsuite/gdb.reverse/finish-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp
@@ -47,7 +47,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/i386-precsave.exp b/gdb/testsuite/gdb.reverse/i386-precsave.exp
index 7c6c0cb..8d07f95 100644
--- a/gdb/testsuite/gdb.reverse/i386-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/i386-precsave.exp
@@ -64,7 +64,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
index e26b2f5..95e50f3 100644
--- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
@@ -72,7 +72,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
index c933003..8f72f46 100644
--- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
@@ -274,7 +274,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 3d1f4cb..cfdcadf 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -97,7 +97,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/step-precsave.exp b/gdb/testsuite/gdb.reverse/step-precsave.exp
index 92574b6..62c9489 100644
--- a/gdb/testsuite/gdb.reverse/step-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/step-precsave.exp
@@ -57,7 +57,7 @@ with_timeout_factor 10 {
 	"save process recfile"
 }
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp
index f06b662..5091200 100644
--- a/gdb/testsuite/gdb.reverse/until-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/until-precsave.exp
@@ -61,7 +61,7 @@ with_timeout_factor 10 {
 	"save process recfile"
 }
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp
index 27c6417..3c2f06e 100644
--- a/gdb/testsuite/gdb.reverse/watch-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp
@@ -47,7 +47,7 @@ gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
-gdb_test "kill" "" "Kill process, prepare to debug log file" \
+gdb_test "kill" "" "kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
 gdb_test "record restore $precsave" \
diff --git a/gdb/testsuite/gdb.stabs/gdb11479.exp b/gdb/testsuite/gdb.stabs/gdb11479.exp
index ab67280..f395f10 100644
--- a/gdb/testsuite/gdb.stabs/gdb11479.exp
+++ b/gdb/testsuite/gdb.stabs/gdb11479.exp
@@ -25,8 +25,8 @@ proc do_test {version} {
         fail "can't run to main $version"
         return -1
     }
-    gdb_test "rb test" "" "Set breakpoints $version"
-    gdb_test "continue" "Breakpoint .* test2 .*" "Stop at first breakpoint $version"
+    gdb_test "rb test" "" "set breakpoints $version"
+    gdb_test "continue" "Breakpoint .* test2 .*" "stop at first breakpoint $version"
     # Check that the struct is read in correctly
     gdb_test "print *t" ".*\{x = 5, y = 25, b = 2.5\}.*" \
 	"Inspect t in test2 $version"
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index 699b26b..b8c72da 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -142,11 +142,11 @@ proc do_tests {} {
 	gdb_test "p sizeof (const70)" " = 2" "'e' constant with embedded type"
 
 	gdb_test "p constchar" " = 97 'a'" "char constant"
-        gdb_test "p constString1" " = \"Single quote String1\"" "String constant 1"
-        gdb_test "p constString2" " = \"Double quote String2\"" "String constant 2"
+        gdb_test "p constString1" " = \"Single quote String1\"" "string constant 1"
+        gdb_test "p constString2" " = \"Double quote String2\"" "string constant 2"
 
-        gdb_test "p constString3" " = \"String3 with embedded quote ' in the middle\"" "String constant 3"
-        gdb_test "p constString4" { = "String4 with embedded quote \\" in the middle"} "String constant 4"
+        gdb_test "p constString3" " = \"String3 with embedded quote ' in the middle\"" "string constant 3"
+        gdb_test "p constString4" { = "String4 with embedded quote \\" in the middle"} "string constant 4"
 	gdb_test "p bad_neg0" " = \{field0 = 42, field2 =.*field3 = 45\}" "p bad_neg0"
 
 	gdb_test "ptype inttype" "type = (unsigned int|inttype)" "ptype on inttype"
diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork.exp b/gdb/testsuite/gdb.threads/watchpoint-fork.exp
index 1682982..a21cf76 100644
--- a/gdb/testsuite/gdb.threads/watchpoint-fork.exp
+++ b/gdb/testsuite/gdb.threads/watchpoint-fork.exp
@@ -51,7 +51,7 @@ proc test {type symbol} {
 		return
 	    }
 
-	    gdb_test "watch var" "atchpoint \[0-9\]+: var" "Set the watchpoint"
+	    gdb_test "watch var" "atchpoint \[0-9\]+: var" "set the watchpoint"
 
 	    # It is never hit but it should not be left over in the fork()ed-off child.
 	    if [skip_hw_breakpoint_tests] {
@@ -102,7 +102,7 @@ proc test {type symbol} {
 		return
 	    }
 
-	    gdb_test "watch var" "atchpoint \[0-9\]+: var" "Set the watchpoint"
+	    gdb_test "watch var" "atchpoint \[0-9\]+: var" "set the watchpoint"
 
 	    # It should not be left over in the fork()ed-off child.
 	    gdb_test "$hbreak marker" {reakpoint [0-9]+.*}
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 0/8] Fix gdb's testsuite test names
  2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
                   ` (7 preceding siblings ...)
  2016-11-25 20:55 ` [PATCH v2 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages Luis Machado
@ 2016-11-28 18:57 ` Sergio Durigan Junior
  2016-11-28 19:00   ` Luis Machado
  8 siblings, 1 reply; 33+ messages in thread
From: Sergio Durigan Junior @ 2016-11-28 18:57 UTC (permalink / raw)
  To: Luis Machado; +Cc: gdb-patches

On Friday, November 25 2016, Luis Machado wrote:

> Changes in v2:
>
> * Patch 1/8 in v1 is now patch 8/8 in v2, due to organization issues. Patch 8/8
>   does a few additional things in v2. Patches 2~8 in v1 are now 1~7 in v2.
>
> Patch 1/8 and Patch 2/8
> =========
>
> * Fixed spurious whitespaces.
>
> Patch 8/8
> =========
>
> * Updated compilation failure message and replaced existing ones to keep them
>   standard.
>
> All other patches have no meaningful changes.
>
> v1 can be found here: https://sourceware.org/ml/gdb-patches/2016-11/msg00813.html
>
> ---
>
> I was going to go with a single patch for this, but i kept hitting other
> cases where i needed to adjust the regular expressions and substitution rules.
>
> I then decided to have a series with each individual piece that should make it
> easier to review as well. The changes are all pretty mechanical, but it would
> be nice to have another pair of eyes looking at these to make sure nothing
> incorrect got through.
>
> The first patch handles the "testfile as test name" problem. The rest of the
> series handles test names starting with uppercase.

Thanks for the patch, Luis!  It would be awesome to also have unique
names for each testcase, but I realize this is a much more difficult
task :-).

Just a heads up for everyone: when this patch series is pushed, we are
probably going to see a lot of known XFAILs return on the BuildBot
reports.  This is due to the way we identify the XFAILs, using their
whole name in a case-sensitive manner.

The new XFAILs will be detected during the weekend, when the racy tests
run.

Thanks,

-- 
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF  31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
http://sergiodj.net/

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 0/8] Fix gdb's testsuite test names
  2016-11-28 18:57 ` [PATCH v2 0/8] Fix gdb's testsuite test names Sergio Durigan Junior
@ 2016-11-28 19:00   ` Luis Machado
  0 siblings, 0 replies; 33+ messages in thread
From: Luis Machado @ 2016-11-28 19:00 UTC (permalink / raw)
  To: Sergio Durigan Junior; +Cc: gdb-patches

On 11/28/2016 12:57 PM, Sergio Durigan Junior wrote:
> On Friday, November 25 2016, Luis Machado wrote:
>
>> Changes in v2:
>>
>> * Patch 1/8 in v1 is now patch 8/8 in v2, due to organization issues. Patch 8/8
>>   does a few additional things in v2. Patches 2~8 in v1 are now 1~7 in v2.
>>
>> Patch 1/8 and Patch 2/8
>> =========
>>
>> * Fixed spurious whitespaces.
>>
>> Patch 8/8
>> =========
>>
>> * Updated compilation failure message and replaced existing ones to keep them
>>   standard.
>>
>> All other patches have no meaningful changes.
>>
>> v1 can be found here: https://sourceware.org/ml/gdb-patches/2016-11/msg00813.html
>>
>> ---
>>
>> I was going to go with a single patch for this, but i kept hitting other
>> cases where i needed to adjust the regular expressions and substitution rules.
>>
>> I then decided to have a series with each individual piece that should make it
>> easier to review as well. The changes are all pretty mechanical, but it would
>> be nice to have another pair of eyes looking at these to make sure nothing
>> incorrect got through.
>>
>> The first patch handles the "testfile as test name" problem. The rest of the
>> series handles test names starting with uppercase.
>
> Thanks for the patch, Luis!  It would be awesome to also have unique
> names for each testcase, but I realize this is a much more difficult
> task :-).

I have a few ideas and i may submit a RFC to discuss improvements on 
this soon.

>
> Just a heads up for everyone: when this patch series is pushed, we are
> probably going to see a lot of known XFAILs return on the BuildBot
> reports.  This is due to the way we identify the XFAILs, using their
> whole name in a case-sensitive manner.
>
> The new XFAILs will be detected during the weekend, when the racy tests
> run.
>
> Thanks,
>

Nothing like breaking a lot of tests for a change! :-P

Thanks for the heads up.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple
  2016-11-28 16:06     ` Luis Machado
@ 2016-11-29 14:49       ` Yao Qi
  2016-11-29 15:07         ` Luis Machado
  0 siblings, 1 reply; 33+ messages in thread
From: Yao Qi @ 2016-11-29 14:49 UTC (permalink / raw)
  To: Luis Machado; +Cc: gdb-patches

On Mon, Nov 28, 2016 at 10:06:28AM -0600, Luis Machado wrote:
> On 11/27/2016 11:09 AM, Yao Qi wrote:
> >On Fri, Nov 25, 2016 at 02:54:00PM -0600, Luis Machado wrote:
> >>This fixes offender testcases that have test names starting with uppercase
> >>when using gdb_test_multiple in a single-line construct.
> >>
> >>gdb/testsuite/ChangeLog
> >>2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
> >>
> >>	Fix test names starting with uppercase throughout the files.
> >>
> >>	* gdb/testsuite/gdb.arch/i386-bp_permanent.exp
> >>	* gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
> >>	* gdb/testsuite/gdb.base/disasm-end-cu.exp
> >>	* gdb/testsuite/gdb.base/macscp.exp
> >>	* gdb/testsuite/gdb.base/pending.exp
> >>	* gdb/testsuite/gdb.base/watch_thread_num.exp
> >>	* gdb/testsuite/gdb.cp/exception.exp
> >>	* gdb/testsuite/gdb.cp/gdb2495.exp
> >>	* gdb/testsuite/gdb.cp/local.exp
> >>	* gdb/testsuite/gdb.python/py-evsignal.exp
> >>	* gdb/testsuite/gdb.python/python.exp
> >>	* gdb/testsuite/gdb.trace/tracecmd.exp
> >
> >Drop "gdb/testsuite/".  Patch is good to me, but I think we need to
> >enforce a rule in "proc gdb_test_multiple" that test message should
> >start with a lower case letter, emit an ERROR if it starts with
> >uppercase.
> >
> 
> Do you mean just for gdb_test_multiple?

Yes,

> 
> It can be tricky, since one is still free to start the sentences
> with something like "ARM ..." or some other technology name. So
> unfortunately we can't be too strict. I wish we could.

Do we have some many technology names?  We have a white list of these
technology names which can be capitalized in test message.

-- 
Yao (齐尧)

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple
  2016-11-29 14:49       ` Yao Qi
@ 2016-11-29 15:07         ` Luis Machado
  2016-11-29 20:55           ` Yao Qi
  0 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-29 15:07 UTC (permalink / raw)
  To: Yao Qi; +Cc: gdb-patches

On 11/29/2016 08:48 AM, Yao Qi wrote:
> On Mon, Nov 28, 2016 at 10:06:28AM -0600, Luis Machado wrote:
>> On 11/27/2016 11:09 AM, Yao Qi wrote:
>>> On Fri, Nov 25, 2016 at 02:54:00PM -0600, Luis Machado wrote:
>>>> This fixes offender testcases that have test names starting with uppercase
>>>> when using gdb_test_multiple in a single-line construct.
>>>>
>>>> gdb/testsuite/ChangeLog
>>>> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
>>>>
>>>> 	Fix test names starting with uppercase throughout the files.
>>>>
>>>> 	* gdb/testsuite/gdb.arch/i386-bp_permanent.exp
>>>> 	* gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
>>>> 	* gdb/testsuite/gdb.base/disasm-end-cu.exp
>>>> 	* gdb/testsuite/gdb.base/macscp.exp
>>>> 	* gdb/testsuite/gdb.base/pending.exp
>>>> 	* gdb/testsuite/gdb.base/watch_thread_num.exp
>>>> 	* gdb/testsuite/gdb.cp/exception.exp
>>>> 	* gdb/testsuite/gdb.cp/gdb2495.exp
>>>> 	* gdb/testsuite/gdb.cp/local.exp
>>>> 	* gdb/testsuite/gdb.python/py-evsignal.exp
>>>> 	* gdb/testsuite/gdb.python/python.exp
>>>> 	* gdb/testsuite/gdb.trace/tracecmd.exp
>>>
>>> Drop "gdb/testsuite/".  Patch is good to me, but I think we need to
>>> enforce a rule in "proc gdb_test_multiple" that test message should
>>> start with a lower case letter, emit an ERROR if it starts with
>>> uppercase.
>>>
>>
>> Do you mean just for gdb_test_multiple?
>
> Yes,
>

Why just that one? Shouldn't we attempt to enforce this for all the 
other proc's, so gdb_test, gdb_test_multiple, gdb_test_no_output and 
mi_gdb_test?

>>
>> It can be tricky, since one is still free to start the sentences
>> with something like "ARM ..." or some other technology name. So
>> unfortunately we can't be too strict. I wish we could.
>
> Do we have some many technology names?  We have a white list of these
> technology names which can be capitalized in test message.
>

It is certainly possible, but do we want to add one more layer of 
maintenance? We could enforce a rule from now on to require test names 
to always start with lowercase or to even be all lowercase.

I don't think we're coherent with our use of lower/uppercase anyway. For 
example, GDBserver gets called gdbserver in gdbserver's own help text 
and the testsuite is (less so now with this series) a mixed bag.

I'm open to ideas.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple
  2016-11-29 15:07         ` Luis Machado
@ 2016-11-29 20:55           ` Yao Qi
  2016-11-29 21:14             ` Luis Machado
  0 siblings, 1 reply; 33+ messages in thread
From: Yao Qi @ 2016-11-29 20:55 UTC (permalink / raw)
  To: Luis Machado; +Cc: gdb-patches

On Tue, Nov 29, 2016 at 09:06:54AM -0600, Luis Machado wrote:
> 
> Why just that one? Shouldn't we attempt to enforce this for all the other
> proc's, so gdb_test, gdb_test_multiple, gdb_test_no_output and mi_gdb_test?
>

because all of them except mi_gdb_test call gdb_test_multiple.

> > > 
> > > It can be tricky, since one is still free to start the sentences
> > > with something like "ARM ..." or some other technology name. So
> > > unfortunately we can't be too strict. I wish we could.
> > 
> > Do we have some many technology names?  We have a white list of these
> > technology names which can be capitalized in test message.
> > 
> 
> It is certainly possible, but do we want to add one more layer of
> maintenance? We could enforce a rule from now on to require test names to
> always start with lowercase or to even be all lowercase.
> 

This is done by manual inspection in the patch review each time.  The
automatic checking is much better than manual inspection.

> I don't think we're coherent with our use of lower/uppercase anyway. For
> example, GDBserver gets called gdbserver in gdbserver's own help text and
> the testsuite is (less so now with this series) a mixed bag.
> 
> I'm open to ideas.

We've spent some effort to convert GDB tests to comply to this rule, so
I am wondering if we can find some efficient way to enforce this rule,
otherwise, the violation to this rules may show up in the code some time
later.

-- 
Yao

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple
  2016-11-29 20:55           ` Yao Qi
@ 2016-11-29 21:14             ` Luis Machado
  2016-11-30 19:56               ` Pedro Alves
  0 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-29 21:14 UTC (permalink / raw)
  To: Yao Qi; +Cc: gdb-patches

On 11/29/2016 02:55 PM, Yao Qi wrote:
> On Tue, Nov 29, 2016 at 09:06:54AM -0600, Luis Machado wrote:
>>
>> Why just that one? Shouldn't we attempt to enforce this for all the other
>> proc's, so gdb_test, gdb_test_multiple, gdb_test_no_output and mi_gdb_test?
>>
>
> because all of them except mi_gdb_test call gdb_test_multiple.
>

Ah, that makes sense. I thought i was missing something.

>>>>
>>>> It can be tricky, since one is still free to start the sentences
>>>> with something like "ARM ..." or some other technology name. So
>>>> unfortunately we can't be too strict. I wish we could.
>>>
>>> Do we have some many technology names?  We have a white list of these
>>> technology names which can be capitalized in test message.
>>>
>>
>> It is certainly possible, but do we want to add one more layer of
>> maintenance? We could enforce a rule from now on to require test names to
>> always start with lowercase or to even be all lowercase.
>>
>
> This is done by manual inspection in the patch review each time.  The
> automatic checking is much better than manual inspection.
>

Right. I agree that we don't want to have to keep inspecting things 
manually. So if we decide to go all lowercase even for technology, ISA 
or arch names, then i think we can enforce this better via the change to 
gdb_test_multiple (and mi_gdb_test). Then we don't have to maintain a 
whitelist at all.

Does that sound reasonable?

>> I don't think we're coherent with our use of lower/uppercase anyway. For
>> example, GDBserver gets called gdbserver in gdbserver's own help text and
>> the testsuite is (less so now with this series) a mixed bag.
>>
>> I'm open to ideas.
>
> We've spent some effort to convert GDB tests to comply to this rule, so
> I am wondering if we can find some efficient way to enforce this rule,
> otherwise, the violation to this rules may show up in the code some time
> later.
>

I'd like that too.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 1/8] Fix test names starting with uppercase output by basic functions
  2016-11-25 20:55 ` [PATCH v2 1/8] Fix test names starting with uppercase output by basic functions Luis Machado
@ 2016-11-29 21:37   ` Yao Qi
  0 siblings, 0 replies; 33+ messages in thread
From: Yao Qi @ 2016-11-29 21:37 UTC (permalink / raw)
  To: Luis Machado; +Cc: gdb-patches

Hi, Luis,

Drop "gdb/testsuite/" in ChangeLog entry, otherwise patch is good to me.

-- 
Yao 

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple
  2016-11-29 21:14             ` Luis Machado
@ 2016-11-30 19:56               ` Pedro Alves
  0 siblings, 0 replies; 33+ messages in thread
From: Pedro Alves @ 2016-11-30 19:56 UTC (permalink / raw)
  To: Luis Machado, Yao Qi; +Cc: gdb-patches

On 11/29/2016 09:14 PM, Luis Machado wrote:

> Right. I agree that we don't want to have to keep inspecting things
> manually. So if we decide to go all lowercase even for technology, ISA
> or arch names, then i think we can enforce this better via the change to
> gdb_test_multiple (and mi_gdb_test). Then we don't have to maintain a
> whitelist at all.
> 
> Does that sound reasonable?

Is that going a bit too far?  There's no real harm in
uppercase test messages, other than inconsistency.  I suspect that the
main reason we see patches with uppercase test names is people
starting from an existing test and applying the old time-proven
copy/paste test-writing methodology.  So if we fix most violations, then
we should see much fewer attempts to reintroduce more.  And we can't add
such enforcement until we've fixed all existing ones.

Thanks,
Pedro Alves

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 5/8] Fix test names starting with uppercase using multi-line gdb_test/mi_gdb_test
  2016-11-25 20:55 ` [PATCH v2 5/8] Fix test names starting with uppercase using multi-line gdb_test/mi_gdb_test Luis Machado
@ 2016-11-30 20:11   ` Pedro Alves
  2016-11-30 20:25     ` Luis Machado
  0 siblings, 1 reply; 33+ messages in thread
From: Pedro Alves @ 2016-11-30 20:11 UTC (permalink / raw)
  To: Luis Machado, gdb-patches

On 11/25/2016 08:54 PM, Luis Machado wrote:
> This fixes offender testcases that have test names starting with uppercase
> when using gdb_test/mi_gdb_test in a multi-line construct.
> 
> gdb/testsuite/ChangeLog
> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
> 
> 	Fix test names starting with uppercase throughout the files.
> 
> 	* gdb/testsuite/gdb.ada/array_return.exp

Drop gdb/testsuite/.  Otherwise LGTM.

> diff --git a/gdb/testsuite/gdb.ada/array_return.exp b/gdb/testsuite/gdb.ada/array_return.exp
> index f4dae48..37f2845 100644
> --- a/gdb/testsuite/gdb.ada/array_return.exp
> +++ b/gdb/testsuite/gdb.ada/array_return.exp
> @@ -52,7 +52,7 @@ gdb_test "break create_small_float_vector" \
>  
>  gdb_test "cont" \
>           "Breakpoint \[0-9\]+, pck.create_small \\(\\).*" \
> -         "Continuing to Create_Small"
> +         "continuing to Create_Small"

This looks like a good example showing why enforcing uppercase
in the testsuite's internal routines would be going too far.
I.e., it's quite reasonable to want to print the name of some random
symbol from the test's source code which might want to be uppercase.

> --- a/gdb/testsuite/gdb.base/testenv.exp
> +++ b/gdb/testsuite/gdb.base/testenv.exp
> @@ -49,7 +49,7 @@ gdb_breakpoint  $bp_line
>  # First test with no TEST_GDB_VAR
>  gdb_test "continue" \
>    ".*Program found 0 variables starting with TEST_GDB.*" \
> -  "Test no TEST_GDB var"
> +  "test no TEST_GDB var"

Another example.  This time the name of an environment variable.

Thanks,
Pedro Alves

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 6/8] Fix test names starting with uppercase using multi-line gdb_test_no_output
  2016-11-25 20:54 ` [PATCH v2 6/8] Fix test names starting with uppercase using multi-line gdb_test_no_output Luis Machado
@ 2016-11-30 20:12   ` Pedro Alves
  0 siblings, 0 replies; 33+ messages in thread
From: Pedro Alves @ 2016-11-30 20:12 UTC (permalink / raw)
  To: Luis Machado, gdb-patches

On 11/25/2016 08:54 PM, Luis Machado wrote:
> This fixes offender testcases that have test names starting with uppercase
> when using gdb_test_no_output in a multi-line construct.
> 
> gdb/testsuite/ChangeLog
> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
> 
> 	Fix test names starting with uppercase throughout the files.
> 
> 	* gdb/testsuite/gdb.ada/assign_1.exp

Drop gdb/testsuite/, and LGTM.

Thanks,
Pedro Alves

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 5/8] Fix test names starting with uppercase using multi-line gdb_test/mi_gdb_test
  2016-11-30 20:11   ` Pedro Alves
@ 2016-11-30 20:25     ` Luis Machado
  0 siblings, 0 replies; 33+ messages in thread
From: Luis Machado @ 2016-11-30 20:25 UTC (permalink / raw)
  To: Pedro Alves, gdb-patches

On 11/30/2016 02:11 PM, Pedro Alves wrote:
> On 11/25/2016 08:54 PM, Luis Machado wrote:
>> This fixes offender testcases that have test names starting with uppercase
>> when using gdb_test/mi_gdb_test in a multi-line construct.
>>
>> gdb/testsuite/ChangeLog
>> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
>>
>> 	Fix test names starting with uppercase throughout the files.
>>
>> 	* gdb/testsuite/gdb.ada/array_return.exp
>
> Drop gdb/testsuite/.  Otherwise LGTM.
>

Thanks. This is fixed locally throughout.

>> diff --git a/gdb/testsuite/gdb.ada/array_return.exp b/gdb/testsuite/gdb.ada/array_return.exp
>> index f4dae48..37f2845 100644
>> --- a/gdb/testsuite/gdb.ada/array_return.exp
>> +++ b/gdb/testsuite/gdb.ada/array_return.exp
>> @@ -52,7 +52,7 @@ gdb_test "break create_small_float_vector" \
>>
>>  gdb_test "cont" \
>>           "Breakpoint \[0-9\]+, pck.create_small \\(\\).*" \
>> -         "Continuing to Create_Small"
>> +         "continuing to Create_Small"
>
> This looks like a good example showing why enforcing uppercase
> in the testsuite's internal routines would be going too far.
> I.e., it's quite reasonable to want to print the name of some random
> symbol from the test's source code which might want to be uppercase.
>

Yeah, given the current test names we have, it doesn't make much sense. 
It would only make sense if had patterns for test names that did not 
include variables, technology names and the like. Not sure if that's 
sensible or not at this point.

But, with the series in place, i think we are more coherent with regards 
to test names.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 7/8] Fix test names starting with uppercase using multi-line gdb_test_multiple
  2016-11-25 20:54 ` [PATCH v2 7/8] Fix test names starting with uppercase using multi-line gdb_test_multiple Luis Machado
@ 2016-11-30 20:47   ` Pedro Alves
  2016-11-30 21:05     ` Luis Machado
  0 siblings, 1 reply; 33+ messages in thread
From: Pedro Alves @ 2016-11-30 20:47 UTC (permalink / raw)
  To: Luis Machado, gdb-patches

On 11/25/2016 08:54 PM, Luis Machado wrote:
> This fixes offender testcases that have test names starting with uppercase
> when using gdb_test_multiple in a multi-line construct.
> 
> gdb/testsuite/ChangeLog
> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
> 
> 	Fix test names starting with uppercase throughout the files.
> 
> 	* gdb/testsuite/gdb.cp/gdb2495.exp

Drop "gdb/testsuite/", and LGTM, but ...

> ---
>  gdb/testsuite/gdb.cp/gdb2495.exp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp
> index dff5977..7e4dfa8 100644
> --- a/gdb/testsuite/gdb.cp/gdb2495.exp
> +++ b/gdb/testsuite/gdb.cp/gdb2495.exp
> @@ -95,7 +95,7 @@ gdb_test "info breakpoints" \
>  
>  # Turn off this new behaviour.
>  gdb_test_multiple "set unwind-on-terminating-exception off" \
> -    "Turn unwind-on-terminating-exception off" {
> +    "turn unwind-on-terminating-exception off" {
>      -re "$gdb_prompt $" {pass "set unwinn-on-terminating-exception off"}
>      timeout {fail "(timeout) set unwind-on-terminating-exception off"}
>  }

... I think this could just be:

 gdb_test "set unwind-on-terminating-exception off" ""

?

I'd end up fixing two extra things:

 - note the typo in the pass case: "unwiNN"
 - odd "(timeout)" print position.  timeout handling it not necessary
   at all with gdb_test_multiple, even.

Thanks,
Pedro Alves

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 7/8] Fix test names starting with uppercase using multi-line gdb_test_multiple
  2016-11-30 20:47   ` Pedro Alves
@ 2016-11-30 21:05     ` Luis Machado
  2016-11-30 22:14       ` Pedro Alves
  0 siblings, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-11-30 21:05 UTC (permalink / raw)
  To: Pedro Alves, gdb-patches

On 11/30/2016 02:47 PM, Pedro Alves wrote:
> On 11/25/2016 08:54 PM, Luis Machado wrote:
>> This fixes offender testcases that have test names starting with uppercase
>> when using gdb_test_multiple in a multi-line construct.
>>
>> gdb/testsuite/ChangeLog
>> 2016-11-25  Luis Machado  <lgustavo@codesourcery.com>
>>
>> 	Fix test names starting with uppercase throughout the files.
>>
>> 	* gdb/testsuite/gdb.cp/gdb2495.exp
>
> Drop "gdb/testsuite/", and LGTM, but ...
>
>> ---
>>  gdb/testsuite/gdb.cp/gdb2495.exp | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp
>> index dff5977..7e4dfa8 100644
>> --- a/gdb/testsuite/gdb.cp/gdb2495.exp
>> +++ b/gdb/testsuite/gdb.cp/gdb2495.exp
>> @@ -95,7 +95,7 @@ gdb_test "info breakpoints" \
>>
>>  # Turn off this new behaviour.
>>  gdb_test_multiple "set unwind-on-terminating-exception off" \
>> -    "Turn unwind-on-terminating-exception off" {
>> +    "turn unwind-on-terminating-exception off" {
>>      -re "$gdb_prompt $" {pass "set unwinn-on-terminating-exception off"}
>>      timeout {fail "(timeout) set unwind-on-terminating-exception off"}
>>  }
>
> ... I think this could just be:
>
>  gdb_test "set unwind-on-terminating-exception off" ""
>

gdb_test_no_output then? It doesn't check for any output other than the 
prompt.

> ?
>
> I'd end up fixing two extra things:
>
>  - note the typo in the pass case: "unwiNN"
>  - odd "(timeout)" print position.  timeout handling it not necessary
>    at all with gdb_test_multiple, even.

I see more occurrences of expecting timeouts where they're not needed. 
I'll fix in a follow-on patch.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 7/8] Fix test names starting with uppercase using multi-line gdb_test_multiple
  2016-11-30 21:05     ` Luis Machado
@ 2016-11-30 22:14       ` Pedro Alves
  0 siblings, 0 replies; 33+ messages in thread
From: Pedro Alves @ 2016-11-30 22:14 UTC (permalink / raw)
  To: Luis Machado, gdb-patches

On 11/30/2016 09:05 PM, Luis Machado wrote:

> gdb_test_no_output then? It doesn't check for any output other than the
> prompt.

'-re "$gdb_prompt $"' implicitly matches whatever might come before
the prompt too, but yeah, that'd be better even, assuming the command
doesn't output anything, which is probably true.

OK with that change.

> 
>> ?
>>
>> I'd end up fixing two extra things:
>>
>>  - note the typo in the pass case: "unwiNN"
>>  - odd "(timeout)" print position.  timeout handling it not necessary
>>    at all with gdb_test_multiple, even.
> 
> I see more occurrences of expecting timeouts where they're not needed.
> I'll fix in a follow-on patch.

Thanks much!

Thanks,
Pedro Alves

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages
  2016-11-25 20:55 ` [PATCH v2 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages Luis Machado
@ 2016-12-01 11:08   ` Pedro Alves
  2016-12-01 13:15     ` Luis Machado
  2016-12-01 17:20     ` [PATCH v3 " Luis Machado
  0 siblings, 2 replies; 33+ messages in thread
From: Pedro Alves @ 2016-12-01 11:08 UTC (permalink / raw)
  To: Luis Machado, gdb-patches

I thought I had sent this yesterday, but I now see I haven't..

On 11/25/2016 08:54 PM, Luis Machado wrote:
> --- a/gdb/testsuite/gdb.base/info-shared.exp
> +++ b/gdb/testsuite/gdb.base/info-shared.exp
> @@ -31,13 +31,13 @@ set define2 -DSHLIB2_NAME=\"$binfile_lib2\"
>  
>  if { [gdb_compile_shlib $srcfile_lib1 $binfile_lib1 \
>  	  [list additional_flags=-fPIC]] != "" } {
> -    untested "could not compile $binfile_lib1."
> +    untested "failed to compile shared library"
>      return -1
>  }
>  
>  if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \
>  	  [list additional_flags=-fPIC]] != "" } {
> -    untested "could not compile $binfile_lib2."
> +    untested "failed to compile shared library"
>      return -1

Duplicate test message.  Write something like:

  untested "failed to compile shared library 1"
  untested "failed to compile shared library 2"

Another example (though unlike the above, this case was already
duplicate):

> --- a/gdb/testsuite/gdb.base/attach.exp
> +++ b/gdb/testsuite/gdb.base/attach.exp
> @@ -30,14 +30,14 @@ remote_exec build "rm -f ${binfile} ${binfile2}"
>  # build the first test case
>  #
>  if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
> -    untested attach.exp
> +    untested "failed to compile"
>      return -1
>  }

    untested "failed to compile first test case"

>  
>  # Build the in-system-call test
>  
>  if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
> -    untested attach.exp
> +    untested "failed to compile"

    untested "failed to compile in-system-call test"


There are likely more instances in the patch.  Since you're now reusing the same
string on all tests, I think it should be easy to grep (+sort+uniq)
for "failed to compile" to catch them.  Could you do that?

Thanks,
Pedro Alves

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v2 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages
  2016-12-01 11:08   ` Pedro Alves
@ 2016-12-01 13:15     ` Luis Machado
  2016-12-01 17:20     ` [PATCH v3 " Luis Machado
  1 sibling, 0 replies; 33+ messages in thread
From: Luis Machado @ 2016-12-01 13:15 UTC (permalink / raw)
  To: Pedro Alves, gdb-patches

On 12/01/2016 05:08 AM, Pedro Alves wrote:
> I thought I had sent this yesterday, but I now see I haven't..
>
> On 11/25/2016 08:54 PM, Luis Machado wrote:
>> --- a/gdb/testsuite/gdb.base/info-shared.exp
>> +++ b/gdb/testsuite/gdb.base/info-shared.exp
>> @@ -31,13 +31,13 @@ set define2 -DSHLIB2_NAME=\"$binfile_lib2\"
>>
>>  if { [gdb_compile_shlib $srcfile_lib1 $binfile_lib1 \
>>  	  [list additional_flags=-fPIC]] != "" } {
>> -    untested "could not compile $binfile_lib1."
>> +    untested "failed to compile shared library"
>>      return -1
>>  }
>>
>>  if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \
>>  	  [list additional_flags=-fPIC]] != "" } {
>> -    untested "could not compile $binfile_lib2."
>> +    untested "failed to compile shared library"
>>      return -1
>
> Duplicate test message.  Write something like:
>
>   untested "failed to compile shared library 1"
>   untested "failed to compile shared library 2"
>
> Another example (though unlike the above, this case was already
> duplicate):
>
>> --- a/gdb/testsuite/gdb.base/attach.exp
>> +++ b/gdb/testsuite/gdb.base/attach.exp
>> @@ -30,14 +30,14 @@ remote_exec build "rm -f ${binfile} ${binfile2}"
>>  # build the first test case
>>  #
>>  if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
>> -    untested attach.exp
>> +    untested "failed to compile"
>>      return -1
>>  }
>
>     untested "failed to compile first test case"
>
>>
>>  # Build the in-system-call test
>>
>>  if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
>> -    untested attach.exp
>> +    untested "failed to compile"
>
>     untested "failed to compile in-system-call test"
>
>
> There are likely more instances in the patch.  Since you're now reusing the same
> string on all tests, I think it should be easy to grep (+sort+uniq)
> for "failed to compile" to catch them.  Could you do that?
>
> Thanks,
> Pedro Alves
>

Sure. I'll get those addressed.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH v3 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages
  2016-12-01 11:08   ` Pedro Alves
  2016-12-01 13:15     ` Luis Machado
@ 2016-12-01 17:20     ` Luis Machado
  2016-12-01 17:35       ` Pedro Alves
  1 sibling, 1 reply; 33+ messages in thread
From: Luis Machado @ 2016-12-01 17:20 UTC (permalink / raw)
  To: gdb-patches, palves

How about the following as the final version?

Changes in v3:

- Adjusted some testcases where the message "failed to compile" was not unique.

Changes in v2:

- Addressed comments from reviewers.
- Fixed spurious whitespaces.
- Changed compilation failure messages that included source/binary paths to
  ones that are short and deterministic.

---

Another bit of cleanup to the testsuite. We have a number of tests that are
not honoring the rule of not outputting their own name as a test name.

I fixed up all the offenders i could find with the following regular
expression:

"(xfail|kfail|kpass|fail|pass|unsupported|untested) ([A-Za-z0-9]+|\\\$(.)*testfile(.)*)\.exp$"

OK?

gdb/testsuite/ChangeLog:
2016-12-01  Luis Machado  <lgustavo@codesourcery.com>

	Fix test names and standardize compilation error messages throughout
	the following files:

	* gdb.ada/start.exp
	* gdb.arch/alpha-step.exp
	* gdb.arch/e500-prologue.exp
	* gdb.arch/ftrace-insn-reloc.exp
	* gdb.arch/gdb1291.exp
	* gdb.arch/gdb1431.exp
	* gdb.arch/gdb1558.exp
	* gdb.arch/i386-dr3-watch.exp
	* gdb.arch/i386-sse-stack-align.exp
	* gdb.arch/ia64-breakpoint-shadow.exp
	* gdb.arch/pa-nullify.exp
	* gdb.arch/powerpc-aix-prologue.exp
	* gdb.arch/thumb-bx-pc.exp
	* gdb.base/annota1.exp
	* gdb.base/annota3.exp
	* gdb.base/arrayidx.exp
	* gdb.base/assign.exp
	* gdb.base/attach.exp
	* gdb.base/auxv.exp
	* gdb.base/bang.exp
	* gdb.base/bfp-test.exp
	* gdb.base/bigcore.exp
	* gdb.base/bitfields2.exp
	* gdb.base/break-fun-addr.exp
	* gdb.base/break-probes.exp
	* gdb.base/call-rt-st.exp
	* gdb.base/callexit.exp
	* gdb.base/catch-fork-kill.exp
	* gdb.base/charset.exp
	* gdb.base/checkpoint.exp
	* gdb.base/comprdebug.exp
	* gdb.base/constvars.exp
	* gdb.base/coredump-filter.exp
	* gdb.base/cursal.exp
	* gdb.base/cvexpr.exp
	* gdb.base/detach.exp
	* gdb.base/display.exp
	* gdb.base/dmsym.exp
	* gdb.base/dprintf-pending.exp
	* gdb.base/dso2dso.exp
	* gdb.base/dtrace-probe.exp
	* gdb.base/dump.exp
	* gdb.base/enum_cond.exp
	* gdb.base/exe-lock.exp
	* gdb.base/exec-invalid-sysroot.exp
	* gdb.base/execl-update-breakpoints.exp
	* gdb.base/exprs.exp
	* gdb.base/fileio.exp
	* gdb.base/find.exp
	* gdb.base/finish.exp
	* gdb.base/fixsection.exp
	* gdb.base/foll-vfork.exp
	* gdb.base/frame-args.exp
	* gdb.base/gcore.exp
	* gdb.base/gdb1250.exp
	* gdb.base/global-var-nested-by-dso.exp
	* gdb.base/gnu-ifunc.exp
	* gdb.base/hashline1.exp
	* gdb.base/hashline2.exp
	* gdb.base/hashline3.exp
	* gdb.base/hbreak-in-shr-unsupported.exp
	* gdb.base/huge.exp
	* gdb.base/infcall-input.exp
	* gdb.base/info-fun.exp
	* gdb.base/info-shared.exp
	* gdb.base/jit-simple.exp
	* gdb.base/jit-so.exp
	* gdb.base/jit.exp
	* gdb.base/jump.exp
	* gdb.base/label.exp
	* gdb.base/lineinc.exp
	* gdb.base/logical.exp
	* gdb.base/longjmp.exp
	* gdb.base/macscp.exp
	* gdb.base/miscexprs.exp
	* gdb.base/new-ui-echo.exp
	* gdb.base/new-ui-pending-input.exp
	* gdb.base/new-ui.exp
	* gdb.base/nodebug.exp
	* gdb.base/nofield.exp
	* gdb.base/offsets.exp
	* gdb.base/overlays.exp
	* gdb.base/pending.exp
	* gdb.base/pointers.exp
	* gdb.base/pr11022.exp
	* gdb.base/printcmds.exp
	* gdb.base/prologue.exp
	* gdb.base/ptr-typedef.exp
	* gdb.base/realname-expand.exp
	* gdb.base/relativedebug.exp
	* gdb.base/relocate.exp
	* gdb.base/remote.exp
	* gdb.base/reread.exp
	* gdb.base/return2.exp
	* gdb.base/savedregs.exp
	* gdb.base/sep.exp
	* gdb.base/sepdebug.exp
	* gdb.base/sepsymtab.exp
	* gdb.base/set-inferior-tty.exp
	* gdb.base/setshow.exp
	* gdb.base/shlib-call.exp
	* gdb.base/sigaltstack.exp
	* gdb.base/siginfo-addr.exp
	* gdb.base/signals.exp
	* gdb.base/signull.exp
	* gdb.base/sigrepeat.exp
	* gdb.base/so-impl-ld.exp
	* gdb.base/solib-display.exp
	* gdb.base/solib-overlap.exp
	* gdb.base/solib-search.exp
	* gdb.base/solib-symbol.exp
	* gdb.base/structs.exp
	* gdb.base/structs2.exp
	* gdb.base/symtab-search-order.exp
	* gdb.base/twice.exp
	* gdb.base/unload.exp
	* gdb.base/varargs.exp
	* gdb.base/watchpoint-solib.exp
	* gdb.base/watchpoint.exp
	* gdb.base/whatis.exp
	* gdb.base/wrong_frame_bt_full.exp
	* gdb.btrace/dlopen.exp
	* gdb.cell/ea-standalone.exp
	* gdb.cell/ea-test.exp
	* gdb.cp/dispcxx.exp
	* gdb.cp/gdb2384.exp
	* gdb.cp/method2.exp
	* gdb.cp/nextoverthrow.exp
	* gdb.cp/pr10728.exp
	* gdb.disasm/am33.exp
	* gdb.disasm/h8300s.exp
	* gdb.disasm/mn10300.exp
	* gdb.disasm/sh3.exp
	* gdb.dwarf2/dw2-dir-file-name.exp
	* gdb.fortran/complex.exp
	* gdb.fortran/library-module.exp
	* gdb.guile/scm-pretty-print.exp
	* gdb.guile/scm-symbol.exp
	* gdb.guile/scm-type.exp
	* gdb.guile/scm-value.exp
	* gdb.linespec/linespec.exp
	* gdb.mi/gdb701.exp
	* gdb.mi/gdb792.exp
	* gdb.mi/mi-breakpoint-changed.exp
	* gdb.mi/mi-dprintf-pending.exp
	* gdb.mi/mi-dprintf.exp
	* gdb.mi/mi-exit-code.exp
	* gdb.mi/mi-pending.exp
	* gdb.mi/mi-solib.exp
	* gdb.mi/new-ui-mi-sync.exp
	* gdb.mi/pr11022.exp
	* gdb.mi/user-selected-context-sync.exp
	* gdb.opt/solib-intra-step.exp
	* gdb.python/py-events.exp
	* gdb.python/py-finish-breakpoint.exp
	* gdb.python/py-mi.exp
	* gdb.python/py-prettyprint.exp
	* gdb.python/py-shared.exp
	* gdb.python/py-symbol.exp
	* gdb.python/py-template.exp
	* gdb.python/py-type.exp
	* gdb.python/py-value.exp
	* gdb.reverse/solib-precsave.exp
	* gdb.reverse/solib-reverse.exp
	* gdb.server/solib-list.exp
	* gdb.stabs/weird.exp
	* gdb.threads/reconnect-signal.exp
	* gdb.threads/stepi-random-signal.exp
	* gdb.trace/actions.exp
	* gdb.trace/ax.exp
	* gdb.trace/backtrace.exp
	* gdb.trace/change-loc.exp
	* gdb.trace/deltrace.exp
	* gdb.trace/ftrace-lock.exp
	* gdb.trace/ftrace.exp
	* gdb.trace/infotrace.exp
	* gdb.trace/mi-tracepoint-changed.exp
	* gdb.trace/packetlen.exp
	* gdb.trace/passcount.exp
	* gdb.trace/pending.exp
	* gdb.trace/range-stepping.exp
	* gdb.trace/report.exp
	* gdb.trace/stap-trace.exp
	* gdb.trace/tfind.exp
	* gdb.trace/trace-break.exp
	* gdb.trace/trace-condition.exp
	* gdb.trace/trace-enable-disable.exp
	* gdb.trace/trace-mt.exp
	* gdb.trace/tracecmd.exp
	* gdb.trace/tspeed.exp
	* gdb.trace/tsv.exp
	* lib/perftest.exp
---
 gdb/testsuite/gdb.ada/start.exp                      |  4 ++--
 gdb/testsuite/gdb.arch/alpha-step.exp                |  2 +-
 gdb/testsuite/gdb.arch/e500-prologue.exp             |  2 +-
 gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp         |  2 +-
 gdb/testsuite/gdb.arch/gdb1291.exp                   |  2 +-
 gdb/testsuite/gdb.arch/gdb1431.exp                   |  2 +-
 gdb/testsuite/gdb.arch/gdb1558.exp                   |  2 +-
 gdb/testsuite/gdb.arch/i386-dr3-watch.exp            |  2 +-
 gdb/testsuite/gdb.arch/i386-sse-stack-align.exp      |  2 +-
 gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp    |  2 +-
 gdb/testsuite/gdb.arch/pa-nullify.exp                |  2 +-
 gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp      |  2 +-
 gdb/testsuite/gdb.arch/thumb-bx-pc.exp               |  2 +-
 gdb/testsuite/gdb.base/annota1.exp                   |  2 +-
 gdb/testsuite/gdb.base/annota3.exp                   |  2 +-
 gdb/testsuite/gdb.base/arrayidx.exp                  |  2 +-
 gdb/testsuite/gdb.base/assign.exp                    |  2 +-
 gdb/testsuite/gdb.base/attach.exp                    |  4 ++--
 gdb/testsuite/gdb.base/auxv.exp                      |  2 +-
 gdb/testsuite/gdb.base/bang.exp                      |  2 +-
 gdb/testsuite/gdb.base/bfp-test.exp                  |  2 +-
 gdb/testsuite/gdb.base/bigcore.exp                   |  2 +-
 gdb/testsuite/gdb.base/bitfields2.exp                |  2 +-
 gdb/testsuite/gdb.base/break-fun-addr.exp            |  4 ++--
 gdb/testsuite/gdb.base/break-probes.exp              |  2 +-
 gdb/testsuite/gdb.base/call-rt-st.exp                |  2 +-
 gdb/testsuite/gdb.base/callexit.exp                  |  2 +-
 gdb/testsuite/gdb.base/catch-fork-kill.exp           |  2 +-
 gdb/testsuite/gdb.base/charset.exp                   |  2 +-
 gdb/testsuite/gdb.base/checkpoint.exp                |  2 +-
 gdb/testsuite/gdb.base/comprdebug.exp                |  4 ++--
 gdb/testsuite/gdb.base/constvars.exp                 |  2 +-
 gdb/testsuite/gdb.base/coredump-filter.exp           |  2 +-
 gdb/testsuite/gdb.base/cursal.exp                    |  2 +-
 gdb/testsuite/gdb.base/cvexpr.exp                    |  2 +-
 gdb/testsuite/gdb.base/detach.exp                    |  2 +-
 gdb/testsuite/gdb.base/display.exp                   |  2 +-
 gdb/testsuite/gdb.base/dmsym.exp                     |  4 ++--
 gdb/testsuite/gdb.base/dprintf-pending.exp           |  2 +-
 gdb/testsuite/gdb.base/dso2dso.exp                   |  4 ++--
 gdb/testsuite/gdb.base/dtrace-probe.exp              |  2 +-
 gdb/testsuite/gdb.base/dump.exp                      |  4 ++--
 gdb/testsuite/gdb.base/enum_cond.exp                 |  2 +-
 gdb/testsuite/gdb.base/exe-lock.exp                  |  2 +-
 gdb/testsuite/gdb.base/exec-invalid-sysroot.exp      |  4 ++--
 gdb/testsuite/gdb.base/execl-update-breakpoints.exp  |  2 +-
 gdb/testsuite/gdb.base/exprs.exp                     |  2 +-
 gdb/testsuite/gdb.base/fileio.exp                    |  2 +-
 gdb/testsuite/gdb.base/find.exp                      |  2 +-
 gdb/testsuite/gdb.base/finish.exp                    |  2 +-
 gdb/testsuite/gdb.base/fixsection.exp                |  2 +-
 gdb/testsuite/gdb.base/foll-vfork.exp                |  4 ++--
 gdb/testsuite/gdb.base/frame-args.exp                |  2 +-
 gdb/testsuite/gdb.base/gcore.exp                     |  4 ++--
 gdb/testsuite/gdb.base/gdb1250.exp                   |  2 +-
 gdb/testsuite/gdb.base/global-var-nested-by-dso.exp  |  4 ++--
 gdb/testsuite/gdb.base/gnu-ifunc.exp                 |  4 ++--
 gdb/testsuite/gdb.base/hashline1.exp                 |  2 +-
 gdb/testsuite/gdb.base/hashline2.exp                 |  2 +-
 gdb/testsuite/gdb.base/hashline3.exp                 |  2 +-
 gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp |  2 +-
 gdb/testsuite/gdb.base/huge.exp                      |  4 ++--
 gdb/testsuite/gdb.base/infcall-input.exp             |  2 +-
 gdb/testsuite/gdb.base/info-fun.exp                  |  2 +-
 gdb/testsuite/gdb.base/info-shared.exp               |  4 ++--
 gdb/testsuite/gdb.base/jit-simple.exp                |  4 ++--
 gdb/testsuite/gdb.base/jit-so.exp                    | 11 +++++------
 gdb/testsuite/gdb.base/jit.exp                       |  5 ++---
 gdb/testsuite/gdb.base/jump.exp                      |  2 +-
 gdb/testsuite/gdb.base/label.exp                     |  2 +-
 gdb/testsuite/gdb.base/lineinc.exp                   |  2 +-
 gdb/testsuite/gdb.base/logical.exp                   |  2 +-
 gdb/testsuite/gdb.base/longjmp.exp                   |  2 +-
 gdb/testsuite/gdb.base/macscp.exp                    |  2 +-
 gdb/testsuite/gdb.base/miscexprs.exp                 |  2 +-
 gdb/testsuite/gdb.base/new-ui-echo.exp               |  2 +-
 gdb/testsuite/gdb.base/new-ui-pending-input.exp      |  2 +-
 gdb/testsuite/gdb.base/new-ui.exp                    |  2 +-
 gdb/testsuite/gdb.base/nodebug.exp                   |  2 +-
 gdb/testsuite/gdb.base/nofield.exp                   |  2 +-
 gdb/testsuite/gdb.base/offsets.exp                   |  2 +-
 gdb/testsuite/gdb.base/overlays.exp                  |  2 +-
 gdb/testsuite/gdb.base/pending.exp                   |  2 +-
 gdb/testsuite/gdb.base/pointers.exp                  |  2 +-
 gdb/testsuite/gdb.base/pr11022.exp                   |  2 +-
 gdb/testsuite/gdb.base/printcmds.exp                 |  2 +-
 gdb/testsuite/gdb.base/prologue.exp                  |  2 +-
 gdb/testsuite/gdb.base/ptr-typedef.exp               |  2 +-
 gdb/testsuite/gdb.base/realname-expand.exp           |  2 +-
 gdb/testsuite/gdb.base/relativedebug.exp             |  2 +-
 gdb/testsuite/gdb.base/relocate.exp                  |  2 +-
 gdb/testsuite/gdb.base/remote.exp                    |  2 +-
 gdb/testsuite/gdb.base/reread.exp                    |  4 ++--
 gdb/testsuite/gdb.base/return2.exp                   |  4 ++--
 gdb/testsuite/gdb.base/savedregs.exp                 |  2 +-
 gdb/testsuite/gdb.base/sep.exp                       |  2 +-
 gdb/testsuite/gdb.base/sepdebug.exp                  |  2 +-
 gdb/testsuite/gdb.base/sepsymtab.exp                 |  2 +-
 gdb/testsuite/gdb.base/set-inferior-tty.exp          |  2 +-
 gdb/testsuite/gdb.base/setshow.exp                   |  2 +-
 gdb/testsuite/gdb.base/shlib-call.exp                |  2 +-
 gdb/testsuite/gdb.base/sigaltstack.exp               |  2 +-
 gdb/testsuite/gdb.base/siginfo-addr.exp              |  2 +-
 gdb/testsuite/gdb.base/signals.exp                   |  2 +-
 gdb/testsuite/gdb.base/signull.exp                   |  2 +-
 gdb/testsuite/gdb.base/sigrepeat.exp                 |  2 +-
 gdb/testsuite/gdb.base/so-impl-ld.exp                |  2 +-
 gdb/testsuite/gdb.base/solib-display.exp             |  2 +-
 gdb/testsuite/gdb.base/solib-overlap.exp             |  4 ++--
 gdb/testsuite/gdb.base/solib-search.exp              |  4 ++--
 gdb/testsuite/gdb.base/solib-symbol.exp              |  2 +-
 gdb/testsuite/gdb.base/structs.exp                   |  2 +-
 gdb/testsuite/gdb.base/structs2.exp                  |  2 +-
 gdb/testsuite/gdb.base/symtab-search-order.exp       |  2 +-
 gdb/testsuite/gdb.base/twice.exp                     |  2 +-
 gdb/testsuite/gdb.base/unload.exp                    |  2 +-
 gdb/testsuite/gdb.base/varargs.exp                   |  2 +-
 gdb/testsuite/gdb.base/watchpoint-solib.exp          |  2 +-
 gdb/testsuite/gdb.base/watchpoint.exp                |  2 +-
 gdb/testsuite/gdb.base/whatis.exp                    |  2 +-
 gdb/testsuite/gdb.base/wrong_frame_bt_full.exp       |  2 +-
 gdb/testsuite/gdb.btrace/dlopen.exp                  |  2 +-
 gdb/testsuite/gdb.cell/ea-standalone.exp             |  2 +-
 gdb/testsuite/gdb.cell/ea-test.exp                   |  2 +-
 gdb/testsuite/gdb.cp/dispcxx.exp                     |  2 +-
 gdb/testsuite/gdb.cp/gdb2384.exp                     |  2 +-
 gdb/testsuite/gdb.cp/method2.exp                     |  2 +-
 gdb/testsuite/gdb.cp/nextoverthrow.exp               |  2 +-
 gdb/testsuite/gdb.cp/pr10728.exp                     |  6 +++---
 gdb/testsuite/gdb.disasm/am33.exp                    |  2 +-
 gdb/testsuite/gdb.disasm/h8300s.exp                  |  2 +-
 gdb/testsuite/gdb.disasm/mn10300.exp                 |  2 +-
 gdb/testsuite/gdb.disasm/sh3.exp                     |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp       |  2 +-
 gdb/testsuite/gdb.fortran/complex.exp                |  2 +-
 gdb/testsuite/gdb.fortran/library-module.exp         |  4 ++--
 gdb/testsuite/gdb.guile/scm-pretty-print.exp         |  2 +-
 gdb/testsuite/gdb.guile/scm-symbol.exp               |  2 +-
 gdb/testsuite/gdb.guile/scm-type.exp                 |  2 +-
 gdb/testsuite/gdb.guile/scm-value.exp                |  2 +-
 gdb/testsuite/gdb.linespec/linespec.exp              |  2 +-
 gdb/testsuite/gdb.mi/gdb701.exp                      |  2 +-
 gdb/testsuite/gdb.mi/gdb792.exp                      |  2 +-
 gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp       |  4 ++--
 gdb/testsuite/gdb.mi/mi-dprintf-pending.exp          |  4 ++--
 gdb/testsuite/gdb.mi/mi-dprintf.exp                  |  2 +-
 gdb/testsuite/gdb.mi/mi-exit-code.exp                |  2 +-
 gdb/testsuite/gdb.mi/mi-pending.exp                  |  4 ++--
 gdb/testsuite/gdb.mi/mi-solib.exp                    |  2 +-
 gdb/testsuite/gdb.mi/new-ui-mi-sync.exp              |  2 +-
 gdb/testsuite/gdb.mi/pr11022.exp                     |  2 +-
 gdb/testsuite/gdb.mi/user-selected-context-sync.exp  |  2 +-
 gdb/testsuite/gdb.opt/solib-intra-step.exp           |  2 +-
 gdb/testsuite/gdb.python/py-events.exp               |  2 +-
 gdb/testsuite/gdb.python/py-finish-breakpoint.exp    |  2 +-
 gdb/testsuite/gdb.python/py-mi.exp                   |  2 +-
 gdb/testsuite/gdb.python/py-prettyprint.exp          |  2 +-
 gdb/testsuite/gdb.python/py-shared.exp               |  4 ++--
 gdb/testsuite/gdb.python/py-symbol.exp               |  2 +-
 gdb/testsuite/gdb.python/py-template.exp             |  2 +-
 gdb/testsuite/gdb.python/py-type.exp                 |  2 +-
 gdb/testsuite/gdb.python/py-value.exp                |  2 +-
 gdb/testsuite/gdb.reverse/solib-precsave.exp         |  6 +++---
 gdb/testsuite/gdb.reverse/solib-reverse.exp          |  6 +++---
 gdb/testsuite/gdb.server/solib-list.exp              |  2 +-
 gdb/testsuite/gdb.stabs/weird.exp                    |  2 +-
 gdb/testsuite/gdb.threads/reconnect-signal.exp       |  2 +-
 gdb/testsuite/gdb.threads/stepi-random-signal.exp    |  2 +-
 gdb/testsuite/gdb.trace/actions.exp                  |  2 +-
 gdb/testsuite/gdb.trace/ax.exp                       |  2 +-
 gdb/testsuite/gdb.trace/backtrace.exp                |  4 ++--
 gdb/testsuite/gdb.trace/change-loc.exp               |  2 +-
 gdb/testsuite/gdb.trace/deltrace.exp                 |  2 +-
 gdb/testsuite/gdb.trace/ftrace-lock.exp              |  4 ++--
 gdb/testsuite/gdb.trace/ftrace.exp                   |  2 +-
 gdb/testsuite/gdb.trace/infotrace.exp                |  2 +-
 gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp    |  4 ++--
 gdb/testsuite/gdb.trace/packetlen.exp                |  2 +-
 gdb/testsuite/gdb.trace/passcount.exp                |  2 +-
 gdb/testsuite/gdb.trace/pending.exp                  |  6 +++---
 gdb/testsuite/gdb.trace/range-stepping.exp           |  2 +-
 gdb/testsuite/gdb.trace/report.exp                   |  6 +++---
 gdb/testsuite/gdb.trace/stap-trace.exp               |  2 +-
 gdb/testsuite/gdb.trace/tfind.exp                    |  2 +-
 gdb/testsuite/gdb.trace/trace-break.exp              |  2 +-
 gdb/testsuite/gdb.trace/trace-condition.exp          |  2 +-
 gdb/testsuite/gdb.trace/trace-enable-disable.exp     |  4 ++--
 gdb/testsuite/gdb.trace/trace-mt.exp                 |  4 ++--
 gdb/testsuite/gdb.trace/tracecmd.exp                 |  2 +-
 gdb/testsuite/gdb.trace/tspeed.exp                   |  2 +-
 gdb/testsuite/gdb.trace/tsv.exp                      |  2 +-
 gdb/testsuite/lib/perftest.exp                       |  2 +-
 192 files changed, 236 insertions(+), 238 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/start.exp b/gdb/testsuite/gdb.ada/start.exp
index 9a55f8f..b01731e 100644
--- a/gdb/testsuite/gdb.ada/start.exp
+++ b/gdb/testsuite/gdb.ada/start.exp
@@ -20,7 +20,7 @@ if { [skip_ada_tests] } { return -1 }
 # This testcase verifies the behavior of the `start' command, which
 # does not work when we use the gdb stub...
 if [target_info exists use_gdb_stub] {
-    untested start.exp
+    untested "skipping test due to gdb stub"
     return
 }
 
@@ -34,7 +34,7 @@ clean_restart ${testfile}
 
 # Verify that "start" lands inside the right procedure.
 if { [gdb_start_cmd] < 0 } {
-    untested start
+    untested "start failed to land inside the right procedure"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/alpha-step.exp b/gdb/testsuite/gdb.arch/alpha-step.exp
index 16743fb..5395a0d 100644
--- a/gdb/testsuite/gdb.arch/alpha-step.exp
+++ b/gdb/testsuite/gdb.arch/alpha-step.exp
@@ -24,7 +24,7 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "testcase compile failed."
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/e500-prologue.exp b/gdb/testsuite/gdb.arch/e500-prologue.exp
index 68e6664..47f5d5f 100644
--- a/gdb/testsuite/gdb.arch/e500-prologue.exp
+++ b/gdb/testsuite/gdb.arch/e500-prologue.exp
@@ -27,7 +27,7 @@ set testfile "e500-prologue"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "testcase compile failed."
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
index edf767f..106261a 100644
--- a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
+++ b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
@@ -46,7 +46,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.arch/gdb1291.exp b/gdb/testsuite/gdb.arch/gdb1291.exp
index 35c9ef0..ea61b39 100644
--- a/gdb/testsuite/gdb.arch/gdb1291.exp
+++ b/gdb/testsuite/gdb.arch/gdb1291.exp
@@ -33,7 +33,7 @@ set testfile "gdb1291"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    untested gdb1291.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1431.exp b/gdb/testsuite/gdb.arch/gdb1431.exp
index c35cc5d..31bfb0a 100644
--- a/gdb/testsuite/gdb.arch/gdb1431.exp
+++ b/gdb/testsuite/gdb.arch/gdb1431.exp
@@ -35,7 +35,7 @@ set testfile "gdb1431"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    untested gdb1431.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp
index 8cea6d3..cd24bd5 100644
--- a/gdb/testsuite/gdb.arch/gdb1558.exp
+++ b/gdb/testsuite/gdb.arch/gdb1558.exp
@@ -32,7 +32,7 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 # Note we have to compile WITH optimization and WITHOUT debugging information to expose the bug.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {"additional_flags=-O2"}] != "" } {
-    untested gdb1558.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
index 80acdb4..bdab7bf 100644
--- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
+++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
@@ -26,7 +26,7 @@ if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
 standard_testfile
 
 if [prepare_for_testing ${testfile}.exp ${binfile} ${srcfile} {debug $additional_flags}] {
-    untested "failed to compile ${testfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
index 525cbd2..14ce922 100644
--- a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
@@ -31,7 +31,7 @@ if [info exists COMPILE] {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
-    unsupported "cannot compile ${srcfile}"
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
index 32367c9..60b9830 100644
--- a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
@@ -22,7 +22,7 @@ set testfile ia64-breakpoint-shadow
 set srcfile ${testfile}.S
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
index 9a98fe4..55d38f8 100644
--- a/gdb/testsuite/gdb.arch/pa-nullify.exp
+++ b/gdb/testsuite/gdb.arch/pa-nullify.exp
@@ -36,7 +36,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 set gcorefile ${objdir}/${subdir}/${testfile}.gcore
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "testcase compile failed."
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
index f028e94..ed0c4a3 100644
--- a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
@@ -27,7 +27,7 @@ set testfile "powerpc-aix-prologue"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "testcase compile failed."
+    unsupported "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
index b00571b..0e80a90 100644
--- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
+++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
@@ -25,7 +25,7 @@ set srcfile ${testfile}.S
 set opts {}
 
 if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] {
-    untested "failed to compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index 38b594c..4d4ba29 100644
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -34,7 +34,7 @@ set breakpoints_invalid "\r\n\032\032breakpoints-invalid\r\n"
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested annota1.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index de11c4a..a472cb4 100644
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ b/gdb/testsuite/gdb.base/annota3.exp
@@ -33,7 +33,7 @@ if [is_remote target] then {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested annota3.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/arrayidx.exp b/gdb/testsuite/gdb.base/arrayidx.exp
index c7c707a..c9dc011 100644
--- a/gdb/testsuite/gdb.base/arrayidx.exp
+++ b/gdb/testsuite/gdb.base/arrayidx.exp
@@ -20,7 +20,7 @@
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/assign.exp b/gdb/testsuite/gdb.base/assign.exp
index 7f1484e..bd9afc9 100644
--- a/gdb/testsuite/gdb.base/assign.exp
+++ b/gdb/testsuite/gdb.base/assign.exp
@@ -28,7 +28,7 @@
 standard_testfile all-types.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested assign.exp
+     untested "failed to compile"
      return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index bd0760c..99a1ae0 100644
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -30,14 +30,14 @@ remote_exec build "rm -f ${binfile} ${binfile2}"
 # build the first test case
 #
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested attach.exp
+    untested "failed to compile"
     return -1
 }
 
 # Build the in-system-call test
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-    untested attach.exp
+    untested "failed to compile in-system-call test"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index 484d201..6edb36d 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 		  {debug additional_flags=-DUSE_RLIMIT}] != ""
      && [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 		  {debug}] != "" } {
-    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bang.exp b/gdb/testsuite/gdb.base/bang.exp
index 26a4156..d9949cf 100644
--- a/gdb/testsuite/gdb.base/bang.exp
+++ b/gdb/testsuite/gdb.base/bang.exp
@@ -20,7 +20,7 @@ standard_testfile args.c
 
 if {[prepare_for_testing $testfile.exp ${testfile}! $srcfile \
 	 {debug nowarnings}]} {
-    untested bang.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bfp-test.exp b/gdb/testsuite/gdb.base/bfp-test.exp
index 91c7e51..2fc9877 100644
--- a/gdb/testsuite/gdb.base/bfp-test.exp
+++ b/gdb/testsuite/gdb.base/bfp-test.exp
@@ -19,7 +19,7 @@
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
index 62ca2b1..14c6d76 100644
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ b/gdb/testsuite/gdb.base/bigcore.exp
@@ -42,7 +42,7 @@ standard_testfile .c
 set corefile [standard_output_file ${binfile}.corefile]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested bigcore.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bitfields2.exp b/gdb/testsuite/gdb.base/bitfields2.exp
index 0f7b7c7..b556eb9 100644
--- a/gdb/testsuite/gdb.base/bitfields2.exp
+++ b/gdb/testsuite/gdb.base/bitfields2.exp
@@ -26,7 +26,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested bitfields2.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/break-fun-addr.exp b/gdb/testsuite/gdb.base/break-fun-addr.exp
index 938ec87..2983bb8 100644
--- a/gdb/testsuite/gdb.base/break-fun-addr.exp
+++ b/gdb/testsuite/gdb.base/break-fun-addr.exp
@@ -36,7 +36,7 @@ set srcfile1 ${testfile1}.c
 set binfile1 [standard_output_file ${testfile1}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile1}"
+    untested "failed to compile first testcase"
     return -1
 }
 
@@ -65,7 +65,7 @@ set srcfile2 ${testfile2}.c
 set binfile2 [standard_output_file ${testfile2}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile2}"
+    untested "failed to compile second testcase"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp
index bb8eee0..6813043 100644
--- a/gdb/testsuite/gdb.base/break-probes.exp
+++ b/gdb/testsuite/gdb.base/break-probes.exp
@@ -28,7 +28,7 @@ set probes_bp "dl_main"
 
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "could not compile $binfile_lib."
+    untested "failed to compile shared library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
index 7120b8b..4351c41 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -24,7 +24,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/callexit.exp
index e904200..c1e817a 100644
--- a/gdb/testsuite/gdb.base/callexit.exp
+++ b/gdb/testsuite/gdb.base/callexit.exp
@@ -17,7 +17,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested callexit.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/catch-fork-kill.exp b/gdb/testsuite/gdb.base/catch-fork-kill.exp
index 29d2077..a25147e 100644
--- a/gdb/testsuite/gdb.base/catch-fork-kill.exp
+++ b/gdb/testsuite/gdb.base/catch-fork-kill.exp
@@ -41,7 +41,7 @@ foreach kind {"fork" "vfork"} {
     set testfile [set testfile_$kind]
     if {[build_executable $testfile.exp $testfile ${srcfile} \
 	     ${compile_options}] == -1} {
-	untested "failed to compile $testfile"
+	untested "failed to compile"
 	return -1
     }
 }
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 5e930ef..7662937 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -146,7 +146,7 @@ gdb_expect {
 # sets: "auto" and the default.  In this situation, this set of tests
 # is pointless.
 if {[llength [array names charsets]] < 3} {
-    untested charset.exp
+    untested "fewer than 3 charsets"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index 0c52092..73ea08a 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -38,7 +38,7 @@ if {[is_remote host]} {
 
 if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \
 	 [list debug "additional_flags=-DPI_TXT=\"$pi_txt\" -DCOPY1_TXT=\"$copy1_txt\""]]} {
-     untested checkpoint.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/comprdebug.exp b/gdb/testsuite/gdb.base/comprdebug.exp
index 08d48ea..09d426c 100644
--- a/gdb/testsuite/gdb.base/comprdebug.exp
+++ b/gdb/testsuite/gdb.base/comprdebug.exp
@@ -18,7 +18,7 @@ standard_testfile average.c
 set ofile "${binfile}0.o"
 if {[gdb_compile $srcdir/$subdir/$srcfile $ofile \
 	 object {debug}] != ""} {
-    untested comprdebug.exp
+    untested "failed to compile"
     return
 }
 
@@ -30,7 +30,7 @@ verbose "result is $result"
 verbose "output is $output"
 
 if {$result == 1} {
-    untested comprdebug.exp
+    untested "failed to execute objcopy"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index d6bae74..48cebe5 100644
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ b/gdb/testsuite/gdb.base/constvars.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
-    untested constvars.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/coredump-filter.exp b/gdb/testsuite/gdb.base/coredump-filter.exp
index bf1e8a5..5749418 100644
--- a/gdb/testsuite/gdb.base/coredump-filter.exp
+++ b/gdb/testsuite/gdb.base/coredump-filter.exp
@@ -22,7 +22,7 @@ if ![istarget *-*-linux*] then {
 }
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
-    untested "could not compile test program"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/cursal.exp b/gdb/testsuite/gdb.base/cursal.exp
index efaa7c7..6834d76 100644
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ b/gdb/testsuite/gdb.base/cursal.exp
@@ -17,7 +17,7 @@
 standard_testfile
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != ""} {
-    untested "couldn't compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/cvexpr.exp b/gdb/testsuite/gdb.base/cvexpr.exp
index 4bdda762..26dd714 100644
--- a/gdb/testsuite/gdb.base/cvexpr.exp
+++ b/gdb/testsuite/gdb.base/cvexpr.exp
@@ -25,7 +25,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested cvexpr.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/detach.exp b/gdb/testsuite/gdb.base/detach.exp
index b9343ee..4095f90 100644
--- a/gdb/testsuite/gdb.base/detach.exp
+++ b/gdb/testsuite/gdb.base/detach.exp
@@ -26,7 +26,7 @@ standard_testfile attach.c
 set escapedbinfile  [string_to_regexp ${binfile}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested detach.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index 9576be54..c02fcf5 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -20,7 +20,7 @@ standard_testfile
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile \
 	 {debug nowarnings}]} {
-    untested display.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dmsym.exp b/gdb/testsuite/gdb.base/dmsym.exp
index b071424..3f59aea 100644
--- a/gdb/testsuite/gdb.base/dmsym.exp
+++ b/gdb/testsuite/gdb.base/dmsym.exp
@@ -26,7 +26,7 @@ set dmsym_o [standard_output_file dmsym.o]
 if {[gdb_compile "${srcdir}/${subdir}/dmsym.c" \
                  $dmsym_o \
                  object {}] != ""} {
-  untested dmsym.exp
+  untested "failed to compile object file"
   return -1
 }
 
@@ -34,7 +34,7 @@ if {[gdb_compile \
       [list ${srcdir}/${subdir}/dmsym_main.c $dmsym_o] \
       [standard_output_file ${testfile}] \
       executable {debug}] != ""} {
-    untested dmsym.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dprintf-pending.exp b/gdb/testsuite/gdb.base/dprintf-pending.exp
index 10df3fb..4a5fa93 100644
--- a/gdb/testsuite/gdb.base/dprintf-pending.exp
+++ b/gdb/testsuite/gdb.base/dprintf-pending.exp
@@ -32,7 +32,7 @@ if { [get_compiler_info] } {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "failed to compile shared library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dso2dso.exp b/gdb/testsuite/gdb.base/dso2dso.exp
index f620d2c..bcec731 100644
--- a/gdb/testsuite/gdb.base/dso2dso.exp
+++ b/gdb/testsuite/gdb.base/dso2dso.exp
@@ -41,13 +41,13 @@ set binfile_libdso1 [standard_output_file $libdso1.so]
 
 if { [gdb_compile_shlib $srcfile_libdso2 $binfile_libdso2 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "could not compile $binfile_libdso2."
+  untested "failed to compile shared library 2"
   return -1
 }
 
 if { [gdb_compile_shlib $srcfile_libdso1 $binfile_libdso1 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "could not compile $binfile_libdso1."
+  untested "failed to compile shared library 1"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dtrace-probe.exp b/gdb/testsuite/gdb.base/dtrace-probe.exp
index c4f1a78..06a7ae0 100644
--- a/gdb/testsuite/gdb.base/dtrace-probe.exp
+++ b/gdb/testsuite/gdb.base/dtrace-probe.exp
@@ -23,7 +23,7 @@ proc dtrace_test {} {
     standard_testfile
     
     if {[dtrace_build_usdt_test_program] == -1} {
-        untested "could not compile test program"
+        untested "failed to compile"
         return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index a38f9d1..58b0121 100644
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -37,7 +37,7 @@ if {[istarget "spu*-*-*"]} then {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ${options}] != "" } {
-     untested dump.exp
+     untested "failed to compile"
      return -1
 }
 
@@ -95,7 +95,7 @@ remote_exec host "rm -f $filenames"
 # Run target program until data structs are initialized.
 
 if { ! [ runto checkpoint1 ] } then {
-    untested dump.exp
+    untested "couldn't run to checkpoint"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/enum_cond.exp b/gdb/testsuite/gdb.base/enum_cond.exp
index 4be8a8a..6626b01 100644
--- a/gdb/testsuite/gdb.base/enum_cond.exp
+++ b/gdb/testsuite/gdb.base/enum_cond.exp
@@ -21,7 +21,7 @@ standard_testfile .c
 
 set opts [list debug additional_flags=-fshort-enums]
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
-    untested "could not compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/exe-lock.exp b/gdb/testsuite/gdb.base/exe-lock.exp
index 8cb8f9d..b09609f 100644
--- a/gdb/testsuite/gdb.base/exe-lock.exp
+++ b/gdb/testsuite/gdb.base/exe-lock.exp
@@ -23,7 +23,7 @@ standard_testfile arrayidx.c
 append binfile $EXEEXT
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
index a089e89..b31da3d 100644
--- a/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
+++ b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp
@@ -29,12 +29,12 @@ set compile_options debug
 
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $compile_options] != "" } {
-    untested "could not compile test program ${binfile2}"
+    untested "failed to compile secondary testcase"
     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $compile_options] != "" } {
-    untested "could not compile test program ${binfile}"
+    untested "failed to compile main testcase"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
index 1c2713f..ad648f0 100644
--- a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
+++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
@@ -28,7 +28,7 @@ set exec2 ${binfile}2
 
 if { [gdb_compile [file join $srcdir $subdir $srcfile] $objfile \
 	  object [list debug]] != "" } {
-    untested "compile failed"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp
index 446f8cc..2b17270 100644
--- a/gdb/testsuite/gdb.base/exprs.exp
+++ b/gdb/testsuite/gdb.base/exprs.exp
@@ -22,7 +22,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested exprs.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index 5dd2f20..2265a15 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -32,7 +32,7 @@ if {[is_remote host]} {
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	   executable \
 	   [list debug "additional_flags=-DOUTDIR=\"$outdir/\""]] != "" } {
-    untested fileio.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/find.exp b/gdb/testsuite/gdb.base/find.exp
index c4bdfb7..b6e96af 100644
--- a/gdb/testsuite/gdb.base/find.exp
+++ b/gdb/testsuite/gdb.base/find.exp
@@ -18,7 +18,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested find.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp
index c5387bb..35294cc 100644
--- a/gdb/testsuite/gdb.base/finish.exp
+++ b/gdb/testsuite/gdb.base/finish.exp
@@ -90,7 +90,7 @@ proc finish_tests { } {
     global gdb_prompt skip_float_test
 
     if { ! [ runto_main ] } then {
-	untested finish.exp
+	untested "couldn't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/fixsection.exp b/gdb/testsuite/gdb.base/fixsection.exp
index 5b7fdf6..c000562 100644
--- a/gdb/testsuite/gdb.base/fixsection.exp
+++ b/gdb/testsuite/gdb.base/fixsection.exp
@@ -34,7 +34,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile \
 	     executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp
index 481dcb7..f3e4d0e 100644
--- a/gdb/testsuite/gdb.base/foll-vfork.exp
+++ b/gdb/testsuite/gdb.base/foll-vfork.exp
@@ -30,7 +30,7 @@ standard_testfile
 set compile_options debug
 
 if {[build_executable $testfile.exp $testfile $srcfile $compile_options] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile main testcase"
     return -1
 }
 
@@ -38,7 +38,7 @@ set testfile2 "vforked-prog"
 set srcfile2 ${testfile2}.c
 
 if {[build_executable $testfile.exp $testfile2 $srcfile2 $compile_options] == -1} {
-    untested "failed to compile $testfile2"
+    untested "failed to compile secondary testcase"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/frame-args.exp b/gdb/testsuite/gdb.base/frame-args.exp
index 08eb5d8..dbda4a9 100644
--- a/gdb/testsuite/gdb.base/frame-args.exp
+++ b/gdb/testsuite/gdb.base/frame-args.exp
@@ -15,7 +15,7 @@
 
 standard_testfile .c
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index a41f8e5..9f27170 100644
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ b/gdb/testsuite/gdb.base/gcore.exp
@@ -20,12 +20,12 @@
 standard_testfile
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-    untested $testfile.exp
+    untested "failed to compile"
     return -1
 }
 
 if { ! [ runto_main ] } then {
-    untested gcore.exp
+    untested "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/gdb1250.exp b/gdb/testsuite/gdb.base/gdb1250.exp
index 1a7c8e4..3d5cf54 100644
--- a/gdb/testsuite/gdb.base/gdb1250.exp
+++ b/gdb/testsuite/gdb.base/gdb1250.exp
@@ -25,7 +25,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested gdb1250.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp b/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
index 7285962..2ce198e 100644
--- a/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
+++ b/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp
@@ -29,13 +29,13 @@ set binfile_lib2 [standard_output_file $lib2name.so]
 
 if { [gdb_compile_shlib $srcfile_lib1 $binfile_lib1 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "could not compile $binfile_lib1."
+  untested "failed to compile shared library 1"
   return -1
 }
 
 if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \
 	[list debug additional_flags=-fPIC]] != "" } {
-  untested "could not compile $binfile_lib2."
+  untested "failed to compile shared library 2"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp
index ce9e11f..4b0b162 100644
--- a/gdb/testsuite/gdb.base/gnu-ifunc.exp
+++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp
@@ -52,7 +52,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/$libsrc $lib_so $lib_opts] != ""
      || [gdb_compile ${srcdir}/${subdir}/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile dynamic executable $binfile."
+    untested "failed to compile first testcase"
     return -1
 }
 
@@ -144,7 +144,7 @@ gdb_test "info sym $expect_out(1,string)" "gnu_ifunc in section .*" "info sym <g
 
 if { [gdb_compile ${srcdir}/${subdir}/$libsrc $lib_o object {}] != ""
      || [gdb_compile "${srcdir}/${subdir}/$srcfile $lib_o" $staticbinfile executable {debug}] != "" } {
-    untested "could not compile static executable $staticbinfile."
+    untested "failed to compile second testcase"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hashline1.exp b/gdb/testsuite/gdb.base/hashline1.exp
index c57d4a6..d0e86ce 100644
--- a/gdb/testsuite/gdb.base/hashline1.exp
+++ b/gdb/testsuite/gdb.base/hashline1.exp
@@ -33,7 +33,7 @@ close $fd
 # the bug.  Using $new_srcfile here won't trigger the bug.
 set compile_name [relative_filename $objdir $new_srcfile]
 if { [gdb_compile $compile_name "${binfile}" executable {debug}] != "" } {
-    untested hashline1.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hashline2.exp b/gdb/testsuite/gdb.base/hashline2.exp
index bbdb5bd..fce6e7e 100644
--- a/gdb/testsuite/gdb.base/hashline2.exp
+++ b/gdb/testsuite/gdb.base/hashline2.exp
@@ -30,7 +30,7 @@ puts $fd "int main () { return 0; } /* set breakpoint here */"
 close $fd
 
 if { [gdb_compile $new_srcfile "${binfile}" executable {debug}] != "" } {
-    untested hashline2.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hashline3.exp b/gdb/testsuite/gdb.base/hashline3.exp
index a2a9b3d..ace14dc 100644
--- a/gdb/testsuite/gdb.base/hashline3.exp
+++ b/gdb/testsuite/gdb.base/hashline3.exp
@@ -31,7 +31,7 @@ puts $fd "int main () { return 0; } /* set breakpoint here */"
 close $fd
 
 if { [gdb_compile $new_srcfile "${binfile}" executable {debug}] != "" } {
-    untested hashline3.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
index 28ab3d6..dee3bca 100644
--- a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
+++ b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib_src} ${lib_so} $lib_opts] != ""
      || [gdb_compile ${srcdir}/${subdir}/${main_src} ${binfile} executable $exec_opts] != ""} {
-    untested "could not compile ${subdir}/$lib_src or ${subdir}/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp
index 4dca89b..e95acd5 100644
--- a/gdb/testsuite/gdb.base/huge.exp
+++ b/gdb/testsuite/gdb.base/huge.exp
@@ -31,7 +31,7 @@ for { set size [expr 2 * 1024 * 1024] } { $size > 10 } { set size [expr $size /
       == "" } break
 }
 if { $size < 10 } {
-     untested huge.exp
+     untested "size less than 10"
      return -1
 }
 
@@ -43,7 +43,7 @@ set prev_timeout $timeout
 set timeout 30
 
 if { ! [ runto_main ] } then {
-    untested huge.exp
+    untested "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.base/infcall-input.exp
index c970c0e..5e764f0 100644
--- a/gdb/testsuite/gdb.base/infcall-input.exp
+++ b/gdb/testsuite/gdb.base/infcall-input.exp
@@ -24,7 +24,7 @@ if [target_info exists gdb,cannot_call_functions] {
 }
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-    untested "compile failed"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp
index 2eec698..a5503e2 100644
--- a/gdb/testsuite/gdb.base/info-fun.exp
+++ b/gdb/testsuite/gdb.base/info-fun.exp
@@ -40,7 +40,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $sep_lib_flags] != ""
 	 || [gdb_compile $srcdir/$subdir/${srcfile} ${binfile} \
 		 executable $bin_flags] != "" } {
-      untested "could not compile $binfile_lib or $binfile."
+      untested "failed to compile"
       return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/info-shared.exp b/gdb/testsuite/gdb.base/info-shared.exp
index 57aa1d0..e80326a 100644
--- a/gdb/testsuite/gdb.base/info-shared.exp
+++ b/gdb/testsuite/gdb.base/info-shared.exp
@@ -31,13 +31,13 @@ set define2 -DSHLIB2_NAME=\"$binfile_lib2\"
 
 if { [gdb_compile_shlib $srcfile_lib1 $binfile_lib1 \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "could not compile $binfile_lib1."
+    untested "failed to compile shared library 1"
     return -1
 }
 
 if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "could not compile $binfile_lib2."
+    untested "failed to compile shared library 2"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/jit-simple.exp b/gdb/testsuite/gdb.base/jit-simple.exp
index c1a079a..30e41e1 100644
--- a/gdb/testsuite/gdb.base/jit-simple.exp
+++ b/gdb/testsuite/gdb.base/jit-simple.exp
@@ -64,12 +64,12 @@ proc build_shared_jit {{options ""}} {
 }
 
 if {[build_standalone_jit] == -1} {
-    untested "could not compile $binfile"
+    untested "failed to compile standalone testcase"
     return
 }
 
 if {[build_shared_jit] == -1} {
-    untested "could not compile $binfile_lib"
+    untested "failed to compile shared library testcase"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/jit-so.exp b/gdb/testsuite/gdb.base/jit-so.exp
index b2e2955..f9c6e13 100644
--- a/gdb/testsuite/gdb.base/jit-so.exp
+++ b/gdb/testsuite/gdb.base/jit-so.exp
@@ -17,13 +17,12 @@
 # library.
 
 if {[skip_shlib_tests]} {
-    untested jit-so.exp
+    untested "skipping shared library tests"
     return -1
 }
 
 if {[get_compiler_info]} {
-    warning "Could not get compiler info"
-    untested jit-so.exp
+    untested "could not get compiler info"
     return 1
 }
 
@@ -35,7 +34,7 @@ set testfile jit-dlmain
 set srcfile ${testfile}.c
 set binfile [standard_output_file ${testfile}]
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } {
-    untested jit-so.exp
+    untested "failed to compile"
     return -1
 }
 
@@ -44,7 +43,7 @@ set srcfile2 ${testfile2}.c
 set binfile2 [standard_output_file ${testfile2}.so]
 set binfile2_dlopen [shlib_target_file ${testfile2}.so]
 if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug additional_flags="-DMAIN=jit_dl_main"}] != "" } {
-    untested jit.exp
+    untested "failed to compile main shared library"
     return -1
 }
 
@@ -57,7 +56,7 @@ set solib_binfile_test_msg "SHLIBDIR/${solib_testfile}.so"
 # renaming by munging on its symbol table, and that wouldn't work for .debug
 # sections.  Also, output for "info function" changes when debug info is resent.
 if { [gdb_compile_shlib ${solib_srcfile} ${solib_binfile} {}] != "" } {
-    untested jit-so.exp
+    untested "failed to compile jit shared library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/jit.exp b/gdb/testsuite/gdb.base/jit.exp
index 528c330..689bc27 100644
--- a/gdb/testsuite/gdb.base/jit.exp
+++ b/gdb/testsuite/gdb.base/jit.exp
@@ -14,13 +14,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if {[skip_shlib_tests]} {
-    untested jit.exp
+    untested "skipping shared library tests"
     return -1
 }
 
 if {[get_compiler_info]} {
-    warning "Could not get compiler info"
-    untested jit.exp
+    untested "could not get compiler info"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.base/jump.exp b/gdb/testsuite/gdb.base/jump.exp
index 7e03d90..37f56dd 100644
--- a/gdb/testsuite/gdb.base/jump.exp
+++ b/gdb/testsuite/gdb.base/jump.exp
@@ -20,7 +20,7 @@ standard_testfile .c
 
 # Build the test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested jump.exp
+     untested "failed to compile"
      return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/label.exp b/gdb/testsuite/gdb.base/label.exp
index 18b6f83..2901c33 100644
--- a/gdb/testsuite/gdb.base/label.exp
+++ b/gdb/testsuite/gdb.base/label.exp
@@ -26,7 +26,7 @@ if [is_remote target] then {
 standard_testfile .c
 
 if { [prepare_for_testing ${testfile}.exp $testfile ${srcfile} debug] } {
-    untested label.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/lineinc.exp b/gdb/testsuite/gdb.base/lineinc.exp
index 4070f4e..97b61d4 100644
--- a/gdb/testsuite/gdb.base/lineinc.exp
+++ b/gdb/testsuite/gdb.base/lineinc.exp
@@ -81,7 +81,7 @@
 standard_testfile .c
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" ${binfile} executable {debug}] != ""} {
-    untested lineinc.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp
index 1efc5f6..99e7a86 100644
--- a/gdb/testsuite/gdb.base/logical.exp
+++ b/gdb/testsuite/gdb.base/logical.exp
@@ -28,7 +28,7 @@
 standard_testfile int-type.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested logical.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/longjmp.exp b/gdb/testsuite/gdb.base/longjmp.exp
index b8d67fd..e0e47a7 100644
--- a/gdb/testsuite/gdb.base/longjmp.exp
+++ b/gdb/testsuite/gdb.base/longjmp.exp
@@ -21,7 +21,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested longjmp.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index aec18fb..a3246c5 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -30,7 +30,7 @@ if [test_compiler_info gcc*] {
 if  {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${objfile}" \
 	  object $options] != "" 
      || [gdb_compile "${objfile}" "${binfile}" executable $options] != "" } {
-    untested macscp.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index 059c434..297f792 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -40,7 +40,7 @@ set additional_flags "additional_flags=${storage}"
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ${additional_flags} nowarnings]] != "" } {
-    untested miscexprs.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/new-ui-echo.exp b/gdb/testsuite/gdb.base/new-ui-echo.exp
index c182445..ab923da 100644
--- a/gdb/testsuite/gdb.base/new-ui-echo.exp
+++ b/gdb/testsuite/gdb.base/new-ui-echo.exp
@@ -24,7 +24,7 @@ standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
index 325c30f..c51d878 100644
--- a/gdb/testsuite/gdb.base/new-ui-pending-input.exp
+++ b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
@@ -21,7 +21,7 @@ standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/new-ui.exp b/gdb/testsuite/gdb.base/new-ui.exp
index 22e8b79..52b81ec 100644
--- a/gdb/testsuite/gdb.base/new-ui.exp
+++ b/gdb/testsuite/gdb.base/new-ui.exp
@@ -17,7 +17,7 @@ standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp
index e0dd0e1..ff69c04 100644
--- a/gdb/testsuite/gdb.base/nodebug.exp
+++ b/gdb/testsuite/gdb.base/nodebug.exp
@@ -31,7 +31,7 @@ if [test_compiler_info "xlc-*"] {
 }
 
 if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "couldn't compile $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/nofield.exp b/gdb/testsuite/gdb.base/nofield.exp
index 9b06ba1..b8837b7 100644
--- a/gdb/testsuite/gdb.base/nofield.exp
+++ b/gdb/testsuite/gdb.base/nofield.exp
@@ -16,7 +16,7 @@
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/offsets.exp b/gdb/testsuite/gdb.base/offsets.exp
index b65fac7..9637eab 100644
--- a/gdb/testsuite/gdb.base/offsets.exp
+++ b/gdb/testsuite/gdb.base/offsets.exp
@@ -19,7 +19,7 @@ standard_testfile offsets.c
 
 if { [prepare_for_testing "failed to prepare for testing large offsets" \
 	  ${testfile} ${srcfile}] } {
-    untested offsets.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp
index b76f445..6b02bdf 100644
--- a/gdb/testsuite/gdb.base/overlays.exp
+++ b/gdb/testsuite/gdb.base/overlays.exp
@@ -42,7 +42,7 @@ standard_testfile overlays.c ovlymgr.c foo.c bar.c baz.c grbx.c
 if {[build_executable $testfile.exp $testfile \
 	 [list $srcfile $srcfile2 $srcfile3 $srcfile4 $srcfile5 $srcfile6] \
 	 {debug ldscript=-Wl,-T$linker_script}] == -1} {
-     untested overlays.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index e89f4a9..26f95a0 100644
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -37,7 +37,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
index fa1fe3e..03e70ee 100644
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ b/gdb/testsuite/gdb.base/pointers.exp
@@ -28,7 +28,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested pointers.exp
+     untested "failed to compile"
      return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/pr11022.exp b/gdb/testsuite/gdb.base/pr11022.exp
index c8b4be8..d6b6150 100644
--- a/gdb/testsuite/gdb.base/pr11022.exp
+++ b/gdb/testsuite/gdb.base/pr11022.exp
@@ -20,7 +20,7 @@ if {[skip_hw_watchpoint_tests]} {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested pr11022.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index bdddde6..c0cfeb4 100644
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -23,7 +23,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested printcmds.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/prologue.exp b/gdb/testsuite/gdb.base/prologue.exp
index efd7e0c..f2412f1 100644
--- a/gdb/testsuite/gdb.base/prologue.exp
+++ b/gdb/testsuite/gdb.base/prologue.exp
@@ -19,7 +19,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested prologue.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/ptr-typedef.exp b/gdb/testsuite/gdb.base/ptr-typedef.exp
index e9f925d..212b338 100644
--- a/gdb/testsuite/gdb.base/ptr-typedef.exp
+++ b/gdb/testsuite/gdb.base/ptr-typedef.exp
@@ -16,7 +16,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/realname-expand.exp b/gdb/testsuite/gdb.base/realname-expand.exp
index d21a403..3d6bf47 100644
--- a/gdb/testsuite/gdb.base/realname-expand.exp
+++ b/gdb/testsuite/gdb.base/realname-expand.exp
@@ -32,7 +32,7 @@ if { [file type $srcfilelink] != "link" } {
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcfilelink}" "${binfile}" \
 		  executable {debug}] != "" } {
-    untested "cannot compile ${srcdir}/${subdir}/${srcfile} and ${srcfilelink}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/relativedebug.exp b/gdb/testsuite/gdb.base/relativedebug.exp
index 9563576..677b301 100644
--- a/gdb/testsuite/gdb.base/relativedebug.exp
+++ b/gdb/testsuite/gdb.base/relativedebug.exp
@@ -21,7 +21,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/relocate.exp
index 52fc3ce..62012c4 100644
--- a/gdb/testsuite/gdb.base/relocate.exp
+++ b/gdb/testsuite/gdb.base/relocate.exp
@@ -21,7 +21,7 @@ append binfile .o
 
 remote_exec build "rm -f ${binfile}"
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } {
-     untested relocate.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index b75540a..7bc54c3 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -26,7 +26,7 @@ gdb_start
 
 set result [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}]
 if {$result != "" } then {
-    untested remote.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp
index 3116dbf..376a1b4 100644
--- a/gdb/testsuite/gdb.base/reread.exp
+++ b/gdb/testsuite/gdb.base/reread.exp
@@ -23,7 +23,7 @@ set srcfile1 ${testfile1}.c
 set binfile1 [standard_output_file ${testfile1}$EXEEXT]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable {debug nowarnings}] != "" } {
-    untested reread.exp
+    untested "failed to compile first testcase"
     return -1
 }
 
@@ -35,7 +35,7 @@ set binfile2 [standard_output_file ${testfile2}$EXEEXT]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug nowarnings}] != ""
       && [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug nowarnings additional_flags=-DNO_SECTIONS}] != ""} {
-    untested reread.exp
+    untested "failed to compile second testcase"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/return2.exp b/gdb/testsuite/gdb.base/return2.exp
index 77be75e..520d685 100644
--- a/gdb/testsuite/gdb.base/return2.exp
+++ b/gdb/testsuite/gdb.base/return2.exp
@@ -19,7 +19,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested return2.exp
+     untested "failed to compile"
      return -1
 }
 
@@ -82,7 +82,7 @@ proc return2_tests { } {
     global gdb_prompt skip_float_test
 
     if { ! [ runto_main ] } then {
-	untested return2.exp
+	untested "couldn't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp
index 45174a5..b461782 100644
--- a/gdb/testsuite/gdb.base/savedregs.exp
+++ b/gdb/testsuite/gdb.base/savedregs.exp
@@ -33,7 +33,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sep.exp b/gdb/testsuite/gdb.base/sep.exp
index dc860f6..3c96bb5 100644
--- a/gdb/testsuite/gdb.base/sep.exp
+++ b/gdb/testsuite/gdb.base/sep.exp
@@ -16,7 +16,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested sep.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index c6694e6..77b46fc 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -32,7 +32,7 @@
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested sepdebug.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sepsymtab.exp b/gdb/testsuite/gdb.base/sepsymtab.exp
index 4f9a682..7d72896 100644
--- a/gdb/testsuite/gdb.base/sepsymtab.exp
+++ b/gdb/testsuite/gdb.base/sepsymtab.exp
@@ -21,7 +21,7 @@ standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	  executable {debug}] != "" } {
-    untested sepsymtab.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/set-inferior-tty.exp b/gdb/testsuite/gdb.base/set-inferior-tty.exp
index 1a5f49c..97d2bc6 100644
--- a/gdb/testsuite/gdb.base/set-inferior-tty.exp
+++ b/gdb/testsuite/gdb.base/set-inferior-tty.exp
@@ -17,7 +17,7 @@ standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp
index 93dd926..7db3c93 100644
--- a/gdb/testsuite/gdb.base/setshow.exp
+++ b/gdb/testsuite/gdb.base/setshow.exp
@@ -19,7 +19,7 @@
 standard_testfile .c
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug}] != "" } {
-     untested setshow.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp
index fff1471..762a3f3 100644
--- a/gdb/testsuite/gdb.base/shlib-call.exp
+++ b/gdb/testsuite/gdb.base/shlib-call.exp
@@ -50,7 +50,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib ${lib1src} ${lib1} $lib_opts] != ""
      || [gdb_compile_shlib ${lib2src} ${lib2} $lib_opts] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $exec_opts] != ""} {
-    untested "could not compile $lib1, $lib2, or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp
index 23373fc..1384642 100644
--- a/gdb/testsuite/gdb.base/sigaltstack.exp
+++ b/gdb/testsuite/gdb.base/sigaltstack.exp
@@ -31,7 +31,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}.c"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp
index 480110e..70900d4 100644
--- a/gdb/testsuite/gdb.base/siginfo-addr.exp
+++ b/gdb/testsuite/gdb.base/siginfo-addr.exp
@@ -28,7 +28,7 @@ if [target_info exists gdb,nosignals] {
 
 standard_testfile
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-    untested "couldn't compile ${srcfile}.c"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index 677e77f..5d7fdd1 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -22,7 +22,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested signals.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp
index 5a14bff..7822510 100644
--- a/gdb/testsuite/gdb.base/signull.exp
+++ b/gdb/testsuite/gdb.base/signull.exp
@@ -36,7 +36,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested signull.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp
index 82a9e0b..d7dd791 100644
--- a/gdb/testsuite/gdb.base/sigrepeat.exp
+++ b/gdb/testsuite/gdb.base/sigrepeat.exp
@@ -28,7 +28,7 @@ if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp
index 875242d..6c95c87 100644
--- a/gdb/testsuite/gdb.base/so-impl-ld.exp
+++ b/gdb/testsuite/gdb.base/so-impl-ld.exp
@@ -33,7 +33,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile \
 	     executable $exec_opts] != ""} {
-    untested "couldn't compile $libsrc or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp
index f4d6bb8..bc6cfa1 100644
--- a/gdb/testsuite/gdb.base/solib-display.exp
+++ b/gdb/testsuite/gdb.base/solib-display.exp
@@ -74,7 +74,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     }
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $sep_lib_flags] != ""
 	 || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-      untested "could not compile $binfile_lib or $binfile."
+      untested "failed to compile"
       return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/solib-overlap.exp b/gdb/testsuite/gdb.base/solib-overlap.exp
index 5b90894..dec00be 100644
--- a/gdb/testsuite/gdb.base/solib-overlap.exp
+++ b/gdb/testsuite/gdb.base/solib-overlap.exp
@@ -70,7 +70,7 @@ foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix "$prelink_lib1"
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
 	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""
 	 || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-	untested "could not compile ${binfile_lib1_test_msg}, ${binfile_lib2_test_msg} or ${binfile_test_msg}."
+	untested "failed to compile"
 	return -1
     }
 
@@ -92,7 +92,7 @@ foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix "$prelink_lib1"
 
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
 	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""} {
-	untested "could not recompile ${binfile_lib1_test_msg} or ${binfile_lib2_test_msg}."
+	untested "failed to compile shared library"
 	kill_wait_spawned_process $test_spawn_id
 	return -1
     }
diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp
index 9acd347..a080f2b 100644
--- a/gdb/testsuite/gdb.base/solib-search.exp
+++ b/gdb/testsuite/gdb.base/solib-search.exp
@@ -69,7 +69,7 @@ if { [gdb_compile_shlib ${srcfile1_lib} ${wrong_binfile1_lib} $wrong_lib_flags]
      || [gdb_compile_shlib ${srcfile2_lib} ${wrong_binfile2_lib} $wrong_lib_flags] != ""
      || [gdb_compile_shlib ${srcfile1_lib} ${right_binfile1_lib} $right_lib_flags] != ""
      || [gdb_compile_shlib ${srcfile2_lib} ${right_binfile2_lib} $right_lib_flags] != "" } {
-    untested "could not compile libs."
+    untested "failed to compile shared library"
     return -1
 }
 
@@ -78,7 +78,7 @@ remote_exec build "ln -sf ${right_lib_subdir}/${libname1}.so ${binfile1_lib}"
 remote_exec build "ln -sf ${right_lib_subdir}/${libname2}.so ${binfile2_lib}"
 if { [gdb_compile $srcdir/$subdir/${srcfile} ${binfile} \
 	  executable $bin_flags] != "" } {
-    untested "could not compile $binfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp
index 2d5631f..f74b90f 100644
--- a/gdb/testsuite/gdb.base/solib-symbol.exp
+++ b/gdb/testsuite/gdb.base/solib-symbol.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-  untested "could not compile $binfile_lib or $binfile."
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 912eb82..505894f 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -70,7 +70,7 @@ proc start_structs_test { types } {
 	# built the second test case since we can't use prototypes
 	warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES"
 	if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "${flags} additional_flags=-DNO_PROTOTYPES"] != "" } {
-	    untested structs.exp
+	    untested "failed to compile"
 	    return -1
 	}
     }
diff --git a/gdb/testsuite/gdb.base/structs2.exp b/gdb/testsuite/gdb.base/structs2.exp
index 5eaf936..fb20cd0 100644
--- a/gdb/testsuite/gdb.base/structs2.exp
+++ b/gdb/testsuite/gdb.base/structs2.exp
@@ -27,7 +27,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     # built the second test case since we can't use prototypes
     warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES"
     if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DNO_PROTOTYPES}] != "" } {
-	untested structs2.exp
+	untested "failed to compile"
 	return -1
     }
     set prototypes 0
diff --git a/gdb/testsuite/gdb.base/symtab-search-order.exp b/gdb/testsuite/gdb.base/symtab-search-order.exp
index c8d058a..d4cf731 100644
--- a/gdb/testsuite/gdb.base/symtab-search-order.exp
+++ b/gdb/testsuite/gdb.base/symtab-search-order.exp
@@ -33,7 +33,7 @@ if [get_compiler_info] {
 if { [gdb_compile_shlib $lib1src $lib1 $lib_opts] != ""
      || [gdb_compile [list $srcfile $srcfile2] $binfile executable \
 	     $exec_opts] != ""} {
-    untested "could not compile $lib1, or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/twice.exp b/gdb/testsuite/gdb.base/twice.exp
index c0e8318..cd5b2ef 100644
--- a/gdb/testsuite/gdb.base/twice.exp
+++ b/gdb/testsuite/gdb.base/twice.exp
@@ -26,7 +26,7 @@ close $fileid
 gdb_remote_download host ${srcdir}/${subdir}/twice.c
 
 if  { [gdb_compile $local_srcfile "${binfile}" executable $options] != "" } {
-     untested twice.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/unload.exp b/gdb/testsuite/gdb.base/unload.exp
index aa25697..6644724 100644
--- a/gdb/testsuite/gdb.base/unload.exp
+++ b/gdb/testsuite/gdb.base/unload.exp
@@ -52,7 +52,7 @@ set exec_opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${lib_dlope
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""
      || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "couldn't compile $libsrc or $libsrc2 or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp
index 36b0107..33e6b0e 100644
--- a/gdb/testsuite/gdb.base/varargs.exp
+++ b/gdb/testsuite/gdb.base/varargs.exp
@@ -47,7 +47,7 @@ if [support_complex_tests] {
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	   executable ${additional_flags}] != "" } {
-     untested varargs.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/watchpoint-solib.exp b/gdb/testsuite/gdb.base/watchpoint-solib.exp
index 1ae972f..5626975 100644
--- a/gdb/testsuite/gdb.base/watchpoint-solib.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-solib.exp
@@ -42,7 +42,7 @@ set exec_opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${lib_dlope
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "couldn't compile $libsrc or $srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index fb20a0a..f8d20e0 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -23,7 +23,7 @@ if [get_compiler_info] {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested watchpoint.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index 0cdcf5b..9971968 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -28,7 +28,7 @@ if [target_info exists no_long_long] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $exec_opts] != "" } {
-     untested whatis.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp b/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
index cc4d879..589ed55 100644
--- a/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
+++ b/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
@@ -28,7 +28,7 @@ set opaque_objfile [standard_output_file "$opaque_testfile.o"]
 if {[gdb_compile "${srcdir}/${subdir}/$opaque_testfile.c" \
                  $opaque_objfile \
                  object {}] != ""} {
-  untested "failed to compile $opaque_testfile.c"
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp
index 05354f5..1e5b4f1 100644
--- a/gdb/testsuite/gdb.btrace/dlopen.exp
+++ b/gdb/testsuite/gdb.btrace/dlopen.exp
@@ -26,7 +26,7 @@ set binfile_lib [standard_output_file $basename_lib.so]
 
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib \
 	  [list additional_flags=-fPIC]] != "" } {
-    untested "could not compile $binfile_lib."
+    untested "failed to compile shared library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cell/ea-standalone.exp b/gdb/testsuite/gdb.cell/ea-standalone.exp
index 9f8f81c..7bd37ff 100644
--- a/gdb/testsuite/gdb.cell/ea-standalone.exp
+++ b/gdb/testsuite/gdb.cell/ea-standalone.exp
@@ -30,7 +30,7 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $srcfile $binary executable {debug}]  != "" } {
-  unsupported "compile spu binary failed, so all tests in this file will automatically fail."
+  unsupported "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.cell/ea-test.exp b/gdb/testsuite/gdb.cell/ea-test.exp
index 57ed9e2..853e492 100644
--- a/gdb/testsuite/gdb.cell/ea-test.exp
+++ b/gdb/testsuite/gdb.cell/ea-test.exp
@@ -30,7 +30,7 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $source $binary executable {debug}]  != "" } {
-  unsupported "compile spu binary failed, so all tests in this file will automatically fail."
+  unsupported "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/dispcxx.exp b/gdb/testsuite/gdb.cp/dispcxx.exp
index 3ca4c2b..0be6b78 100644
--- a/gdb/testsuite/gdb.cp/dispcxx.exp
+++ b/gdb/testsuite/gdb.cp/dispcxx.exp
@@ -18,7 +18,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 
 if [get_compiler_info "c++"] {
-    untested dispcxx.exp
+    untested "couldn't find a valid c++ compiler"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/gdb2384.exp b/gdb/testsuite/gdb.cp/gdb2384.exp
index 66c6cb1..75ee14b 100644
--- a/gdb/testsuite/gdb.cp/gdb2384.exp
+++ b/gdb/testsuite/gdb.cp/gdb2384.exp
@@ -36,7 +36,7 @@ if [get_compiler_info "c++"] {
 
 if { [gdb_compile_shlib $srcdir/$subdir/$srcfile2 $sofile {debug c++}] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug "c++" shlib=${sofile}]] != ""} {
-    untested gdb2384.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/method2.exp b/gdb/testsuite/gdb.cp/method2.exp
index a163b0c..5204a39 100644
--- a/gdb/testsuite/gdb.cp/method2.exp
+++ b/gdb/testsuite/gdb.cp/method2.exp
@@ -23,7 +23,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 
 if  {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
-     untested method2.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp
index 0a9973d..6d36c3f 100644
--- a/gdb/testsuite/gdb.cp/nextoverthrow.exp
+++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp
@@ -21,7 +21,7 @@ standard_testfile .cc
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info "c++"] {
-    untested nextoverthrow.exp
+    untested "couldn't find a valid c++ compiler"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/pr10728.exp b/gdb/testsuite/gdb.cp/pr10728.exp
index 39d1140..0696005 100644
--- a/gdb/testsuite/gdb.cp/pr10728.exp
+++ b/gdb/testsuite/gdb.cp/pr10728.exp
@@ -26,17 +26,17 @@ set tfx [standard_output_file pr10728-x.o]
 set tfy [standard_output_file pr10728-y.o]
 
 if  { [gdb_compile "${srcdir}/${subdir}/$srcfile2" "${tfy}.o" object {c++}] != "" } {
-     untested pr10728.exp
+     untested "failed to compile second object file"
      return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/$srcfile" "${tfx}.o" object {debug c++}] != "" } {
-     untested pr10728.exp
+     untested "failed to compile first object file"
      return -1
 }
 
 if  { [gdb_compile "${tfx}.o ${tfy}.o" ${binfile} executable {debug c++}] != "" } {
-     untested pr10728.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/am33.exp b/gdb/testsuite/gdb.disasm/am33.exp
index 73ad07f..7bc6d1b 100644
--- a/gdb/testsuite/gdb.disasm/am33.exp
+++ b/gdb/testsuite/gdb.disasm/am33.exp
@@ -27,7 +27,7 @@ set testfile "am33"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     untested am33.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/h8300s.exp b/gdb/testsuite/gdb.disasm/h8300s.exp
index 2d2c3d5..ee9cea4 100644
--- a/gdb/testsuite/gdb.disasm/h8300s.exp
+++ b/gdb/testsuite/gdb.disasm/h8300s.exp
@@ -25,7 +25,7 @@ set testfile "h8300s"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable {debug additional_flags=-ms}] != "" } {
-     untested h8300s.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/mn10300.exp b/gdb/testsuite/gdb.disasm/mn10300.exp
index 477211b..3e99d6d 100644
--- a/gdb/testsuite/gdb.disasm/mn10300.exp
+++ b/gdb/testsuite/gdb.disasm/mn10300.exp
@@ -27,7 +27,7 @@ set testfile "mn10300"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     untested mn10300.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/sh3.exp b/gdb/testsuite/gdb.disasm/sh3.exp
index 9e6e9f1..1f5ff64 100644
--- a/gdb/testsuite/gdb.disasm/sh3.exp
+++ b/gdb/testsuite/gdb.disasm/sh3.exp
@@ -25,7 +25,7 @@ set testfile "sh3"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     untested sh3.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
index 313b56f..2d1223e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
@@ -327,7 +327,7 @@ lappend opts "additional_flags=-DFDIR=\"fdir\""
 lappend opts "additional_flags=-DFILE=\"${srctmpfile}\""
 
 if { [gdb_compile "${asmsrcfile} ${srcdir}/${subdir}/$srcfile" "${binfile}" executable $opts] != "" } {
-    untested "cannot compile ${asmsrcfile} or $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fortran/complex.exp
index 7046ba2..961e427 100644
--- a/gdb/testsuite/gdb.fortran/complex.exp
+++ b/gdb/testsuite/gdb.fortran/complex.exp
@@ -16,7 +16,7 @@
 standard_testfile .f
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90 quiet}]} {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/gdb.fortran/library-module.exp
index e2f03c3..b7ffad9 100644
--- a/gdb/testsuite/gdb.fortran/library-module.exp
+++ b/gdb/testsuite/gdb.fortran/library-module.exp
@@ -24,7 +24,7 @@ if [get_compiler_info] {
 }
 
 if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90}] != "" } {
-    untested "couldn't compile ${srclibfile}"
+    untested "failed to compile shared library"
     return -1
 }
 
@@ -33,7 +33,7 @@ if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90
 # warnings on ignored $libfile abort the process.
 
 if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug f90 shlib=$libfile]] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-pretty-print.exp b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
index f17d827..2f7438d 100644
--- a/gdb/testsuite/gdb.guile/scm-pretty-print.exp
+++ b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
@@ -30,7 +30,7 @@ if { [skip_guile_tests] } { continue }
 proc run_lang_tests {exefile lang} {
     global srcdir subdir srcfile testfile hex
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "couldn't compile ${srcfile} in $lang mode"
+	untested "failed to compile in $lang mode"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.guile/scm-symbol.exp b/gdb/testsuite/gdb.guile/scm-symbol.exp
index e143045..3a7476d 100644
--- a/gdb/testsuite/gdb.guile/scm-symbol.exp
+++ b/gdb/testsuite/gdb.guile/scm-symbol.exp
@@ -138,7 +138,7 @@ gdb_test "guile (print (symbol-symtab t))" "= #<gdb:symtab .*gdb.guile/scm-symbo
 # C++ tests
 # Recompile binary.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "debug c++"] != "" } {
-    untested "couldn't compile ${srcfile} in c++ mode"
+    untested "failed to compile in C++ mode"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-type.exp b/gdb/testsuite/gdb.guile/scm-type.exp
index 455d948..604cf45 100644
--- a/gdb/testsuite/gdb.guile/scm-type.exp
+++ b/gdb/testsuite/gdb.guile/scm-type.exp
@@ -30,7 +30,7 @@ proc build_inferior {exefile lang} {
     global srcdir subdir srcfile
 
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "couldn't compile ${srcfile} in $lang mode"
+	untested "failed to compile in $lang mode"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
index 76ec990..062f2d1 100644
--- a/gdb/testsuite/gdb.guile/scm-value.exp
+++ b/gdb/testsuite/gdb.guile/scm-value.exp
@@ -39,7 +39,7 @@ proc build_inferior {exefile lang} {
 
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object "debug $lang"] != ""
 	 || [gdb_compile "${objfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "couldn't compile ${srcfile} in $lang mode"
+	untested "failed to compile in $lang mode"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.linespec/linespec.exp b/gdb/testsuite/gdb.linespec/linespec.exp
index 2fe4312..223d7d7 100644
--- a/gdb/testsuite/gdb.linespec/linespec.exp
+++ b/gdb/testsuite/gdb.linespec/linespec.exp
@@ -23,7 +23,7 @@ set baseone base/one/thefile.cc
 set basetwo base/two/thefile.cc
 
 if {[skip_cplus_tests]} {
-    unsupported linespec.exp
+    unsupported "skipping c++ tests"
     return
 }
 
diff --git a/gdb/testsuite/gdb.mi/gdb701.exp b/gdb/testsuite/gdb.mi/gdb701.exp
index be1fb85..65f6686 100644
--- a/gdb/testsuite/gdb.mi/gdb701.exp
+++ b/gdb/testsuite/gdb.mi/gdb701.exp
@@ -28,7 +28,7 @@ if [mi_gdb_start] {
 standard_testfile
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable debug] != ""} {
-  untested gdb701.exp
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/gdb792.exp b/gdb/testsuite/gdb.mi/gdb792.exp
index 7dfd08a..e723800 100644
--- a/gdb/testsuite/gdb.mi/gdb792.exp
+++ b/gdb/testsuite/gdb.mi/gdb792.exp
@@ -34,7 +34,7 @@ if [get_compiler_info "c++"] {
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} {
-  untested gdb792.exp
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
index dc42720..c49c5c8 100644
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
@@ -31,7 +31,7 @@ set lib_opts "debug"
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "could not compile either $libsrc1 or $libsrc2"
+    untested "failed to compile shared library"
     return -1
 }
 
@@ -39,7 +39,7 @@ set MIFLAGS "-i=mi"
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "failed to compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
index b1c870e..2f556d8 100644
--- a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
@@ -36,12 +36,12 @@ if {[get_compiler_info]} {
 }
 
 if {[gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""} {
-    untested "could not compile $libsrc1"
+    untested "failed to compile shared library"
     return -1
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile $srcdir/$subdir/$srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-dprintf.exp b/gdb/testsuite/gdb.mi/mi-dprintf.exp
index 760c756..4a3429f 100644
--- a/gdb/testsuite/gdb.mi/mi-dprintf.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf.exp
@@ -25,7 +25,7 @@ if [mi_gdb_start] {
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-exit-code.exp b/gdb/testsuite/gdb.mi/mi-exit-code.exp
index 2700c0a..dbbdbb4 100644
--- a/gdb/testsuite/gdb.mi/mi-exit-code.exp
+++ b/gdb/testsuite/gdb.mi/mi-exit-code.exp
@@ -24,7 +24,7 @@ if [mi_gdb_start] {
 standard_testfile
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 1a27733..f10fd4d 100644
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -41,12 +41,12 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "could not compile either $libsrc1 or $libsrc2"
+    untested "failed to compile shared library"
     return -1
 }
 
 if { [gdb_compile_pthreads $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile  $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp
index 6ac8c3a..e4936c4 100644
--- a/gdb/testsuite/gdb.mi/mi-solib.exp
+++ b/gdb/testsuite/gdb.mi/mi-solib.exp
@@ -42,7 +42,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile_main} ${binfile} executable $bin_flags] != "" } {
-  untested "could not compile $binfile_lib or $binfile."
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
index b0f6c31..89c9a92 100644
--- a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
+++ b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
@@ -25,7 +25,7 @@ load_lib mi-support.exp
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile ${srcfile} "debug"] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/pr11022.exp b/gdb/testsuite/gdb.mi/pr11022.exp
index 6f6902b..d59fa68 100644
--- a/gdb/testsuite/gdb.mi/pr11022.exp
+++ b/gdb/testsuite/gdb.mi/pr11022.exp
@@ -23,7 +23,7 @@ set MIFLAGS "-i=mi"
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested pr11022.exp
+     untested "failed to compile"
      return
 }
 
diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index 6b6ec2d..8c9e4e0 100644
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -42,7 +42,7 @@ if [use_gdb_stub] {
 
 set compile_options "debug pthreads"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
-    untested "failed to compile $testfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp
index d6ec632..8453324 100644
--- a/gdb/testsuite/gdb.opt/solib-intra-step.exp
+++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp
@@ -36,7 +36,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-  untested "could not compile $binfile_lib or $binfile."
+  untested "failed to compile"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index 144cc4b..449062f 100644
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -34,7 +34,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
index 218baed..03341f5 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
@@ -37,7 +37,7 @@ if [get_compiler_info] {
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "could not compile either $libsrc or $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp
index 6bbc510..3272f21 100644
--- a/gdb/testsuite/gdb.python/py-mi.exp
+++ b/gdb/testsuite/gdb.python/py-mi.exp
@@ -321,7 +321,7 @@ mi_gdb_test "-var-update c" \
 gdb_exit
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" \
 	   executable {debug c++ additional_flags=-DMI}] != "" } {
-    untested "couldn't compile ${srcfile} in c++ mode"
+    untested "failed to compile in C++ mode"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp
index 86491e4..9a1ed1f 100644
--- a/gdb/testsuite/gdb.python/py-prettyprint.exp
+++ b/gdb/testsuite/gdb.python/py-prettyprint.exp
@@ -30,7 +30,7 @@ if { [skip_python_tests] } { continue }
 proc run_lang_tests {exefile lang} {
     global srcdir subdir srcfile testfile hex
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-	untested "couldn't compile ${srcfile} in $lang mode"
+	untested "failed to compile in $lang mode"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp
index 3e049b3..d3ac906 100644
--- a/gdb/testsuite/gdb.python/py-shared.exp
+++ b/gdb/testsuite/gdb.python/py-shared.exp
@@ -28,14 +28,14 @@ set libsrc   ${libfile}.c
 set library  [standard_output_file ${libfile}.sl]
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${libsrc} ${library} "debug"] != "" } {
-    untested "could not compile shared library."
+    untested "failed to compile shared library"
     return -1
 }
 
 set exec_opts [list debug shlib=${library}]
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
-    untested "could not compile $binfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
index c4b3f2e..79abe64 100644
--- a/gdb/testsuite/gdb.python/py-symbol.exp
+++ b/gdb/testsuite/gdb.python/py-symbol.exp
@@ -127,7 +127,7 @@ gdb_test "python print (t\[0\].symtab)" "${py_symbol_c}" "get symtab"
 # C++ tests
 # Recompile binary.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "debug c++"] != "" } {
-    untested "couldn't compile ${srcfile} in c++ mode"
+    untested "failed to compile in C++ mode"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-template.exp b/gdb/testsuite/gdb.python/py-template.exp
index 28a5177..63f0bdd 100644
--- a/gdb/testsuite/gdb.python/py-template.exp
+++ b/gdb/testsuite/gdb.python/py-template.exp
@@ -21,7 +21,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 	  {debug c++}] != "" } {
-    untested "couldn't compile ${srcfile}"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index 782bd43..4a63f73 100644
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -29,7 +29,7 @@ proc build_inferior {exefile lang} {
   global srcdir subdir srcfile testfile hex
 
   if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
-      untested "couldn't compile ${srcfile} in $lang mode"
+      untested "failed to compile in $lang mode"
       return -1
   }
 
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index fb489e1..0585f8c 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -39,7 +39,7 @@ proc build_inferior {exefile lang} {
 
   if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object "debug $lang"] != ""
        || [gdb_compile "${objfile}" "${exefile}" executable "debug $lang"] != "" } {
-      untested "couldn't compile ${srcfile} in $lang mode"
+      untested "failed to compile in $lang mode"
       return -1
   }
   return 0
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 1db4f3f..6f33fbf 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -40,12 +40,12 @@ if [get_compiler_info] {
 # Compile the first without debug info so that
 # stepping and reverse stepping doesn't end up inside them.
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib1src} ${library1} ""] != "" } {
-    untested "could not compile shared library1."
+    untested "failed to compile shared library 1"
     return -1
 }
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib2src} ${library2} "debug"] != "" } {
-    untested "could not compile shared library2."
+    untested "failed to compile shared library 2"
     return -1
 }
 
@@ -58,7 +58,7 @@ set exec_opts [list debug shlib=${library1} shlib=${library2}]
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable \
 		     [concat $exec_opts additional_flags=-Wl,-z,norelro]] != ""
      && [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
-    untested "could not compile $binfile."
+    untested "failed to compile"
     return -1
 }
      
diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp
index 61c76d3..a90c4d2 100644
--- a/gdb/testsuite/gdb.reverse/solib-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp
@@ -38,19 +38,19 @@ if [get_compiler_info] {
 # Compile the first without debug info so that
 # stepping and reverse stepping doesn't end up inside them.
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib1src} ${library1} ""] != "" } {
-    untested "could not compile shared library1."
+    untested "failed to compile shared library 1"
     return -1
 }
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib2src} ${library2} "debug"] != "" } {
-    untested "could not compile shared library2."
+    untested "failed to compile shared library 2"
     return -1
 }
 
 set exec_opts [list debug shlib=${library1} shlib=${library2}]
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
-    untested "could not compile $binfile."
+    untested "failed to compile"
     return -1
 }
      
diff --git a/gdb/testsuite/gdb.server/solib-list.exp b/gdb/testsuite/gdb.server/solib-list.exp
index 57647e1..50edf6f 100644
--- a/gdb/testsuite/gdb.server/solib-list.exp
+++ b/gdb/testsuite/gdb.server/solib-list.exp
@@ -34,7 +34,7 @@ set binlibfile [standard_output_file ${testfile}.so]
 if { [get_compiler_info]
      || [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" "${binlibfile}" {debug}] != ""
      || [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "shlib=${binlibfile}"] != "" } {
-    untested "could not compile sources"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index b8c72da..af51252 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -271,7 +271,7 @@ if { [lindex $exec_output 0] != 0 } {
 }
 
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     untested weird.exp
+     untested "failed to compile"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/reconnect-signal.exp b/gdb/testsuite/gdb.threads/reconnect-signal.exp
index 1d134e2..0a3c17d 100644
--- a/gdb/testsuite/gdb.threads/reconnect-signal.exp
+++ b/gdb/testsuite/gdb.threads/reconnect-signal.exp
@@ -27,7 +27,7 @@ if { [gdb_compile_pthreads \
 	  "${srcdir}/${subdir}/${srcfile}" \
 	  "${binfile}" \
 	  executable {debug}] != "" } {
-    untested "couldn't compile test program."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/stepi-random-signal.exp b/gdb/testsuite/gdb.threads/stepi-random-signal.exp
index 5e558dd..2e28209 100644
--- a/gdb/testsuite/gdb.threads/stepi-random-signal.exp
+++ b/gdb/testsuite/gdb.threads/stepi-random-signal.exp
@@ -20,7 +20,7 @@ if { [gdb_compile_pthreads \
 	  "${srcdir}/${subdir}/${srcfile}" \
 	  "${binfile}" \
 	  executable {debug}] != "" } {
-    untested "couldn't compile test program."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index 46890f5..cd23cb4 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested actions.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp
index 5e9783f..979a5f3 100644
--- a/gdb/testsuite/gdb.trace/ax.exp
+++ b/gdb/testsuite/gdb.trace/ax.exp
@@ -26,7 +26,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested ax.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index 44a7657..bdebc2e 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -91,13 +91,13 @@ gdb_test_multiple "list $baseline, +12" "all tests in this module will fail" {
     }
     -re ".*$gdb_prompt $" {
 	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    untested backtrace.exp
+	    untested "unexpected testline values"
 	    set return_me 1
 all tests in this module will fail."
 	}
     }
     default {
-	    untested backtrace.exp
+	    untested "couldn't match pattern"
 	    set return_me 1
 all tests in this module will fail."
     }
diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index 118060a..e579301 100644
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -39,7 +39,7 @@ set additional_flags [list debug shlib=$lib_sl1 shlib_load [gdb_target_symbol_pr
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $additional_flags] != ""} {
-    untested "could not compile either $libsrc1 or $srcdir/$subdir/$srcfile."
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index bffd575..04e7f5a 100644
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested deltrace.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
index b48d969..436062c 100644
--- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
+++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
@@ -30,7 +30,7 @@ set options [list debug [gdb_target_symbol_prefix_flags] \
 
 # Check that the target supports trace.
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
@@ -53,7 +53,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 lappend options shlib=$libipa
 
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "couldn't compile test program with in-process agent library"
+    untested "failed to compile with in-process agent library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index 8b720d4..97dff8c 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -46,7 +46,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 1561ead..be78d4c 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested infotrace.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
index 43b34c9..370c89f 100644
--- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
@@ -32,13 +32,13 @@ set lib_opts [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "could not compile either $libsrc1 or $libsrc2"
+    untested "failed to compile shared library"
     return -1
 }
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "failed to compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index a790063..25b7355 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested packetlen.exp
+    untested "failed to compile"
     return -1
 }
 gdb_load $binfile
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index df7e39d..0774a4e 100644
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -23,7 +23,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested passcount.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
index 28ffc28..30d14fa 100644
--- a/gdb/testsuite/gdb.trace/pending.exp
+++ b/gdb/testsuite/gdb.trace/pending.exp
@@ -31,13 +31,13 @@ set lib_opts [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
-    untested "could not compile either $libsrc1 or $libsrc2"
+    untested "failed to compile shared library"
     return -1
 }
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "failed to compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
@@ -508,7 +508,7 @@ gdb_load_shlib $libipa
 lappend exec_opts "shlib=$libipa"
 
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
-    untested "failed to compile $srcfile"
+    untested "failed to compile with in-process agent library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp
index 81da27d..88aa3ff 100644
--- a/gdb/testsuite/gdb.trace/range-stepping.exp
+++ b/gdb/testsuite/gdb.trace/range-stepping.exp
@@ -71,7 +71,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug nowarnings shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index f487ec6..ef7ef62 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -24,7 +24,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested report.exp
+    untested "failed to compile"
     return -1
 }
 gdb_load $binfile
@@ -97,13 +97,13 @@ gdb_test_multiple "list $gdb_recursion_test_baseline, +12" "" {
     }
     -re ".*$gdb_prompt $" {
 	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    untested report.exp
+	    untested "unexpected testline values"
 	    set return_me 1
 all tests in this module will fail."
 	}
     }
     default {
-	    untested report.exp
+	    untested "couldn't match pattern"
 	    set return_me 1
 all tests in this module will fail."
     } 
diff --git a/gdb/testsuite/gdb.trace/stap-trace.exp b/gdb/testsuite/gdb.trace/stap-trace.exp
index 4cb05d5..44583d1 100644
--- a/gdb/testsuite/gdb.trace/stap-trace.exp
+++ b/gdb/testsuite/gdb.trace/stap-trace.exp
@@ -42,7 +42,7 @@ proc compile_stap_bin {exec_name {arg ""}} {
     if { [gdb_compile "$srcdir/$subdir/$srcfile" \
 	      [standard_output_file $exec_name] \
 	      executable [concat $arg debug nowarnings]] != "" } {
-	untested "could not compile ${srcfile}"
+	untested "failed to compile"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index cfd7db3..39c54a1 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -25,7 +25,7 @@ standard_testfile actions.c
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
 	  executable {debug nowarnings}] != "" } {
-    untested tfind.exp
+    untested "failed to compile"
     return -1
 }
 gdb_load $binfile
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index b7b2ea1..facf061 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -357,7 +357,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp
index 0e93e51..02a0c0c 100644
--- a/gdb/testsuite/gdb.trace/trace-condition.exp
+++ b/gdb/testsuite/gdb.trace/trace-condition.exp
@@ -46,7 +46,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
index 43891fa..27c43f4 100644
--- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp
+++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
@@ -23,7 +23,7 @@ set options [list debug [gdb_target_symbol_prefix_flags]]
 
 # Check that the target supports trace.
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
@@ -46,7 +46,7 @@ gdb_load_shlib $libipa
 lappend options shlib=$libipa
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    untested "couldn't compile test program with in-process agent library"
+    untested "failed to compile with in-process agent library"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index bab2a61..795c65e 100644
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -23,7 +23,7 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags] ] != "" } {
-    untested "couldn't compile test program"
+    untested "failed to compile"
     return -1
 }
 
@@ -112,7 +112,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 # Compile test case again with IPA.
 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
-    untested "failed to compile ftrace tests"
+    untested "failed to compile with in-process agent library"
     return -1
 }
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 7ad6c91..6266e27 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -23,7 +23,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested tracecmd.exp
+    untested "failed to compile"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index 885fe23..8a9917c 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -22,7 +22,7 @@ set ipalib [get_in_proc_agent]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [concat {debug nowarnings c} shlib=$ipalib]] != "" } {
-    untested tspeed.exp
+    untested "failed to compile"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index a976480..a2e808a 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -21,7 +21,7 @@ gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested tsv.exp
+    untested "failed to compile"
     return -1
 }
 gdb_load $binfile
diff --git a/gdb/testsuite/lib/perftest.exp b/gdb/testsuite/lib/perftest.exp
index 2f8da14..082c10d 100644
--- a/gdb/testsuite/lib/perftest.exp
+++ b/gdb/testsuite/lib/perftest.exp
@@ -90,7 +90,7 @@ namespace eval PerfTest {
 
 	if { [string compare $GDB_PERFTEST_MODE "run"] != 0 } {
 	    if { [eval compile {$compile}] } {
-		untested "could not compile source files."
+		untested "failed to compile"
 		return
 	    }
 	}
-- 
2.7.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v3 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages
  2016-12-01 17:20     ` [PATCH v3 " Luis Machado
@ 2016-12-01 17:35       ` Pedro Alves
  2016-12-01 20:52         ` Luis Machado
  0 siblings, 1 reply; 33+ messages in thread
From: Pedro Alves @ 2016-12-01 17:35 UTC (permalink / raw)
  To: Luis Machado, gdb-patches

On 12/01/2016 05:20 PM, Luis Machado wrote:
> How about the following as the final version?

OK.

Thanks,
Pedro Alves

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH v3 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages
  2016-12-01 17:35       ` Pedro Alves
@ 2016-12-01 20:52         ` Luis Machado
  0 siblings, 0 replies; 33+ messages in thread
From: Luis Machado @ 2016-12-01 20:52 UTC (permalink / raw)
  To: Pedro Alves, gdb-patches

On 12/01/2016 11:35 AM, Pedro Alves wrote:
> On 12/01/2016 05:20 PM, Luis Machado wrote:
>> How about the following as the final version?
>
> OK.
>
> Thanks,
> Pedro Alves
>

Thanks. Pushed the series now.

^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2016-12-01 20:52 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-25 20:54 [PATCH v2 0/8] Fix gdb's testsuite test names Luis Machado
2016-11-25 20:54 ` [PATCH v2 6/8] Fix test names starting with uppercase using multi-line gdb_test_no_output Luis Machado
2016-11-30 20:12   ` Pedro Alves
2016-11-25 20:54 ` [PATCH v2 7/8] Fix test names starting with uppercase using multi-line gdb_test_multiple Luis Machado
2016-11-30 20:47   ` Pedro Alves
2016-11-30 21:05     ` Luis Machado
2016-11-30 22:14       ` Pedro Alves
2016-11-25 20:54 ` [PATCH v2 3/8] Fix test names starting with uppercase using gdb_test_no_output Luis Machado
2016-11-27 16:58   ` Yao Qi
2016-11-25 20:55 ` [PATCH v2 1/8] Fix test names starting with uppercase output by basic functions Luis Machado
2016-11-29 21:37   ` Yao Qi
2016-11-25 20:55 ` [PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple Luis Machado
2016-11-27 17:10   ` Yao Qi
2016-11-28 16:06     ` Luis Machado
2016-11-29 14:49       ` Yao Qi
2016-11-29 15:07         ` Luis Machado
2016-11-29 20:55           ` Yao Qi
2016-11-29 21:14             ` Luis Machado
2016-11-30 19:56               ` Pedro Alves
2016-11-25 20:55 ` [PATCH v2 5/8] Fix test names starting with uppercase using multi-line gdb_test/mi_gdb_test Luis Machado
2016-11-30 20:11   ` Pedro Alves
2016-11-30 20:25     ` Luis Machado
2016-11-25 20:55 ` [PATCH v2 2/8] Fix test names starting with uppercase using gdb_test on a single line Luis Machado
2016-11-27 16:48   ` Yao Qi
2016-11-28 18:13     ` [PATCH v3 " Luis Machado
2016-11-25 20:55 ` [PATCH v2 8/8] Fixup testcases outputting own name as a test name and standardize failed compilation messages Luis Machado
2016-12-01 11:08   ` Pedro Alves
2016-12-01 13:15     ` Luis Machado
2016-12-01 17:20     ` [PATCH v3 " Luis Machado
2016-12-01 17:35       ` Pedro Alves
2016-12-01 20:52         ` Luis Machado
2016-11-28 18:57 ` [PATCH v2 0/8] Fix gdb's testsuite test names Sergio Durigan Junior
2016-11-28 19:00   ` Luis Machado

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).