diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 9 | ||||
| -rw-r--r-- | nptl/Makefile | 18 |
2 files changed, 21 insertions, 6 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index bc8ae0d759..793b662f4c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,12 @@ +2014-02-21 Joseph Myers <joseph@codesourcery.com> + + * Makefile ($(objpfx)tst-stack3-mem): Use $(evaluate-test). + ($(objpfx)tst-tls6.out): Likewise. + ($(objpfx)tst-cleanup0.out): Likewise. + ($(objpfx)tst-cleanup0-cmp.out): Likewise. + ($(objpfx)tst-cancel-wrappers.out): Likewise. + ($(objpfx)tst-oddstacklimit.out): Likewise. + 2014-02-14 Joseph Myers <joseph@codesourcery.com> * Makefile ($(objpfx)tst-cleanup0.out): Do not run cmp. diff --git a/nptl/Makefile b/nptl/Makefile index 889552ffc1..253e7dd293 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -462,7 +462,8 @@ tests: $(objpfx)tst-stack3-mem endif tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace $(objpfx)tst-stack3-mem: $(objpfx)tst-stack3.out - $(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@; \ + $(evaluate-test) generated += tst-stack3-mem tst-stack3.mtrace $(objpfx)tst-cleanup4: $(objpfx)tst-cleanup4aux.o $(shared-thread-library) @@ -489,7 +490,8 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \ $(objpfx)tst-tls5modc.so $(objpfx)tst-tls5modd.so \ $(objpfx)tst-tls5mode.so $(objpfx)tst-tls5modf.so $(BASH) $< $(common-objpfx) '$(test-via-rtld-prefix)' \ - '$(test-wrapper-env)' + '$(test-wrapper-env)'; \ + $(evaluate-test) endif $(objpfx)tst-dlsym1: $(libdl) $(shared-thread-library) @@ -542,13 +544,15 @@ endif ifeq ($(build-shared),yes) $(objpfx)tst-cleanup0.out: /dev/null $(objpfx)tst-cleanup0 - $(make-test-out) > $@ 2>&1 + $(make-test-out) > $@ 2>&1; \ + $(evaluate-test) ifeq ($(run-built-tests),yes) tests: $(objpfx)tst-cleanup0-cmp.out endif $(objpfx)tst-cleanup0-cmp.out: tst-cleanup0.expect $(objpfx)tst-cleanup0.out - cmp $^ > $@ + cmp $^ > $@; \ + $(evaluate-test) $(objpfx)crti.o: $(objpfx)pt-crti.o ln -f $< $@ @@ -585,7 +589,8 @@ $(objpfx)tst-cancel-wrappers.out: tst-cancel-wrappers.sh $(common-objpfx)libc_pic.a \ $(common-objpfx)libc.a \ $(objpfx)libpthread_pic.a \ - $(objpfx)libpthread.a > $@ + $(objpfx)libpthread.a > $@; \ + $(evaluate-test) endif endif @@ -604,7 +609,8 @@ ifeq ($(run-built-tests),yes) tests: $(objpfx)tst-oddstacklimit.out $(objpfx)tst-oddstacklimit.out: $(objpfx)tst-oddstacklimit $(objpfx)tst-basic1 - $(test-program-prefix) $< --command '$(host-test-program-cmd)' > $@ + $(test-program-prefix) $< --command '$(host-test-program-cmd)' > $@; \ + $(evaluate-test) endif # The tests here better do not run in parallel |