@@ -3,21 +3,36 @@
 BINPATH=$(shell realpath ../bin)
 MEGATEST=$(BINPATH)/megatest
 PATH := $(BINPATH):$(PATH)
 RUNNAME := $(shell date +w%V.%u.%H)
 
-runall :
-	@echo WARNING: These tests will kill megatest and dashboard!
-	@sleep 3
-	killall -9 dboard || true
-	killall -9 megatest || true
-	cd ../;make install
+runall : test1 test2
+
+test1 : cleanprep
+	$(MEGATEST) -runtests ez_pass -target ubuntu/nfs/none :runname $(RUNNAME)_a -server -
+
+test2 : cleanprep
+	$(MEGATEST) -runtests runfirst -target ubuntu/nfs/none :runname $(RUNNAME)_b  -server - -debug 10
+
+test3 : cleanprep
+	$(MEGATEST) -runall -target ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v -server -
+
+cleanprep : ../*.scm
+	sqlite3 megatest.db "delete from metadat where var='SERVER';"
 	mkdir -p /tmp/mt_runs /tmp/mt_links
+	cd ..;make
+	@sleep 1
+	@if ps -def |awk '{print $8}'|grep megatest; then \
+	   echo WARNING: These tests will kill megatest and dashboard!; \
+	   sleep 3; \
+	   killall -9 dboard || true; \
+  	   killall -9 megatest || true; \
+	fi
+	cd ../;make install
 	$(MEGATEST) -remove-runs :runname $(RUNNAME)% -target %/%/% -testpatt % -itempatt %
 	$(BINPATH)/dboard -rows 15 &
-	$(MEGATEST) -runall -target ubuntu/nfs/none :runname $(RUNNAME)_a
-	$(MEGATEST) -runall -target ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v -server -
+	touch cleanprep
 
 test :
 	csi -b -I .. ../megatest.scm -- -runall -target ubuntu/afs/tmp :runname blah
 	cd ../;make test
 	make runall