Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -3323,11 +3323,11 @@
        (let ((tr-res
               (sqlite3:with-transaction
                db
                (lambda ()
                  ;; NB// Pass the db so it is part fo the transaction
-                 (db:test-set-state-status db run-id test-id state status comment)
+                 (db:test-set-state-status db run-id test-id state status comment) ;; this call sets the item state/status
                  (if (not (equal? item-path "")) ;; only roll up IF incoming test is an item
                      (let* ((state-status-counts  (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path)) ;; item-path is used to exclude current state/status of THIS test
                             (running              (length (filter (lambda (x)
                                                                     (member (dbr:counts-state x) *common:running-states*))
                                                                   state-status-counts)))
@@ -3342,18 +3342,28 @@
                                                 *common:std-states* >))
                             (all-curr-statuses (common:special-sort  ;; worst -> best
                                                 (delete-duplicates
                                                  (cons status (map dbr:counts-status state-status-counts)))
                                                 *common:std-statuses* >))
-                            (newstate          (if (> running 0)
-                                                   "RUNNING"
-                                                   (if (> bad-not-started 0)
-                                                       "COMPLETED"
-                                                       (car all-curr-states))))
+			    (non-completes     (filter (lambda (x)
+							 (not (equal? x "COMPLETED")))
+						       all-curr-states))
+                            (newstate          (cond
+						((> (length non-completes) 0) ;;
+						 (car non-completes))  ;;  (remove (lambda (x)(equal? "COMPLETED" x)) all-curr-states)))
+						(else
+						 (car all-curr-states))))
+			                       ;; (if (> running 0)
+                                               ;;     "RUNNING"
+                                               ;;     (if (> bad-not-started 0)
+                                               ;;         "COMPLETED"
+                                               ;;         (car all-curr-states))))
                             (newstatus         (if (> bad-not-started 0)
                                                    "CHECK"
                                                    (car all-curr-statuses))))
+		       (print "running: " running " bad-not-started: " bad-not-started " all-curr-states: " all-curr-states " non-completes: " non-completes " state-status-counts: " state-status-counts
+			      " newstate: " newstate " newstatus: " newstatus)
                        ;; NB// Pass the db so it is part of the transaction
                        (db:test-set-state-status db run-id tl-test-id newstate newstatus #f)))))))
          (mutex-unlock! *db-transaction-mutex*)
          (if (and test-id state status (equal? status "AUTO")) 
              (db:test-data-rollup dbstruct run-id test-id status))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -813,17 +813,20 @@
 	   *toppath*
 	   (not force-reread)) ;; no need to reprocess
       *toppath*   ;; return toppath
       (let* ((use-cache (common:use-cache?))
 	     (toppath  (or *toppath* areapath (getenv "MT_RUN_AREA_HOME"))) ;; preserve toppath
+	     
 	     (runname  (common:args-get-runname))
 	     (target   (common:args-get-target))
 	     (linktree (common:get-linktree))
 	     (contour  #f) ;; NOT READY FOR THIS (args:get-arg "-contour"))
 	     (sections (if target (list "default" target) #f)) ;; for runconfigs
 	     (mtconfig (or (args:get-arg "-config") "megatest.config")) ;; allow overriding megatest.config 
-	     (rundir   (if (and runname target linktree)(conc linktree (if contour (conc "/" contour) "") "/" target "/" runname) #f))
+	     (rundir   (if (and runname target linktree)
+			   (conc linktree (if contour (conc "/" contour) "") "/" target "/" runname)
+			   #f))
              
 	     (mtcachef (and rundir (conc rundir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
 	     (rccachef (and rundir (conc rundir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
 	     (cancreate (and rundir (common:file-exists? rundir)(file-write-access? rundir) (not (common:in-running-test?)))))
 	;; (cxt       (hash-table-ref/default *contexts* toppath #f)))