Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1640,11 +1640,11 @@
 	(if (not (null? testnames))
 	    (sqlite3:first-result
 	     (db:get-db dbstruct run-id)
 	     (conc "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND testname in ('"
 		   (string-intersperse testnames "','")
-		   "');"))
+		   "') AND NOT (item_path='');")) ;; should this include the (uname = 'n/a' ...) ???
 	    0))))
              ;; DEBUG FIXME - need to merge this v.155 query correctly   
              ;; AND testname in (SELECT testname FROM test_meta WHERE jobgroup=?)
              ;; AND NOT (uname = 'n/a' AND item_path = '');"
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1286,19 +1286,20 @@
 			   (process-signal (current-process-id) signal/kill))))))))
 	((KILLED) 
 	 (debug:print 1 "NOTE: " full-test-name " is already running or was explictly killed, use -force to launch it.")
 	 (hash-table-set! test-registry (runs:make-full-test-name test-name test-path) 'DONOTRUN)) ;; KILLED))
 	((LAUNCHED REMOTEHOSTSTART RUNNING)  
-	 (if (> (- (current-seconds)(+ (db:test-get-event_time testdat)
-				       (db:test-get-run_duration testdat)))
-		(or incomplete-timeout
-		    6000)) ;; i.e. no update for more than 6000 seconds
-	     (begin
-	       (debug:print 0 "WARNING: Test " test-name " appears to be dead. Forcing it to state INCOMPLETE and status STUCK/DEAD")
-	       (tests:test-set-status! run-id test-id "INCOMPLETE" "STUCK/DEAD" "" #f))
-	       ;; (tests:test-set-status! test-id "INCOMPLETE" "STUCK/DEAD" "" #f))
-	     (debug:print 2 "NOTE: " test-name " is already running")))
+	 (debug:print 2 "NOTE: " test-name " is already running"))
+	;; (if (> (- (current-seconds)(+ (db:test-get-event_time testdat)
+	;; 			       (db:test-get-run_duration testdat)))
+	;; 	(or incomplete-timeout
+	;; 	    6000)) ;; i.e. no update for more than 6000 seconds
+	;;      (begin
+	;;        (debug:print 0 "WARNING: Test " test-name " appears to be dead. Forcing it to state INCOMPLETE and status STUCK/DEAD")
+	;;        (tests:test-set-status! run-id test-id "INCOMPLETE" "STUCK/DEAD" "" #f))
+	;;        ;; (tests:test-set-status! test-id "INCOMPLETE" "STUCK/DEAD" "" #f))
+	;;      (debug:print 2 "NOTE: " test-name " is already running")))
 	(else      
 	 (debug:print 0 "ERROR: Failed to launch test " full-test-name ". Unrecognised state " (test:get-state testdat))
 	 (case (string->symbol (test:get-state testdat)) 
 	   ((COMPLETED INCOMPLETE)
 	    (hash-table-set! test-registry (runs:make-full-test-name test-name test-path) 'DONOTRUN))