Overview
| Comment: | Cherry pick from d27d605394: Some streamlining of runconfigs handling |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | rebase-envprocessing |
| Files: | files | file ages | folders |
| SHA1: |
9bbc459e1aa27f7b62ed4e1c71f82f1b |
| User & Date: | mrwellan on 2016-04-28 08:37:48 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-04-28
| ||
| 08:38 | Cherry pick from 0cd0e1bf8e: Waiver fix check-in: b2aabb50b8 user: mrwellan tags: rebase-envprocessing | |
| 08:37 | Cherry pick from d27d605394: Some streamlining of runconfigs handling check-in: 9bbc459e1a user: mrwellan tags: rebase-envprocessing | |
| 08:37 | Cherry pick from dd35c27850: Cleaned up testconfig caching check-in: 228cfc8c09 user: mrwellan tags: rebase-envprocessing | |
Changes
Modified launch.scm from [8367d0b2a4] to [87aaa8bb87].
| ︙ | ︙ | |||
741 742 743 744 745 746 747 |
(set! *runconfigdat* (configf:read-alist rccachef))
(set! *configinfo* (list *configdat* (get-environment-variable "MT_RUN_AREA_HOME")))
(set! *configstatus* 'fulldata)
(set! *toppath* (get-environment-variable "MT_RUN_AREA_HOME"))
*toppath*)
;; we have all the info needed to fully process runconfigs and megatest.config
(mtcachef
| | | | | | > > > | | | 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 |
(set! *runconfigdat* (configf:read-alist rccachef))
(set! *configinfo* (list *configdat* (get-environment-variable "MT_RUN_AREA_HOME")))
(set! *configstatus* 'fulldata)
(set! *toppath* (get-environment-variable "MT_RUN_AREA_HOME"))
*toppath*)
;; we have all the info needed to fully process runconfigs and megatest.config
(mtcachef
(let* ((first-pass (find-and-read-config ;; NB// sets MT_RUN_AREA_HOME as side effect
mtconfig
environ-patt: "env-override"
given-toppath: toppath
pathenvvar: "MT_RUN_AREA_HOME"))
(first-rundat (let ((toppath (if toppath
toppath
(car first-pass))))
(read-config (conc toppath "/runconfigs.config") *runconfigdat* #t
sections: sections))))
(set! *runconfigdat* first-rundat)
(if first-pass ;;
(begin
(set! *configdat* (car first-pass))
(set! *configinfo* first-pass)
(set! *toppath* (or toppath (cadr first-pass))) ;; use the gathered data unless already have it
(set! toppath *toppath*)
|
| ︙ | ︙ |
Modified runs.scm from [686a84f6c6] to [59b63b79e3].
| ︙ | ︙ | |||
71 72 73 74 75 76 77 |
(setenv "MT_TARGET" target)
(setenv "MT_TESTSUITENAME" (common:get-testsuite-name))
(set! envdat (append
envdat
(list (list "MT_RUN_AREA_HOME" toppath)
(list "MT_RUNNAME" runname)
(list "MT_TARGET" target))))
| > | > > > > > | | | | | | > | 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 99 |
(setenv "MT_TARGET" target)
(setenv "MT_TESTSUITENAME" (common:get-testsuite-name))
(set! envdat (append
envdat
(list (list "MT_RUN_AREA_HOME" toppath)
(list "MT_RUNNAME" runname)
(list "MT_TARGET" target))))
;; Now can read the runconfigs file -- can replace this with call to launch:setup?
;;
;; This block should be ok to remove - just keep the set of runconfig
;;
(if (not (eq? *configstatus* 'fulldata))
(begin
(debug:print 0 "Processing runconfigs.config again...")
(set! runconfig (read-config (conc *toppath* "/runconfigs.config") #f #t sections: (list "default" target)))
(if (not (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f))
(begin
(debug:print 0 "ERROR: [" (args:get-arg "-reqtarg") "] not found in " runconfigf)
(if db (sqlite3:finalize! db))
(exit 1))))
(set! runconfig *runconfigdat*))
;; Now have runconfigs data loaded, set environment vars
;; Only now can we calculate the testpatt
(set! testpatt (common:args-get-testpatt runconfig))
(for-each (lambda (section)
(for-each (lambda (varval)
|
| ︙ | ︙ |