Overview
| SHA1 Hash: | 7a7f9c7318abe7e2453c16438bd0b8389521ba8d |
|---|---|
| Date: | 2012-04-19 23:45:24 |
| User: | matt |
| Comment: | Fixed runconfigs.config where wrong vars slipped through |
| Timelines: | family | ancestors | runconfigs-fix-irrelevant-vars |
| Diffs: | root of this branch |
| Downloads: | Tarball | ZIP archive |
| Other Links: | files | file ages | manifest |
Tags And Properties
- branch=runconfigs-fix-irrelevant-vars inherited from [86bc7cc36f]
- closed added by [a3b695ab58] on 2012-10-18 21:58:23
- sym-runconfigs-fix-irrelevant-vars inherited from [86bc7cc36f]
Changes
Modified configf.scm from [ded12b5b7fce054f] to [26cad9ffd1215520].
140 (regex-case 140 (regex-case 141 inl 141 inl 142 (configf:comment-rx _ (loop (configf:read-line i 142 (configf:comment-rx _ (loop (configf:read-line i 143 (configf:blank-l-rx _ (loop (configf:read-line i 143 (configf:blank-l-rx _ (loop (configf:read-line i 144 (configf:include-rx ( x include-file ) (let ((curr-dir (current-d 144 (configf:include-rx ( x include-file ) (let ((curr-dir (current-d 145 (conf-dir (pathname 145 (conf-dir (pathname 146 (if conf-dir (change-dir 146 (if conf-dir (change-dir 147 (read-config include-fil | 147 (read-config include-fil 148 (change-directory curr-d 148 (change-directory curr-d 149 (loop (configf:read-line 149 (loop (configf:read-line 150 (configf:section-rx ( x section-name ) (loop (configf:read-line i 150 (configf:section-rx ( x section-name ) (loop (configf:read-line i 151 ;; if we have the se 151 ;; if we have the se 152 (if (or (not section 152 (if (or (not section 153 (member sect 153 (member sect 154 section-name "") 154 section-name "")
Modified megatest-version.scm from [e035ae5d5aaf4287] to [057b0043e10bf1e6].
1 ;; Always use two digit decimal 1 ;; Always use two digit decimal 2 ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. 2 ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. 3 3 4 (declare (unit megatest-version)) 4 (declare (unit megatest-version)) 5 5 6 (define megatest-version 1.42) | 6 (define megatest-version 1.43) 7 7
Modified runconfig.scm from [f3494fab665b71a5] to [c41d686cb1a59650].
14 14 15 (define (setup-env-defaults db fname run-id already-seen #!key (environ-patt #f) 15 (define (setup-env-defaults db fname run-id already-seen #!key (environ-patt #f) 16 (let* ((keys (rdb:get-keys db)) 16 (let* ((keys (rdb:get-keys db)) 17 (keyvals (rdb:get-key-vals db run-id)) 17 (keyvals (rdb:get-key-vals db run-id)) 18 (thekey (string-intersperse (map (lambda (x)(if x x "-na-")) keyvals) 18 (thekey (string-intersperse (map (lambda (x)(if x x "-na-")) keyvals) 19 ;; Why was system disallowed in the reading of the runconfigs file? 19 ;; Why was system disallowed in the reading of the runconfigs file? 20 ;; NOTE: Should be setting env vars based on (target|default) 20 ;; NOTE: Should be setting env vars based on (target|default) 21 (confdat (read-config fname #f #t environ-patt: environ-patt sections: | 21 (confdat (read-config fname #f #t environ-patt: environ-patt sections: 22 (whatfound (make-hash-table)) 22 (whatfound (make-hash-table)) 23 (sections (list "default" thekey))) 23 (sections (list "default" thekey))) 24 (if (not *target*)(set! *target* thekey)) ;; may save a db access or two but 24 (if (not *target*)(set! *target* thekey)) ;; may save a db access or two but 25 (debug:print 4 "Using key=\"" thekey "\"") 25 (debug:print 4 "Using key=\"" thekey "\"") 26 26 27 (for-each 27 (for-each 28 (lambda (key val) 28 (lambda (key val)
Modified tests/common_runconfigs.config from [5be9eb5733c55067] to [bf3b671e75fc19a4].
5 TOMMY [system pwd] 5 TOMMY [system pwd] 6 6 7 [/tmp/mrwellan/env/ubuntu/afs] 7 [/tmp/mrwellan/env/ubuntu/afs] 8 BOGOUS Bob 8 BOGOUS Bob 9 9 10 [default/ubuntu/nfs] 10 [default/ubuntu/nfs] 11 CURRENT /blah 11 CURRENT /blah > 12 ALT_VAR we should not see this one 12 13 13 [ubuntu/nfs/none] 14 [ubuntu/nfs/none] 14 CURRENT /tmp/nada 15 CURRENT /tmp/nada > 16 UNIQUEVAR this one should be set 15 17
Added tests/tests/test_mt_vars/altvarnotset.sh version [e1b639c562bb397b]
Modified tests/tests/test_mt_vars/testconfig from [1e1651ab96259f02] to [601765abe8c766ef].
5 lookithome ls /home 5 lookithome ls /home 6 # $CURRENT should be /tmp/nada 6 # $CURRENT should be /tmp/nada 7 currentisblah currentisblah.sh 7 currentisblah currentisblah.sh 8 8 9 # $BOGOUS should NOT be set 9 # $BOGOUS should NOT be set 10 bogousnotset bogousnotset.sh 10 bogousnotset bogousnotset.sh 11 11 > 12 # ALT_VAR should NOT be set > 13 altvarnotset altvarnotset.sh > 14 12 [requirements] 15 [requirements] 13 waiton runfirst 16 waiton runfirst 14 priority 0 17 priority 0 15 18 16 [items] 19 [items] 17 NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RU 20 NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RU 18 21