Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -808,10 +808,11 @@ (test-name (runs:testdat-test-name testdat)) (item-path (runs:testdat-item-path testdat)) (jobgroup (runs:testdat-jobgroup testdat)) (waitons (runs:testdat-waitons testdat)) (item-path (runs:testdat-item-path testdat)) + (tfullname (db:test-make-full-name test-name item-path)) (testmode (runs:testdat-testmode testdat)) (newtal (runs:testdat-newtal testdat)) (itemmaps (runs:testdat-itemmaps testdat)) (test-record (runs:testdat-test-record testdat)) (prereqs-not-met (runs:testdat-prereqs-not-met testdat)) @@ -857,13 +858,13 @@ (if (vector? t) (conc (db:test-get-state t) "/" (db:test-get-status t)) (conc " WARNING: t is not a vector=" t ))) prereqs-not-met) ", ") ") fails: " fails - "\nregistered? " (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f)) + "\nregistered? " (hash-table-ref/default test-registry tfullname #f)) - + (if (not (hash-table-ref/default test-registry tfullname #f))(hash-table-set! test-registry tfullname #f)) (if (and (not (null? prereqs-not-met)) (runs:lownoise (conc "waiting on tests " prereqs-not-met hed) 60)) (debug:print-info 2 *default-log-port* "waiting on tests; " (string-intersperse (runs:mixed-list-testname-and-testrec->list-of-strings prereqs-not-met) ", "))) @@ -967,16 +968,17 @@ (runs:queue-next-reg tal reg reglen regfull) reruns) #f)) ;; this might speed things up!? - ;; ((null? (filter (lambda (x) - ;; (not (member (hash-table-ref/default test-registry x) - ;; '(done removed)))) - ;; (hash-table-keys test-registry))) - ;; (debug:print 0 *default-log-port* "NOTHING LEFT TO RUN!") - ;; #f) + ((and (eq? 0 num-running) + (null? (filter (lambda (x) + (not (member (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) 'x) + '(done removed)))) + (hash-table-keys test-registry)))) + (debug:print 0 *default-log-port* "NOTHING LEFT TO RUN!") + #f) ;; must be we have unmet prerequisites ;; (else (debug:print 4 *default-log-port* "FAILS: " fails)