Overview
| Comment: | Added override of -testpatt with TESTPATT env var IIF -testpatt is set to % |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 | v1.6019 |
| Files: | files | file ages | folders |
| SHA1: |
1e25f1ec03b418700508727582ac6249 |
| User & Date: | mrwellan on 2015-07-08 14:39:20 |
| Other Links: | branch diff | manifest | tags |
Context
|
2015-07-08
| ||
| 15:13 | Added override of -testpatt with TESTPATT env var IIF -testpatt is set to % check-in: 010491a514 user: mrwellan tags: v1.60, v1.6019 | |
| 14:39 | Added override of -testpatt with TESTPATT env var IIF -testpatt is set to % check-in: 1e25f1ec03 user: mrwellan tags: v1.60, v1.6019 | |
| 08:21 | Handle toplevel with children tests better in archiving check-in: efc02c437a user: mrwellan tags: v1.60, v1.6019 | |
Changes
Modified common.scm from [ec352267c4] to [e4549081f0].
| ︙ | ︙ | |||
389 390 391 392 393 394 395 |
;; '(print (string-intersperse (map cadr (hash-table-ref/default (read-config "megatest.config" \#f \#t) "disks" '"'"'("none" ""))) "\n"))'
(define (common:get-disks #!key (configf #f))
(hash-table-ref/default
(or configf (read-config "megatest.config" #f #t))
"disks" '("none" "")))
;;======================================================================
| | > > > > > > > > > > > > > > > > > > > | 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 |
;; '(print (string-intersperse (map cadr (hash-table-ref/default (read-config "megatest.config" \#f \#t) "disks" '"'"'("none" ""))) "\n"))'
(define (common:get-disks #!key (configf #f))
(hash-table-ref/default
(or configf (read-config "megatest.config" #f #t))
"disks" '("none" "")))
;;======================================================================
;; T A R G E T S , S T A T E , S T A T U S ,
;; R U N N A M E A N D T E S T P A T T
;;======================================================================
(define (common:args-get-state)
(or (args:get-arg "-state")(args:get-arg ":state")))
(define (common:args-get-status)
(or (args:get-arg "-status")(args:get-arg ":status")))
(define (common:args-get-testpatt)
(let* ((args-testpatt (or (args:get-arg "-testpatt")
(args:get-arg "-runtests")))
(testpatt (or (and (equal? args-testpatt "%")
(getenv "TESTPATT"))
args-testpatt)))
testpatt))
(define (common:args-get-runname)
(or (args:get-arg "-runname")
(args:get-arg ":runname")))
(define (common:args-get-target #!key (split #f))
(let* ((keys (keys:config-get-fields *configdat*))
(numkeys (length keys))
(target (if (args:get-arg "-reqtarg")
(args:get-arg "-reqtarg")
(if (args:get-arg "-target")
(args:get-arg "-target")
|
| ︙ | ︙ |
Modified megatest.scm from [2a5ebc4b47] to [342093715e].
| ︙ | ︙ | |||
851 852 853 854 855 856 857 |
(if (not (car *configinfo*))
(begin
(debug:print 0 "ERROR: Attempted " action "on test(s) but run area config file not found")
(exit 1))
;; put test parameters into convenient variables
(runs:operate-on action
target
| | | | | | 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 |
(if (not (car *configinfo*))
(begin
(debug:print 0 "ERROR: Attempted " action "on test(s) but run area config file not found")
(exit 1))
;; put test parameters into convenient variables
(runs:operate-on action
target
(common:args-get-runname) ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
(common:args-get-testpatt) ;; (args:get-arg "-testpatt")
state: (common:args-get-state)
status: (common:args-get-status)
new-state-status: (args:get-arg "-set-state-status")))
(set! *didsomething* #t)))))
(if (args:get-arg "-remove-runs")
(general-run-call
"-remove-runs"
"remove runs"
|
| ︙ | ︙ |
Modified runs.scm from [a18bf25a3a] to [507d7f1fe4].
| ︙ | ︙ | |||
45 46 47 48 49 50 51 | (if (launch:setup-for-run) *configdat* (begin (debug:print 0 "ERROR: Called setup in a non-megatest area, exiting") (exit 1))))) (runrec (runs:runrec-make-record)) (target (common:args-get-target)) | | | | | > > > | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | (if (launch:setup-for-run) *configdat* (begin (debug:print 0 "ERROR: Called setup in a non-megatest area, exiting") (exit 1))))) (runrec (runs:runrec-make-record)) (target (common:args-get-target)) (runname (common:args-get-runname)) (testpatt (common:args-get-testpatt)) ;; (args-testpatt (or (args:get-arg "-testpatt") ;; (args:get-arg "-runtests"))) ;; (testpatt (or (and (equal? args-testpatt "%") ;; (getenv "TESTPATT")) ;; args-testpatt)) (keys (keys:config-get-fields mconfig)) (keyvals (keys:target->keyval keys target)) (toppath *toppath*) (envdat keyvals) ;; initial values start with keyvals (runconfig #f) (serverdat (if (args:get-arg "-server") *runremote* |
| ︙ | ︙ |