Fix elf/tst-ldconfig-X for cross testing [committed]

Message ID alpine.DEB.2.20.1701031511370.1103@digraph.polyomino.org.uk
State Committed
Headers

Commit Message

Joseph Myers Jan. 3, 2017, 3:12 p.m. UTC
  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).  
Committed.

2017-01-03  Joseph Myers  <joseph@codesourcery.com>

	* elf/Makefile ($(objpfx)tst-ldconfig-X.out): Correct arguments
	passed to tst-ldconfig-X.sh.
  

Patch

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)