diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-03-21 12:05:58 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-03-21 12:05:58 +0000 |
| commit | 21983719922788c86799322b2b4cd68830712137 (patch) | |
| tree | 7e297cfe9e475bbadbd930c66bcd8cefb5ac428b | |
| parent | 3989839bfe26b8c28a99727f0c290cbeeb7aea9e (diff) | |
2012-03-21 Thomas Schwinge <thomas@codesourcery.com>
* elf/Makefile ($(objpfx)tst-unused-dep.out): Run through the
cross-test-wrapper.
* scripts/run-with-env.sh: Handle EGLIBC_TEST_LD_TRACE_LOADED_OBJECTS
and EGLIBC_TEST_LD_DEBUG.
git-svn-id: svn://svn.eglibc.org/trunk@17686 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog.eglibc | 7 | ||||
| -rw-r--r-- | libc/elf/Makefile | 8 | ||||
| -rwxr-xr-x | libc/scripts/run-with-env.sh | 8 |
3 files changed, 20 insertions, 3 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index 987307fc9..3ee9a296a 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,10 @@ +2012-03-21 Thomas Schwinge <thomas@codesourcery.com> + + * elf/Makefile ($(objpfx)tst-unused-dep.out): Run through the + cross-test-wrapper. + * scripts/run-with-env.sh: Handle EGLIBC_TEST_LD_TRACE_LOADED_OBJECTS + and EGLIBC_TEST_LD_DEBUG. + 2012-03-08 Joseph Myers <joseph@codesourcery.com> * bits/predefs.h: Test _STDC_PREDEF_H, not _FEATURES_H. diff --git a/libc/elf/Makefile b/libc/elf/Makefile index 76ea4c8c0..85691acab 100644 --- a/libc/elf/Makefile +++ b/libc/elf/Makefile @@ -1142,9 +1142,11 @@ $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \ tests: $(objpfx)tst-unused-dep.out $(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so - LD_TRACE_LOADED_OBJECTS=1 \ - LD_DEBUG=unused \ - LD_PRELOAD= \ + EGLIBC_TEST_LD_TRACE_LOADED_OBJECTS=1 \ + EGLIBC_TEST_LD_DEBUG=unused \ + EGLIBC_TEST_LD_PRELOAD= \ + $(cross-test-wrapper) \ + $(..)scripts/run-with-env.sh \ $(elf-objpfx)${rtld-installed-name} \ --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ $< > $@ diff --git a/libc/scripts/run-with-env.sh b/libc/scripts/run-with-env.sh index 82b3aa385..0edffb5c3 100755 --- a/libc/scripts/run-with-env.sh +++ b/libc/scripts/run-with-env.sh @@ -21,4 +21,12 @@ if [ "${EGLIBC_TEST_LD_LIBRARY_PATH+set}" ]; then export LD_LIBRARY_PATH="${EGLIBC_TEST_LD_LIBRARY_PATH}" fi +if [ "${EGLIBC_TEST_LD_TRACE_LOADED_OBJECTS+set}" ]; then + export LD_TRACE_LOADED_OBJECTS="${EGLIBC_TEST_LD_TRACE_LOADED_OBJECTS}" +fi + +if [ "${EGLIBC_TEST_LD_DEBUG+set}" ]; then + export LD_DEBUG="${EGLIBC_TEST_LD_DEBUG}" +fi + exec "$@" |