Overview
| Comment: | Fixed runconfigs.config where wrong vars slipped through |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | runconfigs-fix-irrelevant-vars |
| Files: | files | file ages | folders |
| SHA1: |
7a7f9c7318abe7e2453c16438bd0b838 |
| User & Date: | matt on 2012-04-19 23:45:24 |
| Other Links: | branch diff | manifest | tags |
Context
|
2012-04-19
| ||
| 23:58 | go ahead and merge to trunk check-in: a06af4450a user: matt tags: trunk | |
| 23:45 | Fixed runconfigs.config where wrong vars slipped through Closed-Leaf check-in: 7a7f9c7318 user: matt tags: runconfigs-fix-irrelevant-vars | |
| 23:05 | Fix for runconfigs reading - picking up irrelevant variables check-in: 86bc7cc36f user: matt tags: runconfigs-fix-irrelevant-vars | |
Changes
Modified configf.scm from [ded12b5b7f] to [26cad9ffd1].
| ︙ | ︙ | |||
140 141 142 143 144 145 146 | (regex-case inl (configf:comment-rx _ (loop (configf:read-line inp res) curr-section-name #f #f)) (configf:blank-l-rx _ (loop (configf:read-line inp res) curr-section-name #f #f)) (configf:include-rx ( x include-file ) (let ((curr-dir (current-directory)) (conf-dir (pathname-directory path))) (if conf-dir (change-directory conf-dir)) | | | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | (regex-case inl (configf:comment-rx _ (loop (configf:read-line inp res) curr-section-name #f #f)) (configf:blank-l-rx _ (loop (configf:read-line inp res) curr-section-name #f #f)) (configf:include-rx ( x include-file ) (let ((curr-dir (current-directory)) (conf-dir (pathname-directory path))) (if conf-dir (change-directory conf-dir)) (read-config include-file res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections) (change-directory curr-dir) (loop (configf:read-line inp res) curr-section-name #f #f))) (configf:section-rx ( x section-name ) (loop (configf:read-line inp res) ;; if we have the sections list then force all settings into "" and delete it later? (if (or (not sections) (member section-name sections)) section-name "") ;; stick everything into "" |
| ︙ | ︙ |
Modified megatest-version.scm from [e035ae5d5a] to [057b0043e1].
1 2 3 4 5 | ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) | | | 1 2 3 4 5 6 7 | ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) (define megatest-version 1.43) |
Modified runconfig.scm from [f3494fab66] to [c41d686cb1].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 | (define (setup-env-defaults db fname run-id already-seen #!key (environ-patt #f)) (let* ((keys (rdb:get-keys db)) (keyvals (rdb:get-key-vals db run-id)) (thekey (string-intersperse (map (lambda (x)(if x x "-na-")) keyvals) "/")) ;; Why was system disallowed in the reading of the runconfigs file? ;; NOTE: Should be setting env vars based on (target|default) | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
(define (setup-env-defaults db fname run-id already-seen #!key (environ-patt #f))
(let* ((keys (rdb:get-keys db))
(keyvals (rdb:get-key-vals db run-id))
(thekey (string-intersperse (map (lambda (x)(if x x "-na-")) keyvals) "/"))
;; Why was system disallowed in the reading of the runconfigs file?
;; NOTE: Should be setting env vars based on (target|default)
(confdat (read-config fname #f #t environ-patt: environ-patt sections: (list "default" thekey)))
(whatfound (make-hash-table))
(sections (list "default" thekey)))
(if (not *target*)(set! *target* thekey)) ;; may save a db access or two but repeats db:get-target code
(debug:print 4 "Using key=\"" thekey "\"")
(for-each
(lambda (key val)
|
| ︙ | ︙ |
Modified tests/common_runconfigs.config from [5be9eb5733] to [bf3b671e75].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | [default] FOOBARBAZZZZ not a useful value BIGBOB $FOOBARBAZZZZ/bobby FREDDY $sysname/$fsname TOMMY [system pwd] [/tmp/mrwellan/env/ubuntu/afs] BOGOUS Bob [default/ubuntu/nfs] CURRENT /blah [ubuntu/nfs/none] CURRENT /tmp/nada | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | [default] FOOBARBAZZZZ not a useful value BIGBOB $FOOBARBAZZZZ/bobby FREDDY $sysname/$fsname TOMMY [system pwd] [/tmp/mrwellan/env/ubuntu/afs] BOGOUS Bob [default/ubuntu/nfs] CURRENT /blah ALT_VAR we should not see this one [ubuntu/nfs/none] CURRENT /tmp/nada UNIQUEVAR this one should be set |
Added tests/tests/test_mt_vars/altvarnotset.sh version [e1b639c562].
> > > | 1 2 3 | #!/usr/bin/env bash ! grep ALT_VAR megatest.sh |
Modified tests/tests/test_mt_vars/testconfig from [1e1651ab96] to [601765abe8].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | [setup] [ezsteps] lookittmp ls /tmp lookithome ls /home # $CURRENT should be /tmp/nada currentisblah currentisblah.sh # $BOGOUS should NOT be set bogousnotset bogousnotset.sh [requirements] waiton runfirst priority 0 [items] NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/$PREDICTABLE] | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | [setup] [ezsteps] lookittmp ls /tmp lookithome ls /home # $CURRENT should be /tmp/nada currentisblah currentisblah.sh # $BOGOUS should NOT be set bogousnotset bogousnotset.sh # ALT_VAR should NOT be set altvarnotset altvarnotset.sh [requirements] waiton runfirst priority 0 [items] NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/$PREDICTABLE] |
| ︙ | ︙ |