[PATCH v2 4/8] Fix test names starting with uppercase using gdb_test_multiple

Luis Machado
2016-11-25T20:54:51Z

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

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

Fix test names starting with uppercase throughout the files.

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

diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
index 005d1fc..cb2fedb 100644
--- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
+++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
@@ -51,7 +51,7 @@ if ![runto_main] then {

set function "standard"

-set retcode [gdb_test_multiple "disassemble $function" "Disassemble function '$function'" {
+set retcode [gdb_test_multiple "disassemble $function" "disassemble function '$function'" {
-re "($hex) <\\+0>.*($hex) <\\+$decimal>.*int3.*($hex) <\\+$decimal>.*leave.*$gdb_prompt $" {
set address_bp $expect_out(2,string)
set address_after_bp $expect_out(3,string)
diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index 9c05cab..83e1884 100644
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -71,7 +71,7 @@ gdb_test "up 3" \
"gate \\(\[^()\]*\\) at .*gate.c.*" \
"shift up to the modified frame"

-gdb_test_multiple "info frame" "Existence of the CFI inserted register" {
+gdb_test_multiple "info frame" "existence of the CFI inserted register" {
-re "Stack level 3, frame at (0x\[0-9a-f\]+):.*Saved registers:.* ecx at (0x\[0-9a-f\]+),.*" {
pass "existence of the CFI inserted register"
if { [string compare $expect_out(1,string) $expect_out(2,string)] } then {
diff --git a/gdb/testsuite/gdb.base/disasm-end-cu.exp b/gdb/testsuite/gdb.base/disasm-end-cu.exp
index 81b153f..38488f7 100644
--- a/gdb/testsuite/gdb.base/disasm-end-cu.exp
+++ b/gdb/testsuite/gdb.base/disasm-end-cu.exp
@@ -33,7 +33,7 @@ if {$main_addr == 0 || $dummy_3_addr == 0 || $dummy_3_addr <= $main_addr} {
return -1
}

-gdb_test_multiple "disassemble /m ${main_addr},${dummy_3_addr}" "Disassemble address range with source" {
+gdb_test_multiple "disassemble /m ${main_addr},${dummy_3_addr}" "disassemble address range with source" {
-re "Dump of assembler code from ${main_addr} to ${dummy_3_addr}:\r\nEnd of assembler dump\." {
fail "no output from the disassemble command"
}
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 22dcaac..aec18fb 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -195,7 +195,7 @@ proc list_and_check_macro {func macro expected} {

gdb_test "list main" ".*main.*" "list main for support check"
set macro_support "unknown"
-gdb_test_multiple "info source" "Test macro information" {
+gdb_test_multiple "info source" "test macro information" {
-re "Includes preprocessor macro info\..*$gdb_prompt $" {
set macro_support 1
verbose "Source has macro information"
diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index a1b497c..e89f4a9 100644
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -167,7 +167,7 @@ gdb_test "info break" \
#

set bp2_loc [gdb_get_line_number "y = x + 4" ${libfile}.c]
-gdb_test_multiple "break pendshr.c:$bp2_loc if x > 3" "Set pending breakpoint 2" {
+gdb_test_multiple "break pendshr.c:$bp2_loc if x > 3" "set pending breakpoint 2" {
-re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
gdb_test "y" "Breakpoint.*pendshr.c:$bp2_loc.*pending." \
"Set pending breakpoint 2"
@@ -189,7 +189,7 @@ gdb_test "info break" \
#

set bp3_loc [gdb_get_line_number "printf" ${libfile}.c]
-gdb_test_multiple "break pendshr.c:$bp3_loc" "Set pending breakpoint 3" {
+gdb_test_multiple "break pendshr.c:$bp3_loc" "set pending breakpoint 3" {
-re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
gdb_test "y" "Breakpoint.*pendshr.c:$bp3_loc.*pending." \
"Set pending breakpoint 3"
diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp
index 839bf84..2077121 100644
--- a/gdb/testsuite/gdb.base/watch_thread_num.exp
+++ b/gdb/testsuite/gdb.base/watch_thread_num.exp
@@ -58,7 +58,7 @@ gdb_test "break loop" "Breakpoint \[0-9\].*" \

gdb_test "continue" ".*Breakpoint .*loop.*" "stopped in loop"

-gdb_test_multiple "thread" "Thread command" {
+gdb_test_multiple "thread" "thread command" {
-re ".*Current thread is (\[0-9\]*).*$gdb_prompt $" {
pass "thread command"
}
diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp
index 5dd3449..81fde04 100644
--- a/gdb/testsuite/gdb.cp/exception.exp
+++ b/gdb/testsuite/gdb.cp/exception.exp
@@ -89,7 +89,7 @@ gdb_test "tbreak main" "Temporary breakpoint 4.*" \

set ok 0
gdb_run_cmd
-gdb_test_multiple "" "Run to main" {
+gdb_test_multiple "" "run to main" {
-re "Temporary breakpoint 4,.*$gdb_prompt $" {
pass "run to main"
set ok 1
diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp
index 7fe2b12..f80c30c 100644
--- a/gdb/testsuite/gdb.cp/gdb2495.exp
+++ b/gdb/testsuite/gdb.cp/gdb2495.exp
@@ -121,7 +121,7 @@ if ![runto_main] then {
# behaviour; it should not. Test both on and off states.

# Turn on unwind on signal behaviour.
-gdb_test_multiple "set unwindonsignal on" "Turn unwindonsignal on" {
+gdb_test_multiple "set unwindonsignal on" "turn unwindonsignal on" {
-re "$gdb_prompt $" {pass "set unwindonsignal on"}
timeout {fail "(timeout) set unwindonsignal on"}
}
@@ -137,7 +137,7 @@ gdb_test "p exceptions.raise_signal(1)" \
"To change this behavior use \"set unwindonsignal off\".*"

# And reverse - turn off again.
-gdb_test_multiple "set unwindonsignal off" "Turn unwindonsignal off" {
+gdb_test_multiple "set unwindonsignal off" "turn unwindonsignal off" {
-re "$gdb_prompt $" {pass "set unwindonsignal off"}
timeout {fail "(timeout) set unwindonsignal off"}
}
diff --git a/gdb/testsuite/gdb.cp/local.exp b/gdb/testsuite/gdb.cp/local.exp
index 62c1fd8..da63312 100644
--- a/gdb/testsuite/gdb.cp/local.exp
+++ b/gdb/testsuite/gdb.cp/local.exp
@@ -164,7 +164,7 @@ gdb_test "up" ".*main.*" "up from marker2"
# setup_kfail "gdb/825"

set eol "\[\t \]*\[\r\n\]+\[\t \]*"
-gdb_test_multiple "ptype Local" "Local out of scope" {
+gdb_test_multiple "ptype Local" "local out of scope" {
-re "No symbol \"Local\" in current context.*${gdb_prompt} $" {
pass "local out of scope"
}
diff --git a/gdb/testsuite/gdb.python/py-evsignal.exp b/gdb/testsuite/gdb.python/py-evsignal.exp
index 9cf2702..f725688 100644
--- a/gdb/testsuite/gdb.python/py-evsignal.exp
+++ b/gdb/testsuite/gdb.python/py-evsignal.exp
@@ -37,7 +37,7 @@ gdb_test "test-events" "Event testers registered."
gdb_test_no_output "set non-stop on"

gdb_run_cmd
-gdb_test_multiple "" "Signal Thread 3" {
+gdb_test_multiple "" "signal Thread 3" {
-re "event type: stop\r\nstop reason: signal\r\nstop signal: SIGUSR1\r\nthread num: 3\r\nevent type: stop\r\n.*$gdb_prompt $" {
pass "thread 3 was signaled"
}
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 14cfffe..b657016 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -322,7 +322,7 @@ gdb_test_multiple "set prompt blah " "set blah in GDB" {
}
}

-gdb_test_multiple "python gdb.prompt_hook = None" "Delete hook" {
+gdb_test_multiple "python gdb.prompt_hook = None" "delete hook" {
-re "\[\r\n\]$newprompt2 $" {
pass "delete old hook"
}
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 645dcbc..7ad6c91 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -161,7 +161,7 @@ gdb_test "help trace" "Set a tracepoint at .*" "1.14: help trace"
gdb_delete_tracepoints

# Acceptance vs rejection of a location are target-specific, so allow both.
-gdb_test_multiple "ftrace gdb_recursion_test" "Set a fast tracepoint" {
+gdb_test_multiple "ftrace gdb_recursion_test" "set a fast tracepoint" {
-re "Fast tracepoint $decimal at $hex: file.*$srcfile, line $testline1.*$gdb_prompt $" {
pass "set a fast tracepoint"
}
--
2.7.4