Overview
| Comment: | Do not give up and exit on issues with config files. Just keep going after spitting out a hopefully useful message |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 | v1.6025 |
| Files: | files | file ages | folders |
| SHA1: |
e5a9974dc247d8dad8552e88aff77bc2 |
| User & Date: | mrwellan on 2015-09-17 14:54:02 |
| Other Links: | branch diff | manifest | tags |
Context
|
2015-09-28
| ||
| 23:55 | Add force of INCOMPLETE on recipt of KILL signal and allow rerun of INCOMPLETE check-in: 819c0ffe18 user: matt tags: v1.60 | |
|
2015-09-24
| ||
| 13:51 | Adding enhancements for waiton Closed-Leaf check-in: 630fd37714 user: ritika tags: waiton | |
|
2015-09-17
| ||
| 14:54 | Do not give up and exit on issues with config files. Just keep going after spitting out a hopefully useful message check-in: e5a9974dc2 user: mrwellan tags: v1.60, v1.6025 | |
|
2015-09-15
| ||
| 09:11 | Use testsuite name in commandline tag and -m to trick Megatest into not reporting as missing / unrecognised command line switch check-in: 95028d52c4 user: mrwellan tags: v1.60, v1.6024 | |
Changes
Modified configf.scm from [721facc18d] to [e5007124c0].
| ︙ | ︙ | |||
210 211 212 213 214 215 216 | (configf:section-rx ( x section-name ) (loop (configf:read-line inp res allow-system settings) ;; 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 | | | > | 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | (configf:section-rx ( x section-name ) (loop (configf:read-line inp res allow-system settings) ;; 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 (let ((alist (hash-table-ref/default res curr-section-name '())) (val-proc (lambda () (let* ((cmdres (cmd-run->list cmd)) (status (cadr cmdres)) (res (car cmdres))) (debug:print-info 4 "" inl "\n => " (string-intersperse res "\n")) (if (not (eq? status 0)) (begin (debug:print 0 "ERROR: problem with " inl ", return code " status " output: " cmdres) ;; (exit 1) )) (if (null? res) "" (string-intersperse res " ")))))) (hash-table-set! res curr-section-name (config:assoc-safe-add alist key (case allow-system |
| ︙ | ︙ |
Modified dashboard-tests.scm from [c3aeea831f] to [0b76a305d1].
| ︙ | ︙ | |||
469 470 471 472 473 474 475 |
(setup-env-defaults runconfigf run-id (make-hash-table) keydat environ-patt: keystring))
(make-hash-table))))
(testconfig (begin
;; (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path)
(runs:set-megatest-env-vars run-id inkeyvals: keydat inrunname: runname intarget: keystring testname: testname itempath: item-path) ;; these may be needed by the launching process
(handle-exceptions
exn
| | | 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 |
(setup-env-defaults runconfigf run-id (make-hash-table) keydat environ-patt: keystring))
(make-hash-table))))
(testconfig (begin
;; (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path)
(runs:set-megatest-env-vars run-id inkeyvals: keydat inrunname: runname intarget: keystring testname: testname itempath: item-path) ;; these may be needed by the launching process
(handle-exceptions
exn
(tests:get-testconfig (db:test-get-testname testdat) test-registry #f)
(tests:get-testconfig (db:test-get-testname testdat) test-registry #t))))
(viewlog (lambda (x)
(if (file-exists? logfile)
;(system (conc "firefox " logfile "&"))
(dashboard-tests:run-html-viewer logfile)
(message-window (conc "File " logfile " not found")))))
(view-a-log (lambda (lfile)
|
| ︙ | ︙ |
Modified megatest-version.scm from [c4b7aef33f] to [e6dce49208].
1 2 3 4 5 | ;; Always use two or four digit decimal ;; 1.01, 1.02...1.10,1.11,1,1101 ... 1.99,2.00.. (declare (unit megatest-version)) | | | 1 2 3 4 5 6 7 | ;; Always use two or four digit decimal ;; 1.01, 1.02...1.10,1.11,1,1101 ... 1.99,2.00.. (declare (unit megatest-version)) (define megatest-version 1.6025) |
Modified tests.scm from [d77069491a] to [f7802b825a].
| ︙ | ︙ | |||
97 98 99 100 101 102 103 |
(define (tests:lookup-itemmap itemmaps testname)
(let ((best-matches (filter (lambda (itemmap)
(tests:match (car itemmap) testname #f))
itemmaps)))
(if (null? best-matches)
#f
(let ((res (car best-matches)))
| | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 |
(define (tests:lookup-itemmap itemmaps testname)
(let ((best-matches (filter (lambda (itemmap)
(tests:match (car itemmap) testname #f))
itemmaps)))
(if (null? best-matches)
#f
(let ((res (car best-matches)))
;; (debug:print 0 "res=" res)
(cond
((string? res) res) ;;; FIX THE ROOT CAUSE HERE ....
((null? res) #f)
((string? (cdr res)) (cdr res)) ;; it is a pair
((string? (cadr res))(cadr res)) ;; it is a list
(else cadr res))))))
|
| ︙ | ︙ |