summaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2015-09-21 18:53:00 (GMT)
committerJason Evans <jasone@canonware.com>2015-09-21 18:53:00 (GMT)
commit486d249fb4715fd3de679b6c2a04f7e657883111 (patch)
treef6f9e9644f4fde5f36ca57f6c1b43d6567b1bf3b /Makefile.in
parent9898051fd16ebd5d29dc27aae5e069fe04486ff3 (diff)
parentb8e966f121e55ffa0c904f9ff7d419797b872aa8 (diff)
downloadjemalloc-4.0.2.zip
jemalloc-4.0.2.tar.gz
jemalloc-4.0.2.tar.bz2
Merge branch 'dev'4.0.2
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 01285af..1ac6f29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -353,6 +353,7 @@ check_unit: tests_unit check_unit_dir
check_integration_prof: tests_integration check_integration_dir
ifeq ($(enable_prof), 1)
$(MALLOC_CONF)="prof:true" $(SHELL) $(objroot)test/test.sh $(TESTS_INTEGRATION:$(srcroot)%.c=$(objroot)%)
+ $(MALLOC_CONF)="prof:true,prof_active:false" $(SHELL) $(objroot)test/test.sh $(TESTS_INTEGRATION:$(srcroot)%.c=$(objroot)%)
endif
check_integration: tests_integration check_integration_dir
$(SHELL) $(objroot)test/test.sh $(TESTS_INTEGRATION:$(srcroot)%.c=$(objroot)%)