X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=performance-test%2FMakefile.local;h=b9f580c7b6bf40e10ae9d1fe0d16ba5aae32fdec;hp=57beb44329beb3255d8f87947ab993f702e7d21b;hb=HEAD;hpb=047cd7a595f760a23415b9e38d7136325f28b114

diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index 57beb443..b9f580c7 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -1,17 +1,27 @@
-# -*- makefile -*-
+# -*- makefile-gmake -*-
 
 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}
+DEFAULT_URL :=  https://notmuchmail.org/releases/${CORPUS_NAME}
+
+perf-test: time-test memory-test
 
 time-test: setup-perf-test all
-	$(TEST_SCRIPT) $(OPTIONS)
+	@echo
+	$(TIME_TEST_SCRIPT) $(OPTIONS)
+
+memory-test: setup-perf-test all
+	@echo
+	$(MEMORY_TEST_SCRIPT) $(OPTIONS)
+
 
 .PHONY: download-corpus setup-perf-test
 
@@ -22,11 +32,13 @@ setup-perf-test: $(TXZFILE)
 $(TXZFILE):
 	@printf "\nPlease download ${TXZFILE} using:\n\n"
 	@printf "\t%% make download-corpus\n\n"
-	@echo or see http://notmuchmail.org/corpus for download locations
+	@echo or see https://notmuchmail.org/corpus for download locations
 	@echo
 	@false
 
 download-corpus:
 	wget -O ${TXZFILE} ${DEFAULT_URL}
 
-CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus $(dir)/notmuch.cache.*
+CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.*
+DISTCLEAN := $(DISTCLEAN) $(dir)/corpus $(dir)/notmuch.cache.*
+DATACLEAN := $(DATACLEAN) $(TXZFILE)