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>

diff --git a/posix/Makefile b/posix/Makefile
index fa2d0675cd2ad5af6e8c6ffb9622ab549814067a..4bfc8d942c97cbcb9b88b27adf4b4b7a02a967f4 100644 (file)
--- 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 462c111e137480c7a3e8ee8e57359ae6da860856..1cd63445a386c6e3cd0f959fbe36d893bed7c5fb 100644 (file)
--- 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