* gdb.base/maint.exp: Remove full paths from test names.

	* gdb.base/prelink.exp, gdb.cp/cp-relocate.exp,
	gdb.xml/tdesc-errors.exp, gdb.xml/tdesc-xinclude.exp: Likewise.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ba0bf202f29cbdd6c245d6b8e3101c8e33251996..b8dc9b3f77c41ff3f1d8d27422253d76885a18b0 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-27  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * gdb.base/maint.exp: Remove full paths from test names.
+       * gdb.base/prelink.exp, gdb.cp/cp-relocate.exp,
+       gdb.xml/tdesc-errors.exp, gdb.xml/tdesc-xinclude.exp: Likewise.
+
 2007-02-27  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.ada/catch_ex.exp: Fix a couple of copy/paste typos.

diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
index 07e61cccd21c3e8dd7ea96daf8c6a2fd3745226f..eefa53556a420d1df7e62bee921774c7ceb60993 100644 (file)
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -329,7 +329,7 @@ gdb_expect  {
 
 # Check that maint print msymbols allows relative pathnames
 set mydir [pwd]
-gdb_test "cd ${objdir}" "Working directory [string_to_regexp ${objdir}]\..*"
+gdb_test "cd ${objdir}" "Working directory [string_to_regexp ${objdir}]\..*" "cd to objdir"
 gdb_test_multiple "maint print msymbols msymbols_output2 ${subdir}/${testfile}" "maint print msymbols" {
     -re "^maint print msymbols msymbols_output2 \[^\n\]*\r\n$gdb_prompt $" {
        gdb_test_multiple "shell ls msymbols_output2" "maint print msymbols" {
@@ -362,7 +362,7 @@ gdb_test_multiple "maint print msymbols msymbols_output2 ${subdir}/${testfile}"
        fail "(timeout) maint print msymbols"
     }
 }
-gdb_test "cd ${mydir}" "Working directory [string_to_regexp ${mydir}]\..*"
+gdb_test "cd ${mydir}" "Working directory [string_to_regexp ${mydir}]\..*" "cd to mydir"
 
 send_gdb "maint print symbols\n"
 gdb_expect  {

diff --git a/gdb/testsuite/gdb.base/prelink.exp b/gdb/testsuite/gdb.base/prelink.exp
index 945fa7b43faea4096f85c7c88abc51bb8f65a77a..9c6e226db8411b0be97b23d0a2f19d1040e107d4 100644 (file)
--- a/gdb/testsuite/gdb.base/prelink.exp
+++ b/gdb/testsuite/gdb.base/prelink.exp
@@ -90,7 +90,7 @@ if { $found == 0  } {
 }
 
 if {[catch "system \"prelink -uN ${libfile}\""] != 0} {
-    untested "${libfile} was not prelinked, maybe system libraries are not prelinked?"
+    untested "${testfile}.so was not prelinked, maybe system libraries are not prelinked?"
     return 0
 }
 catch "system \"prelink -qNR ${libfile}\""

diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp
index 1fd1c0fffa0afd7ee40c3ddc2d09ef6b1be58128..c34f5b81186af36ddf8e7a8901a8844840aae3a5 100644 (file)
--- a/gdb/testsuite/gdb.cp/cp-relocate.exp
+++ b/gdb/testsuite/gdb.cp/cp-relocate.exp
@@ -126,7 +126,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 gdb_test "add-symbol-file ${binfile} 0 -s ${func1_sec} 0x40000 -s ${func2_sec} 0x80000" \
        "Reading symbols from .*${testfile}\\.o\\.\\.\\.done\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
-       "add-symbol-file ${binfile}" \
+       "add-symbol-file ${testfile}.o" \
        "add symbol table from file \".*${testfile}\\.o\" at.*\\(y or n\\) " \
        "y"
 

diff --git a/gdb/testsuite/gdb.xml/tdesc-errors.exp b/gdb/testsuite/gdb.xml/tdesc-errors.exp
index 03dcd51389d111b3281a46d36236ebc72f02ef43..55085a3ca2856e74008d9e48cdd6317ea96f5a70 100644 (file)
--- a/gdb/testsuite/gdb.xml/tdesc-errors.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-errors.exp
@@ -28,7 +28,7 @@ proc set_bad_arch { srcfile errmsg } {
 
     # Anchor the test output, so that error messages are detected.
     set cmd "set tdesc filename $srcdir/$subdir/$srcfile"
-    set msg $cmd
+    set msg "set tdesc filename $subdir/$srcfile"
     set cmd_regex [string_to_regexp $cmd]
     gdb_test_multiple $cmd $msg {
        -re "^$cmd_regex\r\n$errmsg$gdb_prompt $" {

diff --git a/gdb/testsuite/gdb.xml/tdesc-xinclude.exp b/gdb/testsuite/gdb.xml/tdesc-xinclude.exp
index 90d4fe0f784b00343fa033acf55d3a58f646a383..aa3ab5e3de157b4f09b765d0006350fc9b73d5a2 100644 (file)
--- a/gdb/testsuite/gdb.xml/tdesc-xinclude.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-xinclude.exp
@@ -28,7 +28,7 @@ proc set_arch { srcfile errmsg } {
 
     # Anchor the test output, so that error messages are detected.
     set cmd "set tdesc filename $srcdir/$subdir/$srcfile"
-    set msg $cmd
+    set msg "set tdesc filename $subdir/$srcfile"
     set cmd_regex [string_to_regexp $cmd]
     gdb_test_multiple $cmd $msg {
        -re "^$cmd_regex\r\n$errmsg$gdb_prompt $" {