about summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-01-01 09:27:03 +0100
committerFlorian Weimer <fweimer@redhat.com>2017-01-01 09:27:03 +0100
commit34a63b097335d3411080b5b6e5b164ab36563847 (patch)
treefcc6a72f47cd223356c02d69de4ee1697169d4ec /malloc
parent779032576d9275b627c547f6a539e12b615a91eb (diff)
downloadglibc-34a63b097335d3411080b5b6e5b164ab36563847.tar.gz
glibc-34a63b097335d3411080b5b6e5b164ab36563847.tar.xz
glibc-34a63b097335d3411080b5b6e5b164ab36563847.zip
malloc: Run tunables tests only if tunables are enabled
Otherwise, the environment variable will not have any effect and
the test will fail.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/malloc/Makefile b/malloc/Makefile
index bbe5083d59..e93b83b57d 100644
--- 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