diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-10-10 21:20:58 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-10-10 21:20:58 +0000 |
| commit | 12348b1583437f6382553bde4a32c2615216fec6 (patch) | |
| tree | 43a3d802e73e7f1bc559a691ec06364ceee62ca8 | |
| parent | 2d32c4f00084f68a390e8fa4291acb49e9c0df8e (diff) | |
| download | eglibc2-12348b1583437f6382553bde4a32c2615216fec6.tar.gz | |
* elf/Makefile ($(objpfx)tst-rtld-load-self.out): Pass
$(cross-test-wrapper) and $(..)scripts/run-with-env.sh to script.
* elf/tst-rtld-load-self.sh: Use wrappers to run dynamic linker.
git-svn-id: svn://svn.eglibc.org/trunk@21112 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog.eglibc | 6 | ||||
| -rw-r--r-- | libc/elf/Makefile | 2 | ||||
| -rwxr-xr-x | libc/elf/tst-rtld-load-self.sh | 11 |
3 files changed, 14 insertions, 5 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index a194a8a1d..c12191672 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,9 @@ +2012-10-10 Joseph Myers <joseph@codesourcery.com> + + * elf/Makefile ($(objpfx)tst-rtld-load-self.out): Pass + $(cross-test-wrapper) and $(..)scripts/run-with-env.sh to script. + * elf/tst-rtld-load-self.sh: Use wrappers to run dynamic linker. + 2012-09-27 Joseph Myers <joseph@codesourcery.com> * bits/predefs.h, ports/sysdeps/arm/bits/predefs.h: Put diff --git a/libc/elf/Makefile b/libc/elf/Makefile index 276581812..5e374d571 100644 --- a/libc/elf/Makefile +++ b/libc/elf/Makefile @@ -721,7 +721,7 @@ $(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \ $(..)scripts/run-with-env.sh $(objpfx)tst-rtld-load-self.out: tst-rtld-load-self.sh $(objpfx)ld.so - $(SHELL) $^ > $@ + $(SHELL) $^ "$(cross-test-wrapper)" $(..)scripts/run-with-env.sh > $@ $(objpfx)initfirst: $(libdl) $(objpfx)initfirst.out: $(objpfx)firstobj.so diff --git a/libc/elf/tst-rtld-load-self.sh b/libc/elf/tst-rtld-load-self.sh index f4c5dea23..38cabea1c 100755 --- a/libc/elf/tst-rtld-load-self.sh +++ b/libc/elf/tst-rtld-load-self.sh @@ -21,25 +21,28 @@ set -e rtld=$1 +cross_test_wrapper="$2" +run_with_env="$3" result=0 echo '# normal mode' -$rtld $rtld 2>&1 && rc=0 || rc=$? +${cross_test_wrapper} $rtld $rtld 2>&1 && rc=0 || rc=$? echo "# exit status $rc" test $rc -le 127 || result=1 echo '# list mode' -$rtld --list $rtld 2>&1 && rc=0 || rc=$? +${cross_test_wrapper} $rtld --list $rtld 2>&1 && rc=0 || rc=$? echo "# exit status $rc" test $rc -eq 0 || result=1 echo '# verify mode' -$rtld --verify $rtld 2>&1 && rc=0 || rc=$? +${cross_test_wrapper} $rtld --verify $rtld 2>&1 && rc=0 || rc=$? echo "# exit status $rc" test $rc -eq 2 || result=1 echo '# trace mode' -LD_TRACE_LOADED_OBJECTS=1 $rtld $rtld 2>&1 && rc=0 || rc=$? +EGLIBC_LD_TRACE_LOADED_OBJECTS=1 ${cross_test_wrapper} ${run_with_env} \ + $rtld $rtld 2>&1 && rc=0 || rc=$? echo "# exit status $rc" test $rc -eq 0 || result=1 |