12 files changed, 15 insertions, 12 deletions
diff --git a/test/integration/MALLOCX_ARENA.c b/test/integration/MALLOCX_ARENA.c
index 910a096..910a096 100755..100644
--- a/test/integration/MALLOCX_ARENA.c
+++ b/test/integration/MALLOCX_ARENA.c
diff --git a/test/integration/allocated.c b/test/integration/allocated.c
index 6ce145b..6ce145b 100755..100644
--- a/test/integration/allocated.c
+++ b/test/integration/allocated.c
diff --git a/test/integration/chunk.c b/test/integration/chunk.c
index 94cf002..997567a 100644
--- a/test/integration/chunk.c
+++ b/test/integration/chunk.c
@@ -1,9 +1,5 @@
 #include "test/jemalloc_test.h"
 
-#ifdef JEMALLOC_FILL
-const char *malloc_conf = "junk:false";
-#endif
-
 static chunk_hooks_t orig_hooks;
 static chunk_hooks_t old_hooks;
 
diff --git a/test/integration/chunk.sh b/test/integration/chunk.sh
new file mode 100644
index 0000000..0cc2187
--- /dev/null
+++ b/test/integration/chunk.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ "x${enable_fill}" = "x1" ] ; then
+  export MALLOC_CONF="junk:false"
+fi
diff --git a/test/integration/mallocx.c b/test/integration/mallocx.c
index d709eb3..5a9058d 100755..100644
--- a/test/integration/mallocx.c
+++ b/test/integration/mallocx.c
@@ -1,9 +1,5 @@
 #include "test/jemalloc_test.h"
 
-#ifdef JEMALLOC_FILL
-const char *malloc_conf = "junk:false";
-#endif
-
 static unsigned
 get_nsizes_impl(const char *cmd)
 {
diff --git a/test/integration/mallocx.sh b/test/integration/mallocx.sh
new file mode 100644
index 0000000..0cc2187
--- /dev/null
+++ b/test/integration/mallocx.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ "x${enable_fill}" = "x1" ] ; then
+  export MALLOC_CONF="junk:false"
+fi
diff --git a/test/integration/overflow.c b/test/integration/overflow.c
index 84a3565..84a3565 100755..100644
--- a/test/integration/overflow.c
+++ b/test/integration/overflow.c
diff --git a/test/integration/rallocx.c b/test/integration/rallocx.c
index 506bf1c..506bf1c 100755..100644
--- a/test/integration/rallocx.c
+++ b/test/integration/rallocx.c
diff --git a/test/integration/thread_arena.c b/test/integration/thread_arena.c
index 7a35a63..7a35a63 100755..100644
--- a/test/integration/thread_arena.c
+++ b/test/integration/thread_arena.c
diff --git a/test/integration/thread_tcache_enabled.c b/test/integration/thread_tcache_enabled.c
index 2c2825e..2c2825e 100755..100644
--- a/test/integration/thread_tcache_enabled.c
+++ b/test/integration/thread_tcache_enabled.c
diff --git a/test/integration/xallocx.c b/test/integration/xallocx.c
index 67e0a0e..2517a81 100755..100644
--- a/test/integration/xallocx.c
+++ b/test/integration/xallocx.c
@@ -1,9 +1,5 @@
 #include "test/jemalloc_test.h"
 
-#ifdef JEMALLOC_FILL
-const char *malloc_conf = "junk:false";
-#endif
-
 /*
  * Use a separate arena for xallocx() extension/contraction tests so that
  * internal allocation e.g. by heap profiling can't interpose allocations where
diff --git a/test/integration/xallocx.sh b/test/integration/xallocx.sh
new file mode 100644
index 0000000..0cc2187
--- /dev/null
+++ b/test/integration/xallocx.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ "x${enable_fill}" = "x1" ] ; then
+  export MALLOC_CONF="junk:false"
+fi