This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
ld-cris/cris.exp: Make "make check-ld RUNTESTFLAGS=cris.exp=libdso-13b" work
- From: Hans-Peter Nilsson <hans-peter dot nilsson at axis dot com>
- To: binutils at sourceware dot org
- Date: Wed, 31 Mar 2010 01:17:52 +0200
- Subject: ld-cris/cris.exp: Make "make check-ld RUNTESTFLAGS=cris.exp=libdso-13b" work
Command lines like "make check-ld RUNTESTFLAGS=cris.exp=pcrelcp-1"
worked, but "make check-ld RUNTESTFLAGS=cris.exp=libdso-13b" didn't,
because the special-case loop for files named *dso-*.d applied
runtest_file_p on the basename of the file including the .d,
while run_dump_test effectively applies runtest_file_p to the
name with the .d left out. Also, the "ldtail" option referred
to in the removed FIXME, was IIRC introduced as "ld_after_inputfiles".
Committed.
ld/testsuite:
* ld-cris/cris.exp (loop over $srcdir/$subdir/*dso-*.d): Apply
"file rootname", not "file tail", before applying runtest_file_p.
Index: cris.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/cris.exp,v
retrieving revision 1.5
diff -p -u -r1.5 cris.exp
--- cris.exp 2 Sep 2009 07:25:38 -0000 1.5
+++ cris.exp 30 Mar 2010 22:21:15 -0000
@@ -31,13 +31,11 @@ set rd_test_list [lsort [glob -nocomplai
# 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"
brgds, H-P