Overview
| Comment: | fixed the handling of step status in ezsteps. Esp WARN vs ABORT. Handled all logpro statuses symmetrically. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65 |
| Files: | files | file ages | folders |
| SHA1: |
bcc775d437de21a6b2b449c55b3849fa |
| User & Date: | mmgraham on 2022-02-25 15:03:50 |
| Other Links: | branch diff | manifest | tags |
Context
|
2022-03-02
| ||
| 12:18 | Fixed HSD #14012138487, need to be able to skip using [items], [itemstable] variables. check-in: c307ba03eb user: mmgraham tags: v1.65 | |
|
2022-02-27
| ||
| 18:26 | Updates to simplerun from v2.0001 branch, multi-db beginnings. check-in: 0f90afb706 user: matt tags: v1.70001-multi-db-rebased | |
|
2022-02-25
| ||
| 15:03 | fixed the handling of step status in ezsteps. Esp WARN vs ABORT. Handled all logpro statuses symmetrically. check-in: bcc775d437 user: mmgraham tags: v1.65 | |
|
2022-02-20
| ||
| 19:17 | Added dbmod.scm and build support check-in: 996af79a27 user: matt tags: v1.65 | |
Changes
Modified ezsteps.scm from [0c12b39167] to [aab87817a5].
| ︙ | ︙ | |||
169 170 171 172 173 174 175 | ((and (eq? process-exit-status 2) logpro-used) 'warn) ;; logpro 2 = warnings ((and (eq? process-exit-status 3) logpro-used) 'check) ;; logpro 3 = check ((and (eq? process-exit-status 4) logpro-used) 'waived) ;; logpro 4 = waived ((and (eq? process-exit-status 5) logpro-used) 'abort) ;; logpro 5 = abort ((and (eq? process-exit-status 6) logpro-used) 'skip) ;; logpro 6 = skip ((eq? process-exit-status 0) 'pass) ;; logpro 0 = pass (else 'fail))) | | > | > > > > | | < < < < | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 |
((and (eq? process-exit-status 2) logpro-used) 'warn) ;; logpro 2 = warnings
((and (eq? process-exit-status 3) logpro-used) 'check) ;; logpro 3 = check
((and (eq? process-exit-status 4) logpro-used) 'waived) ;; logpro 4 = waived
((and (eq? process-exit-status 5) logpro-used) 'abort) ;; logpro 5 = abort
((and (eq? process-exit-status 6) logpro-used) 'skip) ;; logpro 6 = skip
((eq? process-exit-status 0) 'pass) ;; logpro 0 = pass
(else 'fail)))
(overall-status
(cond
((eq? (launch:einf-rollup-status exit-info) 2) 'warn) ;; rollup-status (vector-ref exit-info 3)
((eq? (launch:einf-rollup-status exit-info) 3) 'check)
((eq? (launch:einf-rollup-status exit-info) 4) 'waived)
((eq? (launch:einf-rollup-status exit-info) 5) 'abort)
((eq? (launch:einf-rollup-status exit-info) 6) 'skip)
((eq? (launch:einf-rollup-status exit-info) 0) 'pass)
(else 'fail)))
(next-status (common:worse-status-sym this-step-status overall-status))
(next-state ;; "RUNNING") ;; WHY WAS THIS CHANGED TO NOT USE (null? tal) ??
(cond
((null? tal) ;; more to run?
"COMPLETED")
(else "RUNNING"))))
(debug:print 4 *default-log-port* "Exit value received: " (launch:einf-exit-code exit-info) " logpro-used: " logpro-used
" this-step-status: " this-step-status " overall-status: " overall-status
|
| ︙ | ︙ |
Modified launch.scm from [b55ae6d40b] to [b68aa073b9].
| ︙ | ︙ | |||
51 52 53 54 55 56 57 |
;; stepname {VAR=first,second,third ...} command ...
;; where the {VAR=first,second,third ...} is optional.
;; given an exit code and whether or not logpro was used calculate OK/BAD
;; return #t if we are ok, #f otherwise
(define (steprun-good? logpro exitcode stepparms)
(or (eq? exitcode 0)
| | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 |
;; stepname {VAR=first,second,third ...} command ...
;; where the {VAR=first,second,third ...} is optional.
;; given an exit code and whether or not logpro was used calculate OK/BAD
;; return #t if we are ok, #f otherwise
(define (steprun-good? logpro exitcode stepparms)
(or (eq? exitcode 0)
(and logpro (member exitcode '( 2 4 6)))
(let* ((params (alist-ref 'params stepparms)) ;; get the params section
(keep-going (if params
(alist-ref "keep-going" params equal?)
#f)))
(debug:print 0 *default-log-port* "keep-going=" keep-going)
(and keep-going (equal? (car keep-going) "yes")))))
|
| ︙ | ︙ |