Overview
| Comment: | patch situation where item in testpatt did not imply toplevel |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.64-chainedwaiton |
| Files: | files | file ages | folders |
| SHA1: |
d52e2b05bfbb336a3f8e5ca9189c9daa |
| User & Date: | bjbarcla on 2017-10-24 14:17:00 |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-10-24
| ||
| 18:25 | wip check-in: a866bfd3ee user: bjbarcla tags: v1.64-chainedwaiton | |
| 14:17 | patch situation where item in testpatt did not imply toplevel check-in: d52e2b05bf user: bjbarcla tags: v1.64-chainedwaiton | |
| 13:36 | corrected testpatt elaboration for chained-waiton situation check-in: 4b2105440b user: bjbarcla tags: v1.64-chainedwaiton | |
Changes
Modified tests.scm from [03a30c9a87] to [ccdf018a4e].
| ︙ | ︙ | |||
215 216 217 218 219 220 221 | (let* ((modpatt (if itemmap (db:convert-test-itempath x itemmap) x)) (newpatt (conc waiton-test "/" (substring modpatt waiting-test-len (string-length modpatt))))) ;; (conc waiting-test "/," waiting-test "/" (substring modpatt waiton-test-len (string-length modpatt))))) ;; (print "in map, x=" x ", newpatt=" newpatt) newpatt)) (filter (lambda (x) (eq? (substring-index (conc waiting-test "/") x) 0)) ;; is this patt pertinent to the waiting test | | | | | > > > > > > > > | > > > | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 |
(let* ((modpatt (if itemmap (db:convert-test-itempath x itemmap) x))
(newpatt (conc waiton-test "/" (substring modpatt waiting-test-len (string-length modpatt)))))
;; (conc waiting-test "/," waiting-test "/" (substring modpatt waiton-test-len (string-length modpatt)))))
;; (print "in map, x=" x ", newpatt=" newpatt)
newpatt))
(filter (lambda (x)
(eq? (substring-index (conc waiting-test "/") x) 0)) ;; is this patt pertinent to the waiting test
patts)))
(extended-test-patt (append patts (if (null? patts-waiton)
(list (conc waiton-test "/%")) ;; really shouldn't add the waiton forcefully like this
patts-waiton)))
(extended-test-patt-with-toplevels
(fold (lambda (testpatt-item accum )
(let ((my-match (string-match "^([^%\\/]+)\\/.+$" testpatt-item)))
(cons testpatt-item
(if my-match
(cons
(conc (cadr my-match) "/")
accum)
accum))))
'()
extended-test-patt)))
(string-intersperse (delete-duplicates extended-test-patt-with-toplevels) ",")))
;; tests:glob-like-match
(define (tests:glob-like-match patt str)
(let ((like (substring-index "%" patt)))
(let* ((notpatt (equal? (substring-index "~" patt) 0))
|
| ︙ | ︙ |