Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -465,17 +465,22 @@
 ;;======================================================================
 ;; M A I N T E N A N C E
 ;;======================================================================
 
 (define (db:find-and-mark-incomplete db)
-  (let ((incompleted '()))
+  (let* ((incompleted '())
+	 (deadtime-str (configf:lookup *configdat* "setup" "deadtime"))
+	 (deadtime     (if (and deadtime-str
+				(string->number deadtime-str))
+			   (string->number deadtime-str)
+			   1800)))
     (sqlite3:for-each-row 
      (lambda (test-id)
        (set! incompleted (cons test-id incompleted)))
      db
      "SELECT id FROM tests WHERE event_time<? AND state IN ('RUNNING','REMOTEHOSTSTART');"
-     (- (current-seconds) 600)) ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes
+     (- (current-seconds) deadtime)) ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes
     (sqlite3:for-each-row
      (lambda (test-id)
        (set! incompleted (cons test-id incompleted)))
      db
      "SELECT id FROM tests WHERE event_time<? AND state IN ('LAUNCHED');"

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -32,10 +32,15 @@
 runqueue 20
 
 # Default runtimelim 1d 1h 1m 10s
 #
 runtimelim 10m
+
+# Deadtime - when to consider tests dead (i.e. haven't heard from them in too long)
+# Number in seconds
+#
+deadtime 5
 
 # It is possible (but not recommended) to override the rsync command used
 # to populate the test directories. For test development the following 
 # example can be useful
 #