diff options
| -rw-r--r-- | ld/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-cris/cris.exp | 4 |
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" |