Overview
| Comment: | Merging fix to tests for config file includes |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.43 |
| Files: | files | file ages | folders |
| SHA1: |
be7c0017bf826b81a005c5d3df9215f7 |
| User & Date: | mrwellan on 2012-04-30 14:43:55 |
| Other Links: | branch diff | manifest | tags |
Context
|
2012-04-30
| ||
| 16:22 | Added unit tests back. Tweaked a few to get them to run again Closed-Leaf check-in: 9058dc2743 user: mrwellan tags: v1.43 | |
| 14:43 | Merging fix to tests for config file includes check-in: be7c0017bf user: mrwellan tags: v1.43 | |
| 00:06 | Corrected wrong include structure in refactored tests check-in: 47a6a72664 user: matt tags: trunk | |
|
2012-04-27
| ||
| 11:19 | Merging in the config include test check-in: 35757acb39 user: mrwellan tags: v1.43 | |
Changes
Modified configf.scm from [2c4fe9609e] to [09b43df907].
| ︙ | ︙ | |||
128 129 130 131 132 133 134 135 136 137 138 139 140 141 |
(if (not ht)(make-hash-table) ht))
(let ((inp (open-input-file path))
(res (if (not ht)(make-hash-table) ht)))
(let loop ((inl (configf:read-line inp res)) ;; (read-line inp))
(curr-section-name (if curr-section curr-section "default"))
(var-flag #f);; turn on for key-var-pr and cont-ln-rx, turn off elsewhere
(lead #f))
(if (eof-object? inl)
(begin
(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
| > | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 |
(if (not ht)(make-hash-table) ht))
(let ((inp (open-input-file path))
(res (if (not ht)(make-hash-table) ht)))
(let loop ((inl (configf:read-line inp res)) ;; (read-line inp))
(curr-section-name (if curr-section curr-section "default"))
(var-flag #f);; turn on for key-var-pr and cont-ln-rx, turn off elsewhere
(lead #f))
(debug:print 8 "INFO: curr-section-name: " curr-section-name " var-flag: " var-flag "\n inl: \"" inl "\"")
(if (eof-object? inl)
(begin
(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
|
| ︙ | ︙ |
Deleted tests/fullrun/config/mt_include_1.config_2.config version [a6006b146c].
|
| < < |
Added tests/fullrun/config/mt_include_2.config version [a6006b146c].
> > | 1 2 | [disks] disk0 /tmp/mt_runs |
Modified tests/fullrun/megatest.config from [819220dc64] to [feaafde063].
| ︙ | ︙ | |||
35 36 37 38 39 40 41 | ## disks are: ## name host:/path/to/area ## -or- ## name /path/to/area [disks] disk0 /foobarbazz | | | 35 36 37 38 39 40 41 42 43 44 |
## disks are:
## name host:/path/to/area
## -or-
## name /path/to/area
[disks]
disk0 /foobarbazz
[include config/mt_include_2.config]
[include #{getenv USER}_testing.config]
|