Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -122,10 +122,11 @@
   -list-servers           : list the servers 
   -stop-server id         : stop server specified by id (see output of -list-servers), use
                             0 to kill all
   -repl                   : start a repl (useful for extending megatest)
   -load file.scm          : load and run file.scm
+  -mark-incompletes       : find and mark incomplete tests
 
 Spreadsheet generation
   -extract-ods fname.ods  : extract an open document spreadsheet from the database
   -pathmod path           : insert path, i.e. path/runame/itempath/logfile.html
                             will clear the field if no rundir/testname/itempath/logfile
@@ -233,10 +234,11 @@
 			"-rebuild-db"
 			"-cleanup-db"
 			"-rollup"
 			"-update-meta"
 			"-gen-megatest-area"
+			"-mark-incompletes"
 
 			"-logging"
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
 		       )
@@ -1090,10 +1092,19 @@
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       (open-run-close db:clean-up #f)
       (set! *didsomething* #t)))
+
+(if (args:get-arg "-mark-incompletes")
+    (begin
+      (if (not (setup-for-run))
+	  (begin
+	    (debug:print 0 "Failed to setup, exiting") 
+	    (exit 1)))
+      (open-run-close db:find-and-mark-incomplete #f)
+      (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Wait on a run to complete
 ;;======================================================================
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -726,11 +726,11 @@
   ;; NB// Should expand items here and then insert into the run queue.
   (debug:print 5 "test-records: " test-records ", flags: " (hash-table->alist flags))
 
   ;; Do mark-and-find clean up of db before starting runing of quue
   ;;
-  (cdb:remote-run db:find-and-mark-incomplete #f)
+  ;; (cdb:remote-run db:find-and-mark-incomplete #f)
 
   (let ((run-info              (cdb:remote-run db:get-run-info #f run-id))
 	(tests-info            (mt:get-tests-for-run run-id #f '() '())) ;;  qryvals: "id,testname,item_path"))
 	(sorted-test-names     (tests:sort-by-priority-and-waiton test-records))
 	(test-registry         (make-hash-table))
@@ -761,14 +761,14 @@
 	       (reg         '()) ;; registered, put these at the head of tal 
 	       (reruns      '()))
       (if (not (null? reruns))(debug:print-info 4 "reruns=" reruns))
 
       ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes
-      (if (> (current-seconds)(+ last-time-incomplete 900))
-	  (begin
-	    (set! last-time-incomplete (current-seconds))
-	    (cdb:remote-run db:find-and-mark-incomplete #f)))
+      ;; (if (> (current-seconds)(+ last-time-incomplete 900))
+      ;;     (begin
+      ;;       (set! last-time-incomplete (current-seconds))
+      ;;       (cdb:remote-run db:find-and-mark-incomplete #f)))
 
       ;; (print "Top of loop, hed=" hed ", tal=" tal " ,reruns=" reruns)
       (let* ((test-record (hash-table-ref test-records hed))
 	     (test-name   (tests:testqueue-get-testname test-record))
 	     (tconfig     (tests:testqueue-get-testconfig test-record))

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -31,16 +31,17 @@
 #
 runqueue 20
 
 # Default runtimelim 1d 1h 1m 10s
 #
-runtimelim 10m
+runtimelim 20m
 
 # Deadtime - when to consider tests dead (i.e. haven't heard from them in too long)
-# Number in seconds
+# Number in seconds, set to 20 seconds here to trigger a little trouble. Default is
+# 1800
 #
-deadtime 25
+deadtime 600
 
 # 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
 #