diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2020-11-25 08:30:17 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2020-11-25 08:30:17 +0100 |
| commit | aa7e05c3043302403e91b85c4aea39e0aac6c7c8 (patch) | |
| tree | 85c3d862bd2e3baf53588fafb9c2c8a3d4f6c8d9 | |
| parent | df5f473ed5ee95e3179fcb239e33e971619626cd (diff) | |
| download | glibc-aa7e05c3043302403e91b85c4aea39e0aac6c7c8.zip glibc-aa7e05c3043302403e91b85c4aea39e0aac6c7c8.tar.gz glibc-aa7e05c3043302403e91b85c4aea39e0aac6c7c8.tar.bz2 | |
Mark mtrace tests UNSUPPORTED if bug-ga2.mtrace or tst-leaks2.mtrace are missing
Starting with commit 29fddfc7dfd6444fa61a256e9a0d0127545e1f2e, the
tests posix/bug-ga2 and resolv/tst-leaks2 are test-container tests.
If test-container.c returns with EXIT_UNSUPPORTED, the tests with
mtrace() are not executed and the mtrace files do not exist.
Therefore the "mtrace-analysis-part" of those tests are marked
UNSUPPORTED if the mtrace files are missing.
Reported-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
| -rw-r--r-- | posix/Makefile | 4 | ||||
| -rw-r--r-- | resolv/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/posix/Makefile b/posix/Makefile index fa2d067..4bfc8d9 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -358,7 +358,9 @@ $(objpfx)tst-getconf.out: tst-getconf.sh $(objpfx)getconf $(evaluate-test) $(objpfx)bug-ga2-mem.out: $(objpfx)bug-ga2.out - $(common-objpfx)malloc/mtrace $(objpfx)bug-ga2.mtrace > $@; \ + { test -r $(objpfx)bug-ga2.mtrace \ + || ( echo "bug-ga2.mtrace does not exist"; exit 77; ) \ + && $(common-objpfx)malloc/mtrace $(objpfx)bug-ga2.mtrace; } > $@; \ $(evaluate-test) bug-ga2-ENV = MALLOC_TRACE=$(objpfx)bug-ga2.mtrace diff --git a/resolv/Makefile b/resolv/Makefile index 462c111..1cd6344 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -158,7 +158,9 @@ $(objpfx)mtrace-tst-leaks.out: $(objpfx)tst-leaks.out tst-leaks2-ENV = MALLOC_TRACE=$(objpfx)tst-leaks2.mtrace $(objpfx)mtrace-tst-leaks2.out: $(objpfx)tst-leaks2.out - $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks2.mtrace > $@; \ + { test -r $(objpfx)tst-leaks2.mtrace \ + || ( echo "tst-leaks2.mtrace does not exist"; exit 77; ) \ + && $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks2.mtrace; } > $@; \ $(evaluate-test) tst-resolv-res_ninit-ENV = MALLOC_TRACE=$(objpfx)tst-resolv-res_ninit.mtrace |