Fix cross-testing of tst-ifunc-fault-* tests

Joseph Myers joseph@codesourcery.com
Thu Jan 23 02:07:00 GMT 2020


The tests elf/tst-ifunc-fault-bindnow and elf/tst-ifunc-fault-lazy
fail in cross-testing because they run the dynamic linker directly
without using the test wrapper.  This patch fixes them to use the test
wrapper instead.

Tested that this fixes the failure of those two tests for powerpc
soft-float.

diff --git a/elf/Makefile b/elf/Makefile
index 6c62ed611c..0c6bd926a1 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1378,9 +1378,10 @@ $(objpfx)ifuncmain5picstatic: $(addprefix $(objpfx),ifuncdep5pic.o)
 LDFLAGS-tst-ifunc-fault-lazy = -Wl,-z,lazy
 LDFLAGS-tst-ifunc-fault-bindnow = -Wl,-z,now
 define tst-ifunc-fault-script
-( $(rtld-prefix) --verify $^ \
-  && LD_TRACE_LOADED_OBJECTS=1 $(rtld-prefix) $^ \
-  && LD_TRACE_LOADED_OBJECTS=1 LD_DEBUG=unused $(rtld-prefix) $^ \
+( $(test-wrapper) $(rtld-prefix) --verify $^ \
+  && $(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 $(rtld-prefix) $^ \
+  && $(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 LD_DEBUG=unused \
+			 $(rtld-prefix) $^ \
 ) > $@; $(evaluate-test)
 endef
 $(objpfx)tst-ifunc-fault-lazy.out: $(objpfx)tst-ifunc-fault-lazy $(objpfx)ld.so

-- 
Joseph S. Myers
joseph@codesourcery.com



More information about the Libc-alpha mailing list