Overview
Comment: | Start of dot generation and alt simplified -run vs. -runtests/-runall/-itempatt |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | revamped-run-spec |
Files: | files | file ages | folders |
SHA1: |
aaf7a45583f2ca8148a5bd424fbf7638 |
User & Date: | mrwellan on 2012-12-04 15:55:37 |
Other Links: | branch diff | manifest | tags |
Context
2012-12-04
| ||
15:55 | Start of dot generation and alt simplified -run vs. -runtests/-runall/-itempatt Closed-Leaf check-in: aaf7a45583 user: mrwellan tags: revamped-run-spec | |
2012-12-03
| ||
17:21 | Added -list-targets, -list-disks and -list-db-targets check-in: 970f20a4ba user: mrwellan tags: trunk | |
Changes
Modified megatest.scm from [302c3da708] to [9bf54c5489].
︙ | |||
38 39 40 41 42 43 44 | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | - - + + - | license GPL, Copyright Matt Welland 2006-2012 Usage: megatest [options] -h : this help -version : print megatest version (currently " megatest-version ") Launching and managing runs |
︙ | |||
166 167 168 169 170 171 172 173 174 175 176 177 178 179 | 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | + | "-env2file" "-setvars" "-set-state-status" "-debug" ;; for *verbosity* > 2 "-gen-megatest-test" "-override-timeout" "-test-files" ;; -test-paths is for listing all "-run" ) (list "-h" "-version" "-force" "-xterm" "-showkeys" "-test-status" |
︙ | |||
509 510 511 512 513 514 515 | 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 | + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + | ;; launch task ;; else ;; put task in deferred queue ;; if still ok to run tasks ;; process deferred tasks per above steps ;; run all tests are are Not COMPLETED and PASS or CHECK (if (or (args:get-arg "-runall") ;; deprecated (args:get-arg "-run") (args:get-arg "-runtests")) (begin (if (args:get-arg "-testpatt") (begin (debug:print 0 "ERROR:-testpatt is deprecated, use -run patt1,patt2... instead, your pattern " (args:get-arg "-testpatt") " will be ignored") (sleep 3))) (if (args:get-arg "-itempatt") (begin (debug:print 0 "ERROR: -itempatt is not used with -run, your pattern " (args:get-arg "-itempatt") " will be ignored") (sleep 3))) |
︙ |
Modified runs.scm from [ac5e3e62fc] to [a7759ddb27].
︙ | |||
218 219 220 221 222 223 224 | 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 | - + | (if (file-exists? runconfigf) (open-run-close setup-env-defaults db runconfigf run-id *already-seen-runconfig-info* "pre-launch-env-vars") (debug:print 0 "WARNING: You do not have a run config file: " runconfigf)) ;; look up all tests matching the comma separated list of globs in ;; test-patts (using % as wildcard) |
︙ | |||
340 341 342 343 344 345 346 | 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 | - + + | (define (runs:run-tests-queue run-id runname test-records keyvallst flags test-patts) ;; At this point the list of parent tests is expanded ;; NB// Should expand items here and then insert into the run queue. (debug:print 5 "test-records: " test-records ", keyvallst: " keyvallst " flags: " (hash-table->alist flags)) (let ((sorted-test-names (tests:sort-by-priority-and-waiton test-records)) (test-registery (make-hash-table)) (num-retries 0) |
︙ | |||
427 428 429 430 431 432 433 | 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 | + + + + + + - + | (thread-sleep! (+ 2 *global-delta*)) ;; could have done hed tal here but doing car/cdr of newtal to rotate tests (loop (car newtal)(cdr newtal) reruns)) ((and have-resources (or (null? prereqs-not-met) (and (eq? testmode 'toplevel) (null? non-completed)))) (if dotfilep (with-output-to-port (lambda () (for-each (lambda (w) (print " " w " -> " test-name ";")) waitons) (print " " test-name ";"))) |
︙ |
Modified tests.scm from [661a4dba80] to [f16c0dd062].
︙ | |||
26 27 28 29 30 31 32 | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | - + + + + + + - - + + | (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") (include "test_records.scm") (define (tests:get-valid-tests testsdir test-patts) ;; #!key (test-names '())) |
︙ |
Modified tests/tests.scm from [491ed287ed] to [6ed53e0842].
︙ | |||
43 44 45 46 47 48 49 | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | - - + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + | ;; tests:glob-like-match (test #f '("abc") (tests:glob-like-match "abc" "abc")) (for-each (lambda (patt str expected) (test (conc patt " " str "=>" expected) expected (tests:glob-like-match patt str))) (list "abc" "~abc" "~abc" "a*c" "a%c") (list "abc" "abcd" "abc" "ABC" "ABC") |
︙ |