Overview
| Comment: | Cherry pick from f07159010c: SKIP now working after adding stop on skip |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | rebase-envprocessing |
| Files: | files | file ages | folders |
| SHA1: |
fa0e02b9cd18cd3bd9c959b2871d5016 |
| User & Date: | mrwellan on 2016-04-28 08:39:06 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-04-28
| ||
| 08:39 | Cherry pick from 9c080e705b: Handle env vars where space eliminated by trimwhitespace. check-in: c0a5a3df5b user: mrwellan tags: rebase-envprocessing | |
| 08:39 | Cherry pick from f07159010c: SKIP now working after adding stop on skip check-in: fa0e02b9cd user: mrwellan tags: rebase-envprocessing | |
| 08:38 | Cherry pick from d1581174c1: Fixed SKIP handling check-in: a0aaa881df user: mrwellan tags: rebase-envprocessing | |
Changes
Modified launch.scm from [fecc064d89] to [e7bae78b60].
| ︙ | |||
472 473 474 475 476 477 478 | 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | - - - + + + + | (debug:print 0 "ERROR: ezsteps defined but ezstepslst is zero length") (let loop ((ezstep (car ezstepslst)) (tal (cdr ezstepslst)) (prevstep #f)) ;; check exit-info (vector-ref exit-info 1) (if (launch:einf-exit-status exit-info) ;; (vector-ref exit-info 1) (let ((logpro-used (launch:runstep ezstep run-id test-id exit-info m tal testconfig))) |
| ︙ | |||
588 589 590 591 592 593 594 595 596 597 598 599 600 601 | 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 | + + + + | ((eq? (launch:einf-rollup-status exit-info) 0) ;; (vector-ref exit-info 3) ;; if the current status is AUTO then defer to the calculated value (i.e. leave this AUTO) (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO" "PASS")) ((eq? (launch:einf-rollup-status exit-info) 1) "FAIL") ;; (vector-ref exit-info 3) ((eq? (launch:einf-rollup-status exit-info) 2) ;; (vector-ref exit-info 3) ;; if the current status is AUTO the defer to the calculated value but qualify (i.e. make this AUTO-WARN) (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO-WARN" "WARN")) ((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") (else "FAIL")))) ;; (db:test-get-status testinfo))) (debug:print-info 1 "Test exited in state=" (db:test-get-state testinfo) ", setting state/status based on exit code of " (launch:einf-exit-status exit-info) " and rollup-status of " (launch:einf-rollup-status exit-info)) (tests:test-set-status! run-id test-id new-state new-status (args:get-arg "-m") #f) |
| ︙ |