diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-01-03 15:11:17 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-01-03 15:11:17 +0000 |
| commit | d4d629e6187e33050902824a94498b6096eacac9 (patch) | |
| tree | f224baee2d7c9e8f1ab99d7d2553e50005f1e4b3 | |
| parent | 26e21ad35db514c646e1491a414d45a47cb4a733 (diff) | |
| download | glibc-d4d629e6187e33050902824a94498b6096eacac9.zip glibc-d4d629e6187e33050902824a94498b6096eacac9.tar.gz glibc-d4d629e6187e33050902824a94498b6096eacac9.tar.bz2 | |
Fix elf/tst-ldconfig-X for cross testing.
elf/Makefile passes arguments to tst-ldconfig-X.sh that are different
from what it expects, so resulting in the test failing in cross
testing. This patch corrects the arguments passed (the script itself
has correct logic for cross testing, it's just the Makefile that's
wrong).
Tested for powerpc (cross testing) and for x86_64 (native testing).
* elf/Makefile ($(objpfx)tst-ldconfig-X.out): Correct arguments
passed to tst-ldconfig-X.sh.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/Makefile | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2017-01-03 Joseph Myers <joseph@codesourcery.com> + + * elf/Makefile ($(objpfx)tst-ldconfig-X.out): Correct arguments + passed to tst-ldconfig-X.sh. + 2017-01-03 Martin Galvan <martingalvan@sourceware.org> * nptl/nptl-printers.py: Fix tabs/spaces mismatches. diff --git a/elf/Makefile b/elf/Makefile index 0b90884..c7a2969 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1355,7 +1355,8 @@ $(objpfx)tst-prelink-cmp.out: tst-prelink.exp \ $(evaluate-test) $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig - $(SHELL) $< '$(common-objpfx)' '$(test-wrapper)' '$(test-wrapper-env)' > $@; \ + $(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' \ + '$(run-program-env)' > $@; \ $(evaluate-test) $(objpfx)tst-dlsym-error: $(libdl) |