gdb/testsuite: Remove paths and make test names unique

Removes paths from some test names, and make the test names unique in
the gdb.base/break-interp.exp test file.

gdb/testsuite/ChangeLog:

	* gdb.base/break-interp.exp: Use the tail of the filename, not the
	full path in the test name.
	(test_ld): Add some with_test_prefix blocks to make test names
	unique.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 48d3c946855026f158bb5dabd277851823191a95..500aa51c3406fd7aaf8f902fd92feee6a4910a54 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2020-03-13  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * gdb.base/break-interp.exp: Use the tail of the filename, not the
+       full path in the test name.
+       (test_ld): Add some with_test_prefix blocks to make test names
+       unique.
+
 2020-03-13  Tom de Vries  <tdevries@suse.de>
 
        * gdb.mi/mi-sym-info.exp: Fix buffer full errors, and timeouts.

diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 3646a1a413adf8faf659be25c7a5f4385437fbc3..6b03c59c8175c43989ed6bf962288a711e64b558 100644 (file)
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -411,18 +411,22 @@ proc test_ld {file ifmain trynosym displacement} {
 
     reach $solib_bp "run" $displacement 1
 
-    gdb_test_no_output "set verbose off"
-    gdb_test "bt" "#0 +\[^\r\n\]*\\m(__GI_)?$solib_bp\\M.*" "dl bt"
-    gdb_test_no_output "set verbose on"
+    with_test_prefix "first backtrace" {
+       gdb_test_no_output "set verbose off"
+       gdb_test "bt" "#0 +\[^\r\n\]*\\m(__GI_)?$solib_bp\\M.*" "dl bt"
+       gdb_test_no_output "set verbose on"
+    }
 
     if $ifmain {
        reach "main" continue "NONE"
 
        reach "libfunc" continue "NONE"
 
-       gdb_test_no_output "set verbose off"
-       gdb_test "bt" "#0 +\[^\r\n\]*\\mlibfunc\\M\[^\r\n\]*\r\n#1 +\[^\r\n\]*\\mmain\\M.*" "main bt"
-       gdb_test_no_output "set verbose on"
+       with_test_prefix "second backtrace" {
+           gdb_test_no_output "set verbose off"
+           gdb_test "bt" "#0 +\[^\r\n\]*\\mlibfunc\\M\[^\r\n\]*\r\n#1 +\[^\r\n\]*\\mmain\\M.*" "main bt"
+           gdb_test_no_output "set verbose on"
+       }
     }
 
     # Try re-run if the new PIE displacement takes effect.
@@ -609,7 +613,7 @@ foreach_with_prefix ldprelink {NO YES} {
            file delete "${interp}.debug"
        }
 
-       if ![prelink$ldprelink $interp "$interp, second time"] {
+       if ![prelink$ldprelink $interp "[file tail $interp], second time"] {
            continue
        }