aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2010-03-30 23:16:46 +0000
committerHans-Peter Nilsson <hp@axis.com>2010-03-30 23:16:46 +0000
commitf2bfad59579e17ba0aa3fd456bf2a52848c9b6ac (patch)
tree8036c776c802a7f75a9c9091f04ebb7190a3bb74 /ld
parent75005b3a8e2897f056a0adabac591fbf4bad91cd (diff)
downloadgdb-f2bfad59579e17ba0aa3fd456bf2a52848c9b6ac.zip
gdb-f2bfad59579e17ba0aa3fd456bf2a52848c9b6ac.tar.gz
gdb-f2bfad59579e17ba0aa3fd456bf2a52848c9b6ac.tar.bz2
* ld-cris/cris.exp (loop over $srcdir/$subdir/*dso-*.d): Apply
"file rootname", not "file tail", before applying runtest_file_p.
Diffstat (limited to 'ld')
-rw-r--r--ld/testsuite/ChangeLog5
-rw-r--r--ld/testsuite/ld-cris/cris.exp4
2 files changed, 6 insertions, 3 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index f7aeed7..039b999 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-31 Hans-Peter Nilsson <hp@axis.com>
+
+ * ld-cris/cris.exp (loop over $srcdir/$subdir/*dso-*.d): Apply
+ "file rootname", not "file tail", before applying runtest_file_p.
+
2010-03-29 Daniel Jacobowitz <dan@codesourcery.com>
* ld-arm/arm-elf.exp (armeabitests): Add v6-M farcall test.
diff --git a/ld/testsuite/ld-cris/cris.exp b/ld/testsuite/ld-cris/cris.exp
index 82b8171..ebe4bff 100644
--- a/ld/testsuite/ld-cris/cris.exp
+++ b/ld/testsuite/ld-cris/cris.exp
@@ -31,13 +31,11 @@ set rd_test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
# DSO. Copy the file from the run_dump_test "tmpdir/dump" to a unique
# expected name.
# FIXME: Add option "output: filename" to run_dump_test.
-# FIXME: Add option "ldtail: option" to run_dump_test, so we can link
-# libraries in the right order.
foreach atest $rd_test_list {
# We need to check against runtest_file_p too, or we'd mindlessly copy
# the last tmpdir/dump in selective test-runs.
if { [string match $srcdir/$subdir/*dso-*.d $atest] \
- && [runtest_file_p $runtests [file tail $atest]] } {
+ && [runtest_file_p $runtests [file rootname $atest]] } {
verbose [file rootname $atest]
run_dump_test [file rootname $atest]
set cmd "cp tmpdir/dump tmpdir/[file rootname [file tail $atest]].so"