This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Fix cross-testing of tst-ifunc-fault-* tests
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Cc: <siddhesh at sourceware dot org>
- Date: Wed, 22 Jan 2020 23:33:03 +0000
- Subject: Fix cross-testing of tst-ifunc-fault-* tests
- Ironport-sdr: bGBO2GCNULenGPj6PIH/tDkqAw1rZrjkiYeLIrX1LPltCABvMLA7pxiwe31rSidcREMWv3CgZR yUW3N2YM9UEgp4dn34lz3I2hCRElaXiSl8XQKD5sFFq9n/3NoRtT+RvHsO+4YsA4wkgYZfpTc9 9qJM/eybc0or9VUPyzOsBSOVVrBcA/k1/vFpt60Ozn9LkUTxr9XSrLvrmjpYzzyHEOCL7Ug7eU oXA1S+bvUqYWy4FqfmLqWSQDrZpSJjQY0sG+oje1zN8Ac03rbiIK42M8QRuFDby02uBt+PgtGX 2/A=
- Ironport-sdr: GtKaQASpppUWeN6s8tC1Jy40R9z5ZKkUuOUKg+IODMts3SqGEVQYY4V2942u+8mkZUHnWhT0VE uSazz3GEviTQ==
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