X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=performance-test%2FMakefile.local;h=d97e56d91a121cf2ad650bb16d61fa44926c819a;hb=ce5f3f38092be8e846dc4c194c889f717830ff4f;hp=3834e4d70e5f28b019f50f9dbc16f30e3f77599f;hpb=ceaf5ca6c02e494eee5b9b9aa955459b3cd29471;p=notmuch

diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index 3834e4d7..d97e56d9 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -2,16 +2,26 @@
 
 dir := performance-test
 
-include $(dir)/version.sh
+include $(srcdir)/$(dir)/version.sh
+
+TIME_TEST_SCRIPT := ${dir}/notmuch-time-test
+MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test
 
 CORPUS_NAME := notmuch-email-corpus-$(PERFTEST_VERSION).tar.xz
 TXZFILE := ${dir}/download/${CORPUS_NAME}
 SIGFILE := ${TXZFILE}.asc
-TEST_SCRIPT := ${dir}/notmuch-perf-test
 DEFAULT_URL :=  http://notmuchmail.org/releases/${CORPUS_NAME}
 
-perf-test: setup-perf-test all
-	$(TEST_SCRIPT) $(OPTIONS)
+perf-test: time-test memory-test
+
+time-test: setup-perf-test all
+	@echo
+	$(TIME_TEST_SCRIPT) $(OPTIONS)
+
+memory-test: setup-perf-test all
+	@echo
+	$(MEMORY_TEST_SCRIPT) $(OPTIONS)
+
 
 .PHONY: download-corpus setup-perf-test
 
@@ -29,4 +39,5 @@ $(TXZFILE):
 download-corpus:
 	wget -O ${TXZFILE} ${DEFAULT_URL}
 
-CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus $(dir)/notmuch.cache.*
+CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.*
+DISTCLEAN := $(dir)/corpus $(dir)/notmuch.cache.*