aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2016-05-11 00:52:16 -0700
committerJason Evans <jasone@canonware.com>2016-05-11 00:52:16 -0700
commit3a9ec676267cf215ed2591a1060f870daced2472 (patch)
tree8945b5d37308653f8b52400657533fc171021e78 /test
parentc1e00ef2a6442d1d047950247c757821560db329 (diff)
downloadjemalloc-3a9ec676267cf215ed2591a1060f870daced2472.tar.gz
Disable junk filling for tests that could otherwise easily OOM.
Diffstat (limited to 'test')
-rw-r--r--test/integration/mallocx.c4
-rw-r--r--test/integration/xallocx.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/test/integration/mallocx.c b/test/integration/mallocx.c
index 578c229..55e1a09 100644
--- a/test/integration/mallocx.c
+++ b/test/integration/mallocx.c
@@ -1,5 +1,9 @@
#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/xallocx.c b/test/integration/xallocx.c
index 5c4998b..ad292bb 100644
--- a/test/integration/xallocx.c
+++ b/test/integration/xallocx.c
@@ -1,5 +1,9 @@
#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