From 19a2a611a839c0318f58347e2d93943c8e2401a5 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Wed, 23 Nov 2016 17:09:48 +0100
Subject: WIP

Merge can run as four separate processes, plus a fifth controlling
proces 'merge'.

Tests are limited to testcase1.py and they're failing because of the
test with the dead merge secondary. Tests are also time consuming
because they're waiting for 60s each time a merge needs to be
verified. This could be improved by peeking at the control files, for
example.
---
 test/Makefile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'test/Makefile')

diff --git a/test/Makefile b/test/Makefile
index bd58cfe..cee5186 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,20 +1,27 @@
 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: tests-basic
+
+tests-basic:
 	@make tests-makemk
 	rm -r $(INSTDIR)/tests || true
 	mkdir $(INSTDIR)/tests
 	(cd $(INSTDIR)/tests &&	../../test/scripts/light-system-test.sh)
+
+tests-continuous-merge:
+	@make tests-makemk
+	rm -r $(INSTDIR)/tests || true
+	mkdir $(INSTDIR)/tests
+	(cd $(INSTDIR)/tests &&	../../test/scripts/continuous-merge-test.sh)
-- 
cgit v1.1