From a42ec05b092b6235d86297779ec32b42731772e4 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Wed, 18 Jun 2003 03:38:05 +0000 Subject: [PATCH] * ld-elfcomm/elfcomm.exp (dump_common1): Use $READELF, not plain readelf as found using default path. --- ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-elfcomm/elfcomm.exp | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 75716f6..e54d285 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-06-18 Hans-Peter Nilsson + + * ld-elfcomm/elfcomm.exp (dump_common1): Use $READELF, not plain + readelf as found using default path. + 2003-06-18 Alan Modra * lib/ld-lib.exp (default_ld_simple_link): Trim ld parms before diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp index 80ede64..e5bd29b 100644 --- a/ld/testsuite/ld-elfcomm/elfcomm.exp +++ b/ld/testsuite/ld-elfcomm/elfcomm.exp @@ -41,9 +41,10 @@ if { [which $CC] == 0 } { proc dump_common1 { testname } { global exec_output + global READELF - send_log "readelf -s tmpdir/common1.o | grep foo\n" - catch "exec readelf -s tmpdir/common1.o | grep foo" exec_output + send_log "$READELF -s tmpdir/common1.o | grep foo\n" + catch "exec $READELF -s tmpdir/common1.o | grep foo" exec_output if { ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0\]*)80(\[ \]+)4(\[ \]+)OBJECT(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)COM(\[ \]+)_?foo2" $exec_output] || ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0-9\]+)(\[ \]+)21(\[ \]+)OBJECT(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(\[0-9\]+)(\[ \]+)_?foo1" $exec_output] } { send_log "$exec_output\n" -- 2.7.4