Overview
Comment: | Re-did config file path handling using directory-push/directory-pop for consistent relative path handling |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | development |
Files: | files | file ages | folders |
SHA1: |
1b85530bae2c80b6a96dee066e30dc5e |
User & Date: | mrwellan on 2013-04-09 16:10:33 |
Other Links: | branch diff | manifest | tags |
Context
2013-04-10
| ||
16:43 | Re-did config file path handling, removed directory-push/directory-pop for syle more consistent with old behavior check-in: 7906872d60 user: mrwellan tags: development | |
2013-04-09
| ||
16:10 | Re-did config file path handling using directory-push/directory-pop for consistent relative path handling check-in: 1b85530bae user: mrwellan tags: development | |
10:07 | bumped version check-in: 2fb2d5e497 user: icfadm tags: development, v1.5406 | |
Changes
Modified configf.scm from [c9fe6d3ae6] to [fd7443cd26].
︙ | ︙ | |||
9 10 11 12 13 14 15 | ;; PURPOSE. ;;====================================================================== ;;====================================================================== ;; Config file handling ;;====================================================================== | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ;; PURPOSE. ;;====================================================================== ;;====================================================================== ;; Config file handling ;;====================================================================== (use regex regex-case directory-utils) (declare (unit configf)) (declare (uses common)) (declare (uses process)) (include "common_records.scm") ;; return list (path fullpath configname) |
︙ | ︙ | |||
146 147 148 149 150 151 152 | (close-input-port inp) (hash-table-delete! res "") ;; we are using "" as a dumping ground and must remove it before returning the ht res) (regex-case inl (configf:comment-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (configf:blank-l-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) | | > | > | | | | > > > | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | (close-input-port inp) (hash-table-delete! res "") ;; we are using "" as a dumping ground and must remove it before returning the ht res) (regex-case inl (configf:comment-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (configf:blank-l-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (configf:include-rx ( x include-file ) (if (file-exists? include-file) (let ((curr-dir (current-directory)) (conf-dir (pathname-directory include-file)) (incfname (pathname-strip-directory include-file))) (push-directory conf-dir) (read-config incfname res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections) (pop-directory) (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (begin (debug:print 0 "INFO: include file " include-file " not found (called from " path ")") (loop (configf:read-line inp res allow-system) curr-section-name #f #f)))) (configf:section-rx ( x section-name ) (loop (configf:read-line inp res allow-system) ;; 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 "" #f #f)) (configf:key-sys-pr ( x key cmd ) (if allow-system |
︙ | ︙ |
Modified docs/megatest-training.odp from [093164d585] to [0be35cde95].
cannot compute difference between binary files
Modified megatest.scm from [99c3c82dba] to [f6ea263232].
︙ | ︙ | |||
38 39 40 41 42 43 44 | ;; tests:test-set-status! ;; cdb:test-set-status-state ;; cdb:client-call ;; tests:check-waiver-eligibility) (define help (conc " | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | ;; tests:test-set-status! ;; cdb:test-set-status-state ;; cdb:client-call ;; tests:check-waiver-eligibility) (define help (conc " Megatest, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " license GPL, Copyright Matt Welland 2006-2012 Usage: megatest [options] -h : this help -version : print megatest version (currently " megatest-version ") |
︙ | ︙ |
Modified tests/fullrun/megatest.config from [5787cd5928] to [2c9d26f89e].
1 2 3 4 5 6 7 8 9 10 | [fields] sysname TEXT fsname TEXT datapath TEXT # refareas can be searched to find previous runs # the path points to where megatest.db exists [refareas] area1 /tmp/oldarea/megatest | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | [fields] sysname TEXT fsname TEXT datapath TEXT # refareas can be searched to find previous runs # the path points to where megatest.db exists [refareas] area1 /tmp/oldarea/megatest [include config/mt_include_1.config] [setup] # It is possible (but not recommended) to override the rsync command used # to populate the test directories. For test development the following # example can be useful # |
︙ | ︙ |