From c9831d571eaece657edbf52c111647d794a6f80c Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 20 Oct 2005 17:54:53 +0000 Subject: [PATCH] 2005-10-20 H.J. Lu * ld-ia64/ia64.exp: Undo the last change. Add support for *.d. * ld-ia64/link-order.d: New file. --- ld/testsuite/ChangeLog | 6 ++++ ld/testsuite/ld-ia64/ia64.exp | 49 ++++--------------------------- ld/testsuite/ld-ia64/link-order.d | 9 ++++++ 3 files changed, 20 insertions(+), 44 deletions(-) create mode 100644 ld/testsuite/ld-ia64/link-order.d diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 33831ce6888..c100d282fa3 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2005-10-20 H.J. Lu + + * ld-ia64/ia64.exp: Undo the last change. Add support for *.d. + + * ld-ia64/link-order.d: New file. + 2005-10-20 H.J. Lu PR ld/251 diff --git a/ld/testsuite/ld-ia64/ia64.exp b/ld/testsuite/ld-ia64/ia64.exp index 7bab7137285..b7ee50f296a 100644 --- a/ld/testsuite/ld-ia64/ia64.exp +++ b/ld/testsuite/ld-ia64/ia64.exp @@ -53,48 +53,9 @@ set ia64tests { run_ld_link_tests $ia64tests -# Check link order -proc link_order {} { - global AS - global LD - global READELF - global srcdir - global subdir - - set testname "link order" - if ![ld_assemble $AS $srcdir/../../binutils/testsuite/binutils-all/link-order.s tmpdir/link-order.o] { - unresolved $testname - return - } - - if ![ld_simple_link $LD tmpdir/link-order.ro "-r tmpdir/link-order.o"] { - unresolved $testname - return - } - - verbose -log "$READELF -t --wide tmpdir/link-order.o | grep IA_64_UNWIND > tmpdir/link-order.o.out" - catch "exec $READELF -t --wide tmpdir/link-order.o | grep IA_64_UNWIND > tmpdir/link-order.o.out" exec_output - set exec_output [prune_warnings $exec_output] - if ![string match "" $exec_output] then { - unresolved $testname - return - } - - verbose -log "$READELF -t --wide tmpdir/link-order.ro | grep IA_64_UNWIND > tmpdir/link-order.ro.out" - catch "exec $READELF -t --wide tmpdir/link-order.ro | grep IA_64_UNWIND > tmpdir/link-order.ro.out" exec_output - set exec_output [prune_warnings $exec_output] - if ![string match "" $exec_output] then { - unresolved $testname - return - } - - verbose -log "cmp tmpdir/link-order.o.out tmpdir/link-order.ro.out" - catch "exec cmp tmpdir/link-order.o.out tmpdir/link-order.ro.out" exec_output - if ![string match "" $exec_output] then { - fail $testname - } else { - pass $testname - } +set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]] +foreach t $test_list { + # We need to strip the ".d", but can leave the dirname. + verbose [file rootname $t] + run_dump_test [file rootname $t] } - -link_order diff --git a/ld/testsuite/ld-ia64/link-order.d b/ld/testsuite/ld-ia64/link-order.d new file mode 100644 index 00000000000..53a3794af1f --- /dev/null +++ b/ld/testsuite/ld-ia64/link-order.d @@ -0,0 +1,9 @@ +#source: ../../../binutils/testsuite/binutils-all/link-order.s +#ld: -r +#readelf: -S --wide + +#... + \[[ ]+1\] \.text.*[ \t]+PROGBITS[ \t0-9a-f]+AX.* +#... + \[[ 0-9]+\] \.IA_64.unwind[ \t]+IA_64_UNWIND[ \t0-9a-f]+AL[ \t]+1[ \t]+1[ \t]+8 +#pass -- 2.30.2