Index: dashboard-tests.scm ================================================================== --- dashboard-tests.scm +++ dashboard-tests.scm @@ -266,13 +266,14 @@ (if tm tm (make-db:testmeta))) (make-db:testmeta))) (keystring (string-intersperse (map (lambda (keyval) - (conc ":" (car keyval) " " (cadr keyval))) + ;; (conc ":" (car keyval) " " (cadr keyval))) + (cadr keyval)) keydat) - " ")) + "/")) (item-path (db:test-get-item-path testdat)) (viewlog (lambda (x) (if (file-exists? logfile) ;(system (conc "firefox " logfile "&")) (iup:send-url logfile) @@ -332,23 +333,23 @@ (let ((cmd (iup:attribute command-text-box "VALUE"))) (system (conc cmd " &")))))) (run-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" - (conc "megatest -runtests " testname " " keystring " :runname " runname + (conc "megatest -runtests " testname " -target " keystring " :runname " runname " -itempatt " (if (equal? item-path "") "%" item-path) - " -keepgoing > run.log" )))) + "" )))) (remove-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" - (conc "megatest -remove-runs " keystring " :runname " runname " -testpatt " testname " -itempatt " + (conc "megatest -remove-runs -target " keystring " :runname " runname " -testpatt " testname " -itempatt " (if (equal? item-path "") "%" item-path) - " > clean.log"))))) + " -v "))))) (cond ((not testdat)(begin (print "ERROR: bad test info for " test-id)(exit 1))) ((not rundat)(begin (print "ERROR: found test info but there is a problem with the run info for " run-id)(exit 1))) (else ;; (test-set-status! db run-id test-name state status itemdat) Index: launch.scm ================================================================== --- launch.scm +++ launch.scm @@ -217,18 +217,22 @@ " this-step-status: " this-step-status " overall-status: " overall-status " next-status: " next-status " rollup-status: " rollup-status) (case next-status ((warn) (set! rollup-status 2) - (test-set-status! db run-id test-name "COMPLETED" "WARN" itemdat + ;; (test-set-status! db run-id test-name "COMPLETED" "WARN" itemdat + (test-set-status! db run-id test-name "RUNNING" "WARN" itemdat (if (eq? this-step-status 'warn) "Logpro warning found" #f) #f)) ((pass) - (test-set-status! db run-id test-name "COMPLETED" "PASS" itemdat #f #f)) + ;; (test-set-status! db run-id test-name "COMPLETED" "PASS" itemdat #f #f)) + (test-set-status! db run-id test-name "RUNNING" "PASS" itemdat #f #f)) (else ;; 'fail (set! rollup-status 1) ;; force fail - (test-set-status! db run-id test-name "COMPLETED" "FAIL" itemdat (conc "Failed at step " stepname) #f))))) + ;; (test-set-status! db run-id test-name "COMPLETED" "FAIL" itemdat (conc "Failed at step " stepname) #f) + (test-set-status! db run-id test-name "RUNNING" "FAIL" itemdat (conc "Failed at step " stepname) #f) + )))) (if (and (steprun-good? logpro-used (vector-ref exit-info 2)) (not (null? tal))) (loop (car tal) (cdr tal) stepname))) (debug:print 4 "WARNING: a prior step failed, stopping at " ezstep)))))))) (monitorjob (lambda () Index: tests/tests/ez_fail/testconfig ================================================================== --- tests/tests/ez_fail/testconfig +++ tests/tests/ez_fail/testconfig @@ -2,14 +2,15 @@ [requirements] priority 10 [ezsteps] -lookittmp ls /tmp -lookithome ls /home -lookitnada ls /nada -lookitusr ls /usr +lookittmp sleep 5s;ls /tmp +lookithome sleep 2;ls /home +# should fail on next step +lookitnada sleep 3;ls /nada +lookitusr sleep 2;ls /usr [test_meta] author matt owner bob description This test runs a single ezstep which is expected to pass, no logpro file.