[gdb/testsuite] Remove test-case from test name
Remove test-cases from test-names, such that we don't have the redundant:
...
PASS: gdb.base/corefile.exp: backtrace in corefile.exp
...
but simply:
...
PASS: gdb.base/corefile.exp: backtrace
...
Fixed all instances found using:
...
$ grep ":.*:.*\.exp" gdb.sum
...
Tested on x86_64-linux.
diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
index 0bb808d..0a44c2d 100644
--- a/gdb/testsuite/gdb.base/corefile.exp
+++ b/gdb/testsuite/gdb.base/corefile.exp
@@ -152,8 +152,8 @@
# Somehow we better test the ability to read the registers out of the core
# file correctly. I don't think the other tests do this.
-gdb_test "bt" "abort.*func2.*func1.*main.*" "backtrace in corefile.exp"
-gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up in corefile.exp"
+gdb_test "bt" "abort.*func2.*func1.*main.*" "backtrace"
+gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up"
# Test ability to read mmap'd data
@@ -197,7 +197,7 @@
# test reinit_frame_cache
gdb_load ${binfile}
-gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up in corefile.exp (reinit)"
+gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up (reinit)"
gdb_test "core" "No core file now."
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index 04e5b8c..26741d5 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -46,7 +46,7 @@
gdb_load $binfile
# Hope this is unix :-)
gdb_test "shell stty intr '^C'" ".*" \
- "set interrupt character in interrupt.exp"
+ "set interrupt character"
if [runto_main] then {
global inferior_spawn_id gdb_spawn_id
diff --git a/gdb/testsuite/gdb.base/langs.exp b/gdb/testsuite/gdb.base/langs.exp
index a21ce5c..fdc8133 100644
--- a/gdb/testsuite/gdb.base/langs.exp
+++ b/gdb/testsuite/gdb.base/langs.exp
@@ -33,13 +33,13 @@
# Some tests require GCC.
set gcc_compiled [is_c_compiler_gcc]
-gdb_test_multiple "b -qualified langs0" "break on nonexistent function in langs.exp" {
+gdb_test_multiple "b -qualified langs0" "break on nonexistent function" {
-re "Function \"langs0\" not defined\..*Make breakpoint pending on future shared library load.*y or .n.. $" {
- gdb_test "n" "" "break on nonexistent function in langs.exp"
+ gdb_test "n" "" "break on nonexistent function"
}
-re "Breakpoint .* (deferred).*$gdb_prompt $" {
- pass "break on nonexistent function in langs.exp"
+ pass "break on nonexistent function"
}
}
@@ -53,44 +53,44 @@
if { !$isfixed } { set lang c }
gdb_test "show language" "currently $lang\".*" \
- "show language at csub in langs.exp"
+ "show language at csub"
- gdb_test "bt" "#0.*csub.*#1.*(foo|$foo_func) \\(.*#2.*cppsub_ .*#3.*fsub.*#4.*$do_func \\(.*#5 \[0-9a-fx\]* in main.*" "backtrace in langs.exp"
+ gdb_test "bt" "#0.*csub.*#1.*(foo|$foo_func) \\(.*#2.*cppsub_ .*#3.*fsub.*#4.*$do_func \\(.*#5 \[0-9a-fx\]* in main.*" "backtrace"
if { !$isfixed } { set lang c\\+\\+; set ext cxx }
if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
gdb_test "up" ".* in (foo|$foo_func).* at .*langs2\\.$ext.*return csub \\(.*" \
- "up to foo in langs.exp"
+ "up to foo"
gdb_test "show language" "currently $lang.*" \
- "show language at foo in langs.exp"
+ "show language at foo"
if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
gdb_test "up" ".* in cppsub_ .* at .*langs2\\.$ext.*return foo \\(.*" \
- "up to cppsub_ in langs.exp"
+ "up to cppsub_"
gdb_test "show language" "currently $lang.*" \
- "show language at cppsub_ in langs.exp"
+ "show language at cppsub_"
if { !$isfixed } { set lang fortran }
if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
gdb_test "up" ".* in fsub.* at .*langs1\\.f.*" \
- "up to fsub in langs.exp"
+ "up to fsub"
gdb_test "show language" "currently $lang.*" \
- "show language at fsub in langs.exp"
+ "show language at fsub"
if { !$isfixed } { set lang c }
gdb_test "up" ".* in $do_func .* at .*langs0\\.c.*return fsub.*" \
- "up to langs0__2do in langs.exp"
+ "up to langs0__2do"
gdb_test "show language" "currently $lang\".*" \
- "show language at langs0__2do in langs.exp"
+ "show language at langs0__2do"
gdb_test "up" ".* in main .* at .*langs0\\.c.*if \\(langs0__2do \\(.*" \
- "up to main in langs.exp"
+ "up to main"
gdb_test "show language" "currently $lang\".*" \
- "show language at main in langs.exp"
+ "show language at main"
if [target_info exists gdb,noresults] { return }
- gdb_continue_to_end "langs.exp"
+ gdb_continue_to_end "first session"
}
gdb_exit
@@ -120,7 +120,7 @@
if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
gdb_test "up" \
".* in (foo|$foo_func).* at .*langs2\\.$ext.*return csub \\(.*Current language: auto.*" \
- "up to foo in langs.exp when verbose"
+ "up to foo when verbose"
}
set timeout $oldtimeout
diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp
index 1deed59..906dc7e 100644
--- a/gdb/testsuite/gdb.base/nodebug.exp
+++ b/gdb/testsuite/gdb.base/nodebug.exp
@@ -264,12 +264,12 @@
gdb_test "ptype bsslocal" $data_var_type
gdb_test "backtrace 10" "#0.*inner.*#1.*middle.*#2.*top.*#3.*main.*" \
- "backtrace from inner in nodebug.exp"
+ "backtrace from inner"
# Or if that doesn't work, at least hope for the external symbols
# Commented out because if we aren't going to xfail the above test
# ever, why bother with a weaker test?
#gdb_test "backtrace 10" "#0.*inner.*#1.*#2.*top.*#3.*main.*" \
- # "backtrace from inner in nodebug.exp for externals"
+ # "backtrace from inner for externals"
# This test is not as obscure as it might look. `p getenv ("TERM")'
# is a real-world example, at least on many systems.
@@ -294,6 +294,6 @@
# to be unique, and have it still work
if [nodebug_runto middle] then {
gdb_test "backtrace 10" "#0.*middle.*#1.*top.*#2.*main.*" \
- "backtrace from middle in nodebug.exp"
+ "backtrace from middle"
}
}
diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp
index 55f70a8..1854496 100644
--- a/gdb/testsuite/gdb.base/scope.exp
+++ b/gdb/testsuite/gdb.base/scope.exp
@@ -258,7 +258,7 @@
gdb_breakpoint marker1
gdb_test "cont" "Break.* marker1 \\(\\) at .*:$decimal.*" "continue to marker1"
- gdb_test "up" ".*autovars.*" "up from marker1 in scope.exp"
+ gdb_test "up" ".*autovars.*" "up from marker1"
set count 0
while {$count < 100} {
@@ -283,7 +283,7 @@
gdb_breakpoint marker4
gdb_test "cont" "Break.* marker2 \\(\\) at .*:$decimal.*" "continue to marker2"
- gdb_test "up" ".*localscopes.*" "up from marker2 in scopes.exp"
+ gdb_test "up" ".*localscopes.*" "up from marker2"
# Should be at first (outermost) scope. Check values.
@@ -295,8 +295,8 @@
"print localval3, outer scope"
gdb_test "cont" "Break.* marker3 \\(\\) at .*:$decimal.*" \
- "continue to marker3 in scope.exp"
- gdb_test "up" ".*localscopes.*" "up from marker3 in scope.exp"
+ "continue to marker3"
+ gdb_test "up" ".*localscopes.*" "up from marker3"
# Should be at next (first nested) scope. Check values.
@@ -310,8 +310,8 @@
# This test will only fail if the file was compiled by gcc, but
# there's no way to check that.
gdb_test "cont" "Break.* marker4.*at .*:$decimal.*" \
- "continue to marker4 in scope.exp"
- gdb_test "up" ".*localscopes.*" "up from marker4 in scope.exp"
+ "continue to marker4"
+ gdb_test "up" ".*localscopes.*" "up from marker4"
gdb_test "print localval" " = 30" "print localval, innermost scope"
gdb_test "print localval1" " = 11" "print localval1, innermost scope"
diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp
index d0733f8..e73539b 100644
--- a/gdb/testsuite/gdb.base/step-test.exp
+++ b/gdb/testsuite/gdb.base/step-test.exp
@@ -201,6 +201,6 @@
}
}
-gdb_continue_to_end "step-test.exp"
+gdb_continue_to_end
return 0
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 736a0f9..a8c9857 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -65,7 +65,7 @@
}
- if [gdb_test "info break" "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*" "info break in watchpoint.exp" ] {
+ if [gdb_test "info break" "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*" "info break" ] {
return 0
}
@@ -312,7 +312,7 @@
default { fail "back at main from marker1 (timeout)" ; return }
}
- gdb_test "next" "for \\(count = 0.*" "next to `for' in watchpoint.exp"
+ gdb_test "next" "for \\(count = 0.*" "next to `for'"
# Now test that "until" works. It's a bit tricky to test
# "until", because compilers don't always arrange the code
