diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-12-19 14:45:50 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-12-19 16:06:50 +0100 |
| commit | 6a265e577e8d7c9c950a793139df19b2d050ce5b (patch) | |
| tree | 8a7f081291ad0a727e926c7a14c3eaca5a4dacd9 | |
| parent | 1b132d55e2d3a4eb421c0f77f63b67b5022c22e3 (diff) | |
| download | glibc-6a265e577e8d7c9c950a793139df19b2d050ce5b.tar.gz | |
Fix test isolation for elf/tst-ifunc-fault-lazy, elf/tst-ifunc-fault-bindnow
Previously, ld.so was invoked only with the elf subdirectory on the
library search path. Since the soname link for libc.so only exists in
the top-level build directory, this leaked the system libc into the
test.
| -rw-r--r-- | elf/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/elf/Makefile b/elf/Makefile index 72a5aa88b1..f861126b2f 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1375,10 +1375,9 @@ $(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 -( $(objpfx)ld.so --verify --library-path $(objpfx) $^ \ - && LD_TRACE_LOADED_OBJECTS=1 $(objpfx)ld.so --library-path $(objpfx) $^ \ - && LD_TRACE_LOADED_OBJECTS=1 LD_DEBUG=unused \ - $(objpfx)ld.so --library-path $(objpfx) $^ \ +( $(rtld-prefix) --verify $^ \ + && LD_TRACE_LOADED_OBJECTS=1 $(rtld-prefix) $^ \ + && 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 |