Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -95,11 +95,11 @@
 			 (lambda (testdat)
 			   (let ((newcomment (db:test-get-comment testdat)))
 			     (if *dashboard-comment-share-slot*
 				 (if (not (equal? (iup:attribute *dashboard-comment-share-slot* "VALUE")
 						  newcomment))
-				     (iup:attribute-set! *dashboard-comment-slot*
+				     (iup:attribute-set! *dashboard-comment-share-slot*
 							 "VALUE"
 							 newcomment)))
 			     newcomment)))
 	    (store-label "testid"
 			 (iup:label "TestId                             "

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1342,11 +1342,11 @@
 ;;	     (run-id    (list-ref toptest 5)))
 	 (db:top-test-set-per-pf-counts db run-id test-name)))
      toplevels)))
 
 (define (db:top-test-set-per-pf-counts db run-id test-name)
-  (db:general-call db 'top-test-set-per-pf-counts (list test-name test-name run-id test-name test-name test-name test-name test-name test-name test-name test-name))) ;; (list run-id test-name))))
+  (db:general-call db 'top-test-set-per-pf-counts (list test-name test-name run-id test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name))) 
  
 		     
 ;; Clean out old junk and vacuum the database
 ;;
 ;; Ultimately do something like this:
@@ -2937,34 +2937,43 @@
                                               AND item_path != ''
                                               AND state NOT IN ('DELETED')
                                               AND status = 'ABORT') > 0 THEN 'ABORT'
                                   WHEN (SELECT count(id) FROM tests
                                          WHERE testname=?
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-                                              AND status = 'CHECK') > 0 THEN 'CHECK'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-
-                                              AND status = 'SKIP') > 0 THEN 'SKIP'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
                                               AND item_path != ''
                                               AND state NOT IN ('DELETED')
                                               AND status = 'AUTO') > 0 THEN 'AUTO'
                                   WHEN (SELECT count(id) FROM tests
                                          WHERE testname=?
                                               AND item_path != ''
                                               AND state NOT IN ('DELETED')
                                               AND status IN ('STUCK/INCOMPLETE', 'INCOMPLETE')) > 0 THEN 'INCOMPLETE'
                                   WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status = 'CHECK') > 0 THEN 'CHECK'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status = 'SKIP') > 0 THEN 'SKIP'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status = 'WARN') > 0 THEN 'WARN'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status = 'WAIVED') > 0 THEN 'WAIVED'
+                                  WHEN (SELECT count(id) FROM tests
                                          WHERE testname=? 
                                               AND item_path != ''
                                               AND state NOT IN ('DELETED')
-                                              AND status NOT IN ('PASS','FAIL')) > 0 THEN 'ABORT'
+                                              AND status NOT IN ('PASS','FAIL','WARN','WAIVED')) > 0 THEN 'ABORT'
                                   WHEN fail_count > 0 THEN 'FAIL' 
                                   WHEN pass_count > 0 AND fail_count=0 THEN 'PASS' 
                                   ELSE 'UNKNOWN' END
                        WHERE testname=? AND item_path='';") ;; DONE