Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -2831,24 +2831,28 @@
 	(db:general-call dbdat 'set-test-start-time (list test-id)))
     (if msg
 	(db:general-call dbdat 'state-status-msg (list state status msg test-id))
 	(db:general-call dbdat 'state-status     (list state status test-id)))))
 
-(define (db:roll-up-pass-fail-counts dbstruct run-id test-name item-path status)
+(define (db:roll-up-pass-fail-counts dbstruct run-id test-name item-path state status)
   (if ;; (and
       (not (equal? item-path ""))
    ;; (not (member status '("PASS" "WARN" "FAIL" "WAIVED" "RUNNING" "CHECK" "SKIP" "LAUNCHED")))
       (let ((dbdat (db:get-db dbstruct run-id)))
 	(db:general-call dbdat 'update-pass-fail-counts (list test-name test-name test-name))
-	(if (equal? status "RUNNING")
-	    (db:general-call dbdat 'top-test-set-running (list test-name))
-	    (if (equal? status "LAUNCHED")
-		(db:general-call dbdat 'top-test-set (list "LAUNCHED" test-name))
-		(let ((db (db:dbdat-get-db dbdat)))
-		  (db:top-test-set-per-pf-counts db run-id test-name))))
+	;; NOTE: No else clause needed for this case
+	(case (string->symbol status)
+	 ((RUNNING)  (db:general-call dbdat 'top-test-set-running (list test-name)))
+	 ((LAUNCHED) (db:general-call dbdat 'top-test-set (list "LAUNCHED" test-name)))
+	 ((ABORT INCOMPLETE) (db:general-call dbdat 'top-test-set (list status test-name))))
+	(let ((db (db:dbdat-get-db dbdat)))
+	  (db:top-test-set-per-pf-counts db run-id test-name))
 	#f)
-      #f))
+      ;; if the test is not COMPLETED then this routine should not have been called
+      (begin
+	(debug:print 0 "ERROR: db:test-set-state-status called with state " state " and status " status)
+	#f)))
 
 (define (db:test-get-logfile-info dbstruct run-id test-name)
   (db:with-db
    dbstruct
    run-id
@@ -2907,11 +2911,11 @@
 	'(update-uname-host       "UPDATE tests SET uname=?,host=? WHERE id=?;")       ;; DONE
 	'(update-test-state       "UPDATE tests SET state=? WHERE state=? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")
 	'(update-test-status      "UPDATE tests SET status=? WHERE status like ? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")
 	;; stuff for roll-up-pass-fail-counts
 	'(update-pass-fail-counts "UPDATE tests 
-             SET fail_count=(SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status IN ('FAIL','CHECK')),
+             SET fail_count=(SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status IN ('FAIL','CHECK','INCOMPLETE','ABORT')),
                  pass_count=(SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status IN ('PASS','WARN','WAIVED'))
              WHERE testname=? AND item_path='';") ;; DONE
 	'(top-test-set          "UPDATE tests SET state=? WHERE testname=? AND item_path='';") ;; DONE
 	'(top-test-set-running  "UPDATE tests SET state='RUNNING' WHERE testname=? AND item_path='';") ;; DONE
 	'(top-test-set-per-pf-counts "UPDATE tests

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -319,11 +319,11 @@
 				 ;; force RUNNING/n/a
 				 
 
 				 ;; (thread-sleep! 0.3)
 				 (tests:test-force-state-status! run-id test-id "RUNNING" "n/a")
-				 (rmt:roll-up-pass-fail-counts run-id test-name item-path "RUNNING")
+				 (rmt:roll-up-pass-fail-counts run-id test-name item-path #f "RUNNING")
 				 ;; (thread-sleep! 0.3) ;; NFS slowness has caused grief here
 
 				 ;; if there is a runscript do it first
 				 (if fullrunscript
 				     (let ((pid (process-run fullrunscript)))
@@ -845,11 +845,11 @@
 	  (runs:remove-test-directory testinfo 'remove-data-only))) ;; remove data only, do not perturb the record
 
     ;; prevent overlapping actions - set to LAUNCHED as early as possible
     ;;
     (tests:test-set-status! run-id test-id "LAUNCHED" "n/a" #f #f) ;; (if launch-results launch-results "FAILED"))
-    (rmt:roll-up-pass-fail-counts run-id test-name item-path "LAUNCHED")
+    (rmt:roll-up-pass-fail-counts run-id test-name item-path #f "LAUNCHED")
     (set! diskpath (get-best-disk *configdat*))
     (if diskpath
 	(let ((dat  (create-work-area run-id run-info keyvals test-id test-path diskpath test-name itemdat)))
 	  (set! work-area (car dat))
 	  (set! toptest-work-area (cadr dat))

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two or four digit decimal
 ;; 1.01, 1.02...1.10,1.11,1,1101 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.6016)
+(define megatest-version 1.6017)
 

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -521,12 +521,14 @@
   (rmt:send-receive 'get-count-tests-running-for-testname run-id (list run-id testname)))
 
 (define (rmt:get-count-tests-running-in-jobgroup run-id jobgroup)
   (rmt:send-receive 'get-count-tests-running-in-jobgroup run-id (list run-id jobgroup)))
 
-(define (rmt:roll-up-pass-fail-counts run-id test-name item-path status)
-  (rmt:send-receive 'roll-up-pass-fail-counts run-id (list run-id test-name item-path status)))
+;; state and status are extra hints not usually used in the calculation
+;;
+(define (rmt:roll-up-pass-fail-counts run-id test-name item-path state status)
+  (rmt:send-receive 'roll-up-pass-fail-counts run-id (list run-id test-name item-path state status)))
 
 (define (rmt:update-pass-fail-counts run-id test-name)
   (rmt:general-call 'update-fail-pass-counts run-id (list run-id test-name run-id test-name run-id test-name)))
 
 ;;======================================================================

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -878,11 +878,11 @@
 			  (debug:print 0 "WARNING: test " hed " has FAILED prerequitests and we've tried at least 10 times to run it. Giving up now."))
 		      ;; (debug:print 0 "         prereqs: " prereqs-not-met)
 		      (hash-table-set! test-registry hed 'removed)
 		      (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "TEN_STRIKES" #f)
 		      ;; I'm unclear on if this roll up is needed - it may be the root cause of the "all set to FAIL" bug.
-		      (rmt:roll-up-pass-fail-counts run-id test-name item-path "FAIL") ;; treat as FAIL
+		      (rmt:roll-up-pass-fail-counts run-id test-name item-path #f "FAIL") ;; treat as FAIL
 		      (list (if (null? tal)(car newtal)(car tal))
 			    tal
 			    reg
 			    reruns)))))
 	      ;; can't drop this - maybe running? Just keep trying
@@ -900,11 +900,11 @@
 	    (if (not (vector? t))
 		t
 		(let ((state  (db:test-get-state t))
 		      (status (db:test-get-status t)))
 		  (case (string->symbol state)
-		    ((COMPLETED) #f)
+		    ((COMPLETED INCOMPLETE) #f)
 		    ((NOT_STARTED)
 		     (if (member status '("TEN_STRIKES" "BLOCKED" "PREQ_FAIL" "ZERO_ITEMS" "PREQ_DISCARDED" "TIMED_OUT" ))
 			 #f
 			 t))
 		    ((DELETED) #f)
@@ -1179,11 +1179,11 @@
     (debug:print-info 1 "All tests launched")))
 
 (define (runs:calc-fails prereqs-not-met)
   (filter (lambda (test)
 	    (and (vector? test) ;; not (string? test))
-		 (equal? (db:test-get-state test) "COMPLETED")
+		 (member (db:test-get-state test) '("INCOMPLETE" "COMPLETED"))
 		 (not (member (db:test-get-status test)
 			      '("PASS" "WARN" "CHECK" "WAIVED" "SKIP")))))
 	  prereqs-not-met))
 
 (define (runs:calc-prereq-fail prereqs-not-met)
@@ -1196,19 +1196,19 @@
 
 (define (runs:calc-not-completed prereqs-not-met)
   (filter
    (lambda (t)
      (or (not (vector? t))
-	 (not (equal? "COMPLETED" (db:test-get-state t)))))
+	 (not (member (db:test-get-state t) '("INCOMPLETE" "COMPLETED")))))
    prereqs-not-met))
 
-(define (runs:calc-not-completed prereqs-not-met)
-  (filter
-   (lambda (t)
-     (or (not (vector? t))
-	 (not (equal? "COMPLETED" (db:test-get-state t)))))
-   prereqs-not-met))
+;; (define (runs:calc-not-completed prereqs-not-met)
+;;   (filter
+;;    (lambda (t)
+;;      (or (not (vector? t))
+;; 	 (not (equal? "COMPLETED" (db:test-get-state t)))))
+;;    prereqs-not-met))
 
 (define (runs:calc-runnable prereqs-not-met)
   (filter 
    (lambda (t)
      (or (not (vector? t))
@@ -1308,17 +1308,17 @@
 		(if testdat
 		    (string->symbol (test:get-state testdat))
 		    'failed-to-insert))
 	((failed-to-insert)
 	 (debug:print 0 "ERROR: Failed to insert the record into the db"))
-	((NOT_STARTED COMPLETED DELETED)
+	((NOT_STARTED COMPLETED DELETED INCOMPLETE)
 	 (let ((runflag #f))
 	   (cond
 	    ;; -force, run no matter what
 	    (force (set! runflag #t))
 	    ;; NOT_STARTED, run no matter what
-	    ((member (test:get-state testdat) '("DELETED" "NOT_STARTED"))(set! runflag #t))
+	    ((member (test:get-state testdat) '("DELETED" "NOT_STARTED" "INCOMPLETE"))(set! runflag #t))
 	    ;; not -rerun and PASS, WARN or CHECK, do no run
 	    ((and (or (not rerun)
 		      keepgoing)
 		  ;; Require to force re-run for COMPLETED or *anything* + PASS,WARN or CHECK
 		  (or (member (test:get-status testdat) '("PASS" "WARN" "CHECK" "SKIP" "WAIVED"))
@@ -1372,11 +1372,11 @@
 		  ((and skip-check
 			(configf:lookup test-conf "skip" "rundelay"))
 		   ;; run-ids = #f means *all* runs
 		   (let* ((numseconds      (common:hms-string->seconds (configf:lookup test-conf "skip" "rundelay")))
 			  (running-tests   (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f))
-			  (completed-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("COMPLETED") '("PASS" "FAIL" "ABORT") #f))
+			  (completed-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("COMPLETED" "INCOMPLETE") '("PASS" "FAIL" "ABORT") #f)) ;; ironically INCOMPLETE is same as COMPLETED in this contex
 			  (last-run-times  (map db:mintest-get-event_time completed-tests))
 			  (time-since-last (- (current-seconds) (if (null? last-run-times) 0 (apply max last-run-times)))))
 		     (if (or (not (null? running-tests)) ;; have to skip if test is running
 			     (> numseconds time-since-last))
 			 (set! skip-test (conc "Skipping due to previous test run less than " (configf:lookup test-conf "skip" "rundelay") " ago"))))))

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -293,11 +293,11 @@
 	    (rmt:csv->test-data run-id test-id
 				dat))))
       
     ;; need to update the top test record if PASS or FAIL and this is a subtest
     (if (not (equal? item-path ""))
-	(rmt:roll-up-pass-fail-counts run-id test-name item-path status))
+	(rmt:roll-up-pass-fail-counts run-id test-name item-path state status))
 
     (if (or (and (string? comment)
 		 (string-match (regexp "\\S+") comment))
 	    waived)
 	(let ((cmt  (if waived waived comment)))
@@ -680,11 +680,11 @@
 		   (for-each (lambda (waiton)
 			       ;; for now we are waiting only on the parent test
 			       (let* ((parent-test-id (rmt:get-test-id run-id waiton ""))
 				      (wtdat          (rmt:get-testinfo-state-status run-id test-id))) ;; (cdb:get-test-info-by-id *runremote* test-id)))
 				 (if (or (and (equal? (db:test-get-state wtdat) "COMPLETED")
-					      (member (db:test-get-status wtdat) '("FAIL")))
+					      (member (db:test-get-status wtdat) '("FAIL" "ABORT")))
 					 (member (db:test-get-status wtdat)  '("KILLED"))
 					 (member (db:test-get-state wtdat)   '("INCOMPETE")))
 				 ;; (if (or (member (db:test-get-status wtdat)
 				 ;;        	 '("FAIL" "KILLED"))
 				 ;;         (member (db:test-get-state wtdat)

Index: tests/release/runconfigs.config
==================================================================
--- tests/release/runconfigs.config
+++ tests/release/runconfigs.config
@@ -2,6 +2,8 @@
 MTRUNNER   #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../../utils/mtrunner}
 MTTESTDIR  #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/..}
 MTPATH     #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../../bin}
 
 [v1.60/15]
+
+[include atwork.config]
 

Index: tests/release/tests/rollup/testconfig
==================================================================
--- tests/release/tests/rollup/testconfig
+++ tests/release/tests/rollup/testconfig
@@ -5,11 +5,11 @@
 
 [ezsteps]
 
 # Set things up
 clean    $MTRUNNER $MTTESTDIR/fullrun  $MTPATH megatest -remove-runs -testpatt %                    -target  ubuntu/nfs/none -runname #{get var tname}%
-runfirst $MTRUNNER $MTTESTDIR/fullrun  $MTPATH megatest -run         -testpatt runfirst/% -reqtarg ubuntu/nfs/none -runname #{get var tname}   -preclean
+runfirst $MTRUNNER $MTTESTDIR/fullrun  $MTPATH megatest -runtests runfirst/% -reqtarg ubuntu/nfs/none -runname #{get var tname}   -preclean
 firstres $MTRUNNER $MTTESTDIR/fullrun  $MTPATH megatest -list-runs #{get var tname}   -target ubuntu/nfs/none
 
 # Set one test item to INCOMPLETE
 setstate $MTRUNNER $MTTESTDIR/fullrun  $MTPATH megatest -set-state-status INCOMPLETE,FAIL :state COMPLETED :status PASS -testpatt runfirst/b/2 -target ubuntu/nfs/none -runname #{get var tname}