Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -430,46 +430,75 @@ (debug:print 0 "ERROR: The proc from reading the setup did not yield a list - please report this") (exit 1)))))) ((and (null? fails) (not (null? non-completed))) - - ;; num-retries code was here - ;; we use this opportunity to move contents of reg to tal - ;; but also lets check that the prerequisites are all in the newtal or reruns lists - (let* ((allinqueue (map (lambda (x)(if (string? x) x (db:test-get-testname x))) (append newtal reruns))) + ;; prereqstrs is a list of test names as strings that are prereqs for hed (prereqstrs (map (lambda (x)(if (string? x) x (db:test-get-testname x))) prereqs-not-met)) + ;; a prereq that is not found in allinqueue will be put in the notinqueue list + ;; (notinqueue (filter (lambda (x) (not (member x allinqueue))) prereqstrs))) - (if (null? notinqueue) - (if (runs:can-keep-running? hed 5) ;; try five times - (begin - (runs:inc-cant-run-tests hed) - (list (car newtal)(append (cdr newtal) reg) '() reruns)) - (begin - (if (runs:lownoise (conc "no fails prereq, null notinqueue " hed) 30) - (debug:print 1 "WARNING: test " hed " has no failed prerequisites but does have prerequistes that are NOT in the queue: " (string-intersperse notinqueue ", "))) - (list (runs:queue-next-hed tal reg reglen regfull) - (runs:queue-next-tal tal reg reglen regfull) - (runs:queue-next-reg tal reg reglen regfull) - reruns))) - ;; have prereqs in queue, keep going. - (begin - (if (runs:lownoise (conc "no fails prereq " hed) 30) - (debug:print-info 1 "no fails in prerequisites for " hed ", waiting on tests; " - (string-intersperse (map (lambda (x) - (if (string? x) - x - (runs:make-full-test-name (db:test-get-testname x) - (db:test-get-item-path x)))) - non-completed) ", ") - ". Delaying launch of " hed ".")) - (list (car newtal)(append (cdr newtal) reg) '() reruns))))) ;; an issue with prereqs not yet met? + (debug:print 1 "WARNING: test " hed " has no failed prerequisites but does have prerequistes that are NOT in the queue: " (string-intersperse notinqueue ", ")) + (debug:print-info 1 "allinqueue: " allinqueue) + (debug:print-info 1 "prereqstrs: " prereqstrs) + (debug:print-info 1 "notinqueue: " notinqueue) + (debug:print-info 1 "tal: " tal) + (debug:print-info 1 "newtal: " newtal) + (debug:print-info 1 "reg: " reg) + (list (car newtal)(append (cdr newtal) reg) '() reruns))) + +;; == == ;; num-retries code was here +;; == == ;; we use this opportunity to move contents of reg to tal +;; == == ;; but also lets check that the prerequisites are all in the newtal or reruns lists +;; == == +;; == == (let* ((allinqueue (map (lambda (x)(if (string? x) x (db:test-get-testname x))) +;; == == (append newtal reruns))) +;; == == ;; prereqstrs is a list of test names as strings that are prereqs for hed +;; == == (prereqstrs (map (lambda (x)(if (string? x) x (db:test-get-testname x))) +;; == == prereqs-not-met)) +;; == == ;; a prereq that is not found in allinqueue will be put in the notinqueue list +;; == == ;; +;; == == (notinqueue (filter (lambda (x) +;; == == (not (member x allinqueue))) +;; == == prereqstrs))) +;; == == (if (not (null? notinqueue)) +;; == == (if (runs:can-keep-running? hed 5) ;; try five times +;; == == (begin +;; == == (debug:print-info 4 "increment cant-run-tests for " hed) +;; == == (runs:inc-cant-run-tests hed) +;; == == (list (car newtal)(append (cdr newtal) reg) '() reruns)) +;; == == (begin +;; == == +;; == == (if (runs:lownoise (conc "no fails prereq, null notinqueue " hed) 30) +;; == == (begin +;; == == (debug:print 1 "WARNING: test " hed " has no failed prerequisites but does have prerequistes that are NOT in the queue: " (string-intersperse notinqueue ", ")) +;; == == (debug:print-info 4 "allinqueue: " allinqueue) +;; == == (debug:print-info 4 "prereqstrs: " prereqstrs) +;; == == (debug:print-info 4 "notinqueue: " notinqueue))) +;; == == (if (and (null? tal)(null? reg)) +;; == == (list (car newtal)(append (cdr newtal) reg) '() reruns) +;; == == (list (runs:queue-next-hed tal reg reglen regfull) +;; == == (runs:queue-next-tal tal reg reglen regfull) +;; == == (runs:queue-next-reg tal reg reglen regfull) +;; == == reruns)))) +;; == == ;; have prereqs in queue, keep going. +;; == == (begin +;; == == (if (runs:lownoise (conc "no fails prereq " hed) 30) +;; == == (debug:print-info 1 "no fails in prerequisites for " hed ", waiting on tests; " +;; == == (string-intersperse (map (lambda (x) +;; == == (if (string? x) +;; == == x +;; == == (runs:make-full-test-name (db:test-get-testname x) +;; == == (db:test-get-item-path x)))) +;; == == non-completed) ", ") +;; == == ". Delaying launch of " hed ".")) +;; == == (list (car newtal)(append (cdr newtal) reg) '() reruns))))) ;; an issue with prereqs not yet met? ((and (null? fails) (null? non-completed)) (if (runs:can-keep-running? hed 5) (begin Index: txtdb/txtdb.scm ================================================================== --- txtdb/txtdb.scm +++ txtdb/txtdb.scm @@ -431,11 +431,11 @@ (define (edit-refdb path) ;; TEMPORARY, REMOVE IN 2014 (if (not (file-exists? path)) ;; Create new (begin - (print "INFO: Creating new txtdb at " path) + (print "\nINFO: Creating new txtdb at " path "\n") (create-new-db path))) (if (not (file-exists? (conc path "/sxml/_sheets.sxml"))) (begin (print "ERROR: You appear to have the old file structure for txtdb. Please do the following and try again.") (print) @@ -450,10 +450,14 @@ (refdb-export path tmpf)) (let ((pid (process-run "gnumeric" (list tmpf)))) (process-wait pid) (import-gnumeric-file tmpf path)))) +;;====================================================================== +;; This routine dispaches or executes most of the commands for refdb +;;====================================================================== +;; (define (process-action action-str . param) (let ((num-params (length param)) (action (string->symbol action-str))) (cond ((eq? num-params 1)