diff mbox

[v3,2/8] Fix test names starting with uppercase using gdb_test on a single line.

Message ID 1480356776-20424-1-git-send-email-lgustavo@codesourcery.com
State New
Headers show

Commit Message

Luis Machado Nov. 28, 2016, 6:12 p.m. UTC
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 mbox

Patch

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]+.*}