aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2007-02-27 13:54:04 +0000
committerDaniel Jacobowitz <drow@false.org>2007-02-27 13:54:04 +0000
commitc499ed39b6662c1fdf22d65f6049df2603f85880 (patch)
tree16318b11a6961defb7b56e547b87211e25e00e33
parent903b1f5b5baab68c9893a97d0dd7e1ca13e24451 (diff)
downloadgdb-c499ed39b6662c1fdf22d65f6049df2603f85880.zip
gdb-c499ed39b6662c1fdf22d65f6049df2603f85880.tar.gz
gdb-c499ed39b6662c1fdf22d65f6049df2603f85880.tar.bz2
* 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.
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/maint.exp4
-rw-r--r--gdb/testsuite/gdb.base/prelink.exp2
-rw-r--r--gdb/testsuite/gdb.cp/cp-relocate.exp2
-rw-r--r--gdb/testsuite/gdb.xml/tdesc-errors.exp2
-rw-r--r--gdb/testsuite/gdb.xml/tdesc-xinclude.exp2
6 files changed, 12 insertions, 6 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ba0bf20..b8dc9b3 100644
--- 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 07e61cc..eefa535 100644
--- 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 945fa7b..9c6e226 100644
--- 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 1fd1c0f..c34f5b8 100644
--- 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 03dcd51..55085a3 100644
--- 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 90d4fe0..aa3ab5e 100644
--- 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 $" {