From 616be2a18cea1ecfee327105a58f4f397a7e28f1 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 25 Nov 2016 14:29:00 +0100
Subject: Manual rebase onto master with map/robust-distribution.

---
 test/Makefile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'test/Makefile')

diff --git a/test/Makefile b/test/Makefile
index c92c30d..7d1b109 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,19 +1,20 @@
 PREFIX=..
 INSTDIR=$(PREFIX)/catlfish
 
+all: tests
+
 tests-start:
-	./scripts/light-system-test-start.sh
+	(cd $(INSTDIR)/tests &&	../../test/scripts/light-system-test-start.sh)
 
 tests-stop:
-	./scripts/light-system-test-stop.sh
-
-tests-wait:
-	sleep 5
+	(cd $(INSTDIR)/tests &&	../../test/scripts/light-system-test-stop.sh)
 
 tests-makemk:
 	$(PREFIX)/tools/compileconfig.py --config=$(PREFIX)/test/catlfish-test.cfg --testshellvars=$(PREFIX)/test/test.shvars --machines 1
 
-tests:
+tests: basic-tests
+
+basic-tests:
 	@make tests-makemk
 	rm -r $(INSTDIR)/tests || true
 	mkdir $(INSTDIR)/tests
@@ -24,3 +25,9 @@ perf-tests:
 	rm -r $(INSTDIR)/tests || true
 	mkdir $(INSTDIR)/tests
 	(cd $(INSTDIR)/tests &&	../../test/scripts/perf-test.sh)
+
+continuous-merge-tests:
+	@make tests-makemk
+	rm -r $(INSTDIR)/tests || true
+	mkdir $(INSTDIR)/tests
+	(cd $(INSTDIR)/tests &&	../../test/scripts/continuous-merge-test.sh)
-- 
cgit v1.1