Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -211,12 +211,11 @@ (begin (debug:print 2 *default-log-port* "max-concurrent-jobs: " max-concurrent-jobs ", num-running: " num-running) (set! *last-num-running-tests* num-running))) (if (not (eq? 0 *globalexitstatus*)) (list #f num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit) - (let* ( ;;BBHOLD (all-tests-itemized-and-unexpanded - (can-not-run-more (cond + (let* ((can-not-run-more (cond ;; if max-concurrent-jobs is set and the number running is greater ;; than it then cannot run more jobs ((and max-concurrent-jobs (>= num-running max-concurrent-jobs)) (if (runs:lownoise "mcj msg" 60) (debug:print 0 *default-log-port* "WARNING: Max running jobs exceeded, current number running: " num-running @@ -228,11 +227,10 @@ (>= num-running-in-jobgroup job-group-limit)) (if (runs:lownoise (conc "maxjobgroup " jobgroup) 60) (debug:print 1 *default-log-port* "WARNING: number of jobs " num-running-in-jobgroup " in jobgroup \"" jobgroup "\" exceeds limit of " job-group-limit)) #t) - ;; BBHOLD ((and (eq? 0 num-running) all-tests-itemized-and-unexpanded) #f) (else #f)))) (list (not can-not-run-more) num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit))))) (define (runs:run-pre-hook run-id) (let* ((run-pre-hook (configf:lookup *configdat* "runs" "pre-hook")) @@ -1327,18 +1325,10 @@ (runs:incremental-print-results run-id) - - ;; ;; check if all remaining tests if - ;; ;; 1) all tests remaining have unexpanded tests - ;; ;; 2) all tests remaining are NOT STARTED - ;; ;; 3) all tests remaining are itemized - ;; (or (procedure? items)(eq? items 'have-procedure)) - - (if (not (null? reruns))(debug:print-info 4 *default-log-port* "reruns=" reruns)) ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes ;; moving this to a parallel thread and just run it once. ;;