Index: common.scm ================================================================== --- common.scm +++ common.scm @@ -255,11 +255,11 @@ (if (member status-sym '(warn waived pass)) #t #f)) (define (status-sym->string status-sym) - (case + (case status-sym ((pass) "PASS") ((fail) "FAIL") ((warn) "WARN") ((check) "CHECK") ((waived) "WAIVED") Index: ezsteps.scm ================================================================== --- ezsteps.scm +++ ezsteps.scm @@ -38,17 +38,19 @@ ;;(rmt:get-test-info-by-id run-id test-id) -> testdat (define (ezsteps:run-from testdat start-step-name run-one) + ;;# TODO - recapture item variables, debug repeated step eval (let* ((test-run-dir ;; (filedb:get-path *fdb* (db:test-get-rundir testdat)) ;; ) (testconfig (read-config (conc test-run-dir "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) (ezstepslst (hash-table-ref/default testconfig "ezsteps" '())) (run-mutex (make-mutex)) (rollup-status 0) (rollup-status-string #f) + (rollup-status-sym #f) (exit-info (vector #t #t #t)) (test-id (db:test-get-id testdat)) (run-id (db:test-get-run_id testdat)) (test-name (db:test-get-testname testdat)) (kill-job #f)) ;; for future use (on re-factoring with launch.scm code @@ -142,19 +144,20 @@ (overall-status-string (status-sym->string overall-status-sym))) (debug:print 4 *default-log-port* "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used " this-step-status: " this-step-status " overall-status: " overall-status-sym) ;;" next-status: " next-status " rollup-status: " rollup-status) (set! rollup-status-string overall-status-string) + (set! rollup-status-sym overall-status-sym) (tests:test-set-status! run-id test-id "RUNNING" overall-status-string #f #f))) (if (and (not run-one) - (common:steps-can-proceed-given-status-sym overall-status-sym) + (common:steps-can-proceed-given-status-sym rollup-status-sym) (not (null? tal))) (loop (car tal) (cdr tal) - overall-status-sym + rollup-status-sym stepname ;; #f saw-start-step-name-next))) ;; (if (and (steprun-good? logpro-used (vector-ref exit-info 2))