Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -98,56 +98,59 @@
     ;; first look up the key values from the run selected by run-id
     (sqlite3:for-each-row 
      (lambda (a . b)
        (set! keyvals (cons a b)))
      db
-     (conc "SELECT " selstr " FROM runs WHERE run_id=? ORDER BY event_time DESC;"))
+     (conc "SELECT " selstr " FROM runs WHERE id=? ORDER BY event_time DESC;") run-id)
     (if (not keyvals)
 	#f
 	(let ((prev-run-ids '()))
 	  (apply sqlite3:for-each-row
 		 (lambda (id)
 		   (set! prev-run-ids (cons id prev-run-ids)))
 		 db
-		 (conc "SELECT run_id FROM runs WHERE " qrystr ";"))
+		 (conc "SELECT id FROM runs WHERE " qrystr " AND id != ?;") (append keyvals (list run-id)))
 	  ;; for each run starting with the most recent look to see if there is a matching test
 	  ;; if found then return that matching test record
+	  (debug:print 4 "selstr: " selstr ", qrystr: " qrystr ", keyvals: " keyvals ", previous run ids found: " prev-run-ids)
 	  (if (null? prev-run-ids) #f
 	      (let loop ((hed (car prev-run-ids))
 			 (tal (cdr prev-run-ids)))
-		(let ((results (db-get-tests-for-run db test-name item-path)))
+		(let ((results (db-get-tests-for-run db hed test-name item-path)))
+		  (debug:print 4 "Got tests for run-id " run-id ", test-name " test-name ", item-path " item-path ": " results)
 		  (if (and (null? results)
 			   (not (null? tal)))
 		      (loop (car tal)(cdr tal))
 		      (car results)))))))))
     
 
 (define (test-set-status! db run-id test-name state status itemdat-or-path comment dat)
-  (let ((real-status status)
-	(item-path   (if (string? itemdat-or-path) itemdat-or-path (item-list->path itemdat-or-path)))
-	(otherdat    (if dat dat (make-hash-table)))
-	;; before proceeding we must find out if the previous test (where all keys matched except runname)
-	;; was WAIVED if this test is FAIL
-	(waived   (if (equal? status "FAIL")
-		      (let ((prev-test (test:get-previous-test-run-records db run-id test-name item-path)))
-			(if (and prev-test (not (null? prev-test))) ;; true if we found a previous test in this run series
-			    (let ((prev-status (db:test-get-status   prev-test))
-				  (prev-state  (db:test-get-state    prev-test))
-				  (prev-comment (db:test-get-comment prev-test)))
-			      (if (and (equal? prev-status "COMPLETED")
-				       (equal? prev-state  "WAIVED"))
-				  prev-comment ;; waived is either the comment or #f
-				  #f))
-			    #f))
-		      #f)))
-
+  (let* ((real-status status)
+	 (item-path   (if (string? itemdat-or-path) itemdat-or-path (item-list->path itemdat-or-path)))
+	 (otherdat    (if dat dat (make-hash-table)))
+	 ;; before proceeding we must find out if the previous test (where all keys matched except runname)
+	 ;; was WAIVED if this test is FAIL
+	 (waived   (if (equal? status "FAIL")
+		       (let ((prev-test (test:get-previous-test-run-records db run-id test-name item-path)))
+			 (if prev-test ;; true if we found a previous test in this run series
+			     (let ((prev-status (db:test-get-status   prev-test))
+				   (prev-state  (db:test-get-state    prev-test))
+				   (prev-comment (db:test-get-comment prev-test)))
+			       (debug:print 4 "prev-status " prev-status ", prev-state " prev-state ", prev-comment " prev-comment)
+			       (if (and (equal? prev-state  "COMPLETED")
+					(equal? prev-status "WAIVED"))
+				   prev-comment ;; waived is either the comment or #f
+				   #f))
+			     #f))
+		       #f)))
     (if waived (set! real-status "WAIVED"))
+    (debug:print 4 "real-status " real-status ", waived " waived ", status " status)
 
     ;; update the primary record IF state AND status are defined
     (if (and state status)
 	(sqlite3:execute db "UPDATE tests SET state=?,status=?,event_time=strftime('%s','now') WHERE run_id=? AND testname=? AND item_path=?;" 
-			 state status run-id test-name item-path))
+			 state real-status run-id test-name item-path))
     ;; add metadata (need to do this way to avoid SQL injection issues)
     ;; :value
     (let ((val (hash-table-ref/default otherdat ":value" #f)))
       (if val
 	  (sqlite3:execute db "UPDATE tests SET value=? WHERE run_id=? AND testname=? AND item_path=?;" val run-id test-name item-path)))
@@ -177,17 +180,18 @@
 
     ;; need to update the top test record if PASS or FAIL and this is a subtest
     (if (and (not (equal? item-path ""))
 	     (or (equal? status "PASS")
 		 (equal? status "WARN")
-		 (equal? status "FAIL")))
+		 (equal? status "FAIL")
+		 (equal? status "WAIVED")))
 	(begin
 	  (sqlite3:execute 
 	   db
 	   "UPDATE tests 
              SET fail_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND status='FAIL'),
-                 pass_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND (status='PASS' OR status='WARN'))
+                 pass_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND (status='PASS' OR status='WARN' OR status='WAIVED'))
              WHERE run_id=? AND testname=? AND item_path='';"
 	   run-id test-name run-id test-name run-id test-name)
 	  (sqlite3:execute
 	   db
 	   "UPDATE tests

Index: tests/tests/runfirst/main.sh
==================================================================
--- tests/tests/runfirst/main.sh
+++ tests/tests/runfirst/main.sh
@@ -7,5 +7,7 @@
 touch ../I_was_here
 
 $MT_MEGATEST -runstep wasting_time -logpro wasting_time.logpro "sleep 8;echo all done eh?" -m "This is a test step comment"
 
 $MT_MEGATEST -test-status :state COMPLETED :status $? -m "This is a test level comment" -set-toplog the_top_log.html :value 1e6 :expected_value 1.1e6 :tol 100e3
+
+# $MT_MEGATEST -test-status :state COMPLETED :status FAIL