Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -3256,10 +3256,12 @@
 ;;
 ;; if test-name is an integer work off that instead of test-name test-path
 ;;
 (define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment)
   ;; establish info on incoming test followed by info on top level test
+  ;; BBnote - for mode itemwait, linkage between upstream test & matching item status is propagated to run queue in db:prereqs-not-met
+  
   (let* ((testdat      (if (number? test-name)
 			   (db:get-test-info-by-id dbstruct run-id test-name) ;; test-name is actually a test-id
 			   (db:get-test-info       dbstruct run-id test-name item-path)))
 	 (test-id      (db:test-get-id testdat))
 	 (test-name    (if (number? test-name)
@@ -3326,11 +3328,11 @@
                                                ;;         "COMPLETED"
                                                ;;         (car all-curr-states))))
                             (newstatus            (if (or (> bad-not-started 0)
 							  (and (equal? newstate "NOT_STARTED")
 							       (> num-non-completes 0)))
-						      "CHECK"
+						      "n/a"
                                                       (car all-curr-statuses))))
                        ;; (print "bad-not-supported: " bad-not-support " all-curr-states: " all-curr-states " all-curr-statuses: " all-curr-states)
                        ;;      " 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)))))))
@@ -3861,10 +3863,11 @@
 ;;       mode 'itemmatch or 'itemwait means that tests items must be COMPLETED and (PASS|WARN|WAIVED|CHECK) [[ NB// NOT IMPLEMENTED YET ]]
 ;;       mode 'exclusive means this test/item cannot run if the same test/item is LAUNCHED,REMOTEHOSTSTART or RUNNING
 ;; 
 ;; (define (db:get-prereqs-not-met dbstruct run-id waitons ref-item-path mode)
 (define (db:get-prereqs-not-met dbstruct run-id waitons ref-test-name ref-item-path mode itemmaps) ;; #!key (mode '(normal))(itemmap #f))
+  ;; BBnote - rollup of an itemized test's overall state/status done in db:set-state-status-and-roll-up-items
   (append
    (if (member 'exclusive mode)
        (let ((running-tests (db:get-tests-for-run dbstruct
 						  #f  ;; run-id of #f means for all runs. 
 						  (if (string=? ref-item-path "")   ;; testpatt
@@ -3902,15 +3905,15 @@
 	    (let ((tests             (db:get-tests-for-run-state-status dbstruct run-id waitontest-name))
 		  (ever-seen         #f)
 		  (parent-waiton-met #f)
 		  (item-waiton-met   #f))
 	      (for-each 
-	       (lambda (test)
+	       (lambda (test) ;; BB- this is the upstream test
 		 ;; (if (equal? waitontest-name (db:test-get-testname test)) ;; by defintion this had better be true ...
 		 (let* ((state             (db:test-get-state test))
 			(status            (db:test-get-status test))
-			(item-path         (db:test-get-item-path test))
+			(item-path         (db:test-get-item-path test)) ;; BB- this is the upstream itempath
 			(is-completed      (equal? state "COMPLETED"))
 			(is-running        (equal? state "RUNNING"))
 			(is-killed         (equal? state "KILLED"))
 			(is-ok             (member status '("PASS" "WARN" "CHECK" "WAIVED" "SKIP")))
 			;;                                       testname-b    path-a    path-b
@@ -3931,12 +3934,12 @@
 		    ((and (not (null? (lset-intersection eq? mode '(itemmatch itemwait)))) ;; how is that different from (member mode '(itemmatch itemwait)) ?????
 			  ;; (not (equal? item-path "")) ;; this applies to both top level (to allow launching of next batch) and items
 			  same-itempath)
 		     (if (and is-completed is-ok)
 			 (set! item-waiton-met #t))
-		     (if (and (equal? item-path "")
-			      (or is-completed is-running));; this is the parent, set it to run if completed or running
+		     (if (and (equal? item-path "") ;; if upstream rollup test is completed, parent-waiton-met is set
+			      (or is-completed is-running));; this is the parent, set it to run if completed or running ;; BB1
 			 (set! parent-waiton-met #t)))
 		    ;; normal checking of parent items, any parent or parent item not ok blocks running
 		    ((and is-completed
 			  (or is-ok 
 			      (member 'toplevel mode))              ;; toplevel does not block on FAIL

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.6413)
+(define megatest-version 1.6414)
 

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -183,18 +183,27 @@
 ;; no elegance here ...
 ;;
 (define (tasks:kill-server hostname pid #!key (kill-switch ""))
   (debug:print-info 0 *default-log-port* "Attempting to kill server process " pid " on host " hostname)
   (setenv "TARGETHOST" hostname)
-  (let ((logdir (if (directory-exists? "logs")
+  (let* ((logdir (if (directory-exists? "logs")
                     "logs/"
-                    "")))
+                    ""))
+         (logfile (if logdir (conc "logs/server-"pid"-"hostname".log") #f))
+         (gzfile  (if logfile (conc logfile ".gz"))))
     (setenv "TARGETHOST_LOGF" (conc logdir "server-kills.log"))
+
     (system (conc "nbfake kill "kill-switch" "pid))
+
+    (when logfile
+      (thread-sleep! 0.5)
+      (if (file-exists? gzfile) (delete-file gzfile))
+      (system (conc "gzip "logfile))
+      
+      (unsetenv "TARGETHOST_LOGF")
+      (unsetenv "TARGETHOST"))))
     
-    (unsetenv "TARGETHOST_LOGF")
-    (unsetenv "TARGETHOST")))
  
 ;;======================================================================
 ;; M O N I T O R S
 ;;======================================================================