Index: mt.scm ================================================================== --- mt.scm +++ mt.scm @@ -109,20 +109,23 @@ (begin (debug:print-info 1 "Discarding tests from " tests " that are waiting on " failed-test) (let loop ((testn (car tests)) (remt (cdr tests)) (res '())) - (let ((waitons (vector-ref (hash-table-ref/default test-records testn (vector #f #f '())) 2))) + (let* ((test-dat (hash-table-ref/default test-records testn (vector #f #f '()))) + (waitons (vector-ref test-dat 2))) ;; (print "mt:discard-blocked-tests run-id: " run-id " failed-test: " failed-test " testn: " testn " with waitons: " waitons) (if (null? remt) (let ((new-res (reverse res))) ;; (print " new-res: " new-res) new-res) (loop (car remt) (cdr remt) (if (member failed-test waitons) - res + (begin + (debug:print 0 "Discarding test " testn "(" test-dat ") due to " failed-test) + res) (cons testn res))))))))) ;;====================================================================== ;; T R I G G E R S ;;====================================================================== Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -469,10 +469,14 @@ (if (and give-up (not (and (null? tal)(null? reg)))) (let ((trimmed-tal (mt:discard-blocked-tests run-id hed tal test-records)) (trimmed-reg (mt:discard-blocked-tests run-id hed reg test-records))) (debug:print 1 "WARNING: test " hed " has discarded prerequisites, removing it from the queue") + + (let ((test-id (cdb:remote-run db:get-test-id-cached #f run-id hed ""))) + (mt:test-set-state-status-by-id test-id "DEQUED" "PREQ_FAIL" "Failed to run due to failed prerequisites")) + (if (and (null? trimmed-tal) (null? trimmed-reg)) #f (list (runs:queue-next-hed trimmed-tal trimmed-reg reglen regfull) (runs:queue-next-tal trimmed-tal trimmed-reg reglen regfull)