malloc: Run tunables tests only if tunables are enabled

Otherwise, the environment variable will not have any effect and
the test will fail.

diff --git a/ChangeLog b/ChangeLog
index 814b05c7077757f19974db5dbfb6707d7f9f629c..7259267d18cdd76a44059a5f1d1c6d95576b9d34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-01  Florian Weimer  <fweimer@redhat.com>
+
+       * malloc/Makefile (tests): Add tst-malloc-usable-tunables for
+       have-tunables only.
+       (tests-static): Add tst-malloc-usable-static-tunables for
+       have-tunables only.
+
 2017-01-01  Joseph Myers  <joseph@codesourcery.com>
 
        * scripts/config.guess: Update to version 2017-01-01.

diff --git a/malloc/Makefile b/malloc/Makefile
index bbe5083d59e108db11d4c59ecdff4dd8810f43f6..e93b83b57d9cdf30f54f41e4b853d4df783ba331 100644 (file)
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -33,13 +33,16 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
         tst-mallocfork2 \
         tst-interpose-nothread \
         tst-interpose-thread \
-        tst-malloc-usable-tunables
 
 tests-static := \
         tst-interpose-static-nothread \
         tst-interpose-static-thread \
         tst-malloc-usable-static \
-        tst-malloc-usable-static-tunables
+
+ifneq (no,$(have-tunables))
+tests += tst-malloc-usable-tunables
+tests-static += tst-malloc-usable-static-tunables
+endif
 
 tests += $(tests-static)
 test-srcs = tst-mtrace