Overview
| Comment: | Partial fix for -rerun |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
0e00d7e0c21df82217ab4f392ea0b023 |
| User & Date: | matt on 2012-02-27 09:52:54 |
| Other Links: | manifest | tags |
Context
|
2012-02-29
| ||
| 17:56 | minor improvements to server mode check-in: 29dd546414 user: mrwellan tags: trunk | |
|
2012-02-28
| ||
| 03:15 | Initial steps to separate test data into file testdata.db check-in: 0187531d3d user: matt tags: testdata | |
|
2012-02-27
| ||
| 09:52 | Partial fix for -rerun check-in: 0e00d7e0c2 user: matt tags: trunk | |
| 06:16 | Upping version to v1.38 check-in: 275de76b6d user: matt tags: trunk, v1.38 | |
Changes
Modified megatest.scm from [5218ba5c47] to [91d562ec2a].
| ︙ | ︙ | |||
363 364 365 366 367 368 369 |
;; run all tests are are Not COMPLETED and PASS or CHECK
(if (args:get-arg "-runall")
(general-run-call
"-runall"
"run all tests"
(lambda (db target runname keys keynames keyvallst)
| > > > > | | | | | | | | 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 |
;; run all tests are are Not COMPLETED and PASS or CHECK
(if (args:get-arg "-runall")
(general-run-call
"-runall"
"run all tests"
(lambda (db target runname keys keynames keyvallst)
(let ((flags (make-hash-table)))
(for-each (lambda (parm)
(hash-table-set! flags parm (args:get-arg parm)))
(list "-rerun" "-force"))
(runs:run-tests db
target
runname
(args:get-arg "-testpatt")
(args:get-arg "-itempatt")
user
flags)))))
;;======================================================================
;; run one test
;;======================================================================
;; 1. find the config file
;; 2. change to the test directory
|
| ︙ | ︙ |
Modified runs.scm from [7215eb8cc1] to [8dbca061f3].
| ︙ | ︙ | |||
425 426 427 428 429 430 431 432 433 434 |
((equal? (test:get-state testdat) "NOT_STARTED")(set! runflag #t))
;; not -rerun and PASS, WARN or CHECK, do no run
((and (or (not rerun)
keepgoing)
;; Require to force re-run for COMPLETED or *anything* + PASS,WARN or CHECK
(or (member (test:get-status testdat) '("PASS" "WARN" "CHECK"))
(member (test:get-state testdat) '("COMPLETED"))))
(set! runflag #f))
;; -rerun and status is one of the specifed, run it
((and rerun
| > | | > > > | | 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 |
((equal? (test:get-state testdat) "NOT_STARTED")(set! runflag #t))
;; not -rerun and PASS, WARN or CHECK, do no run
((and (or (not rerun)
keepgoing)
;; Require to force re-run for COMPLETED or *anything* + PASS,WARN or CHECK
(or (member (test:get-status testdat) '("PASS" "WARN" "CHECK"))
(member (test:get-state testdat) '("COMPLETED"))))
(debug:print 2 "INFO: running test " test-name "/" item-path " suppressed as it is COMPLETED and " (test:get-state testdat))
(set! runflag #f))
;; -rerun and status is one of the specifed, run it
((and rerun
(let* ((rerunlst (string-split rerun ","))
(must-rerun (member (test:get-status testdat) rerunlst)))
(debug:print 3 "INFO: -rerun list: " rerun ", test-status: " (test:get-status testdat)", must-rerun: " must-rerun)
must-rerun))
(debug:print 2 "INFO: Rerun forced for test " test-name "/" item-path)
(set! runflag #t))
;; -keepgoing, do not rerun FAIL
((and keepgoing
(member (test:get-status testdat) '("FAIL")))
(set! runflag #f))
((and (not rerun)
(member (test:get-status testdat) '("FAIL" "n/a")))
(set! runflag #t))
(else (set! runflag #f)))
(debug:print 6 "RUNNING => runflag: " runflag " STATE: " (test:get-state testdat) " STATUS: " (test:get-status testdat))
(if (not runflag)
(if (not parent-test)
(debug:print 1 "NOTE: Not starting test " new-test-name " as it is state \"" (test:get-state testdat)
"\" and status \"" (test:get-status testdat) "\", use -rerun \"" (test:get-status testdat) "\" or -force to override"))
;; NOTE: No longer be checking prerequisites here! Will never get here unless prereqs are
;; already met.
(if (not (launch-test db run-id runname test-conf keyvallst test-name test-path itemdat flags))
(begin
(print "ERROR: Failed to launch the test. Exiting as soon as possible")
(set! *globalexitstatus* 1) ;;
(process-signal (current-process-id) signal/kill))))))
|
| ︙ | ︙ |