Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -104,14 +104,16 @@
              WHERE run_id=? AND testname=? AND item_path='';"
 	   run-id test-name run-id test-name run-id test-name)
 	  (sqlite3:execute
 	   db
 	   "UPDATE tests
-             SET state='COMPLETED',
+             SET state=CASE WHEN (SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND state in ('RUNNING','NOT_STARTED')) > 0 THEN 
+                          'RUNNING'
+                       ELSE 'COMPLETED' END,
                 status=CASE WHEN fail_count > 0 THEN 'FAIL' WHEN pass_count > 0 AND fail_count=0 THEN 'PASS' ELSE 'UNKNOWN' END
              WHERE run_id=? AND testname=? AND item_path='';"
-	   run-id test-name)))
+	   run-id test-name run-id test-name)))
     (if (and (not (null? comment))
 	     (car comment))
 	(sqlite3:execute db "UPDATE tests SET comment=? WHERE run_id=? AND testname=? AND item_path=?;"
 			 (car comment) run-id test-name item-path))))
 

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -5,11 +5,11 @@
 runall :
 	cd ../;make 
 	$(MEGATEST) -keepgoing -runall :sysname ubuntu :fsname nfs :datapath none :runname `date +%GWW%V.%u` -m "This is a comment specific to a run" -v
 
 test :
-	csi -I .. ../megatest.scm -- -runall :sysname ubuntu :fsname afs :datapath tmp :runname blah
+	csi -b -I .. ../megatest.scm -- -runall :sysname ubuntu :fsname afs :datapath tmp :runname blah
 	cd ../;make test
 	make runall
 
 dashboard :
 	cd ../;make dashboard