Overview
| Comment: | Changed scary error to the warning it should be, added ability to dump cmdinfo from a value passed in command line, added safety check on access to a testconfig dat in case it wasn't actually read successfully |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
50be72f3dfee11b30a28899336cdf293 |
| User & Date: | mrwellan on 2015-06-03 21:57:22 |
| Other Links: | branch diff | manifest | tags |
Context
|
2015-06-04
| ||
| 12:35 | Removed db fixer Closed-Leaf check-in: 9e6dfde44c user: mrwellan tags: v1.6014_fix01 | |
| 01:09 | Added filtering by field for dumpmode check-in: a3ca55343e user: matt tags: v1.60 | |
|
2015-06-03
| ||
| 21:57 | Changed scary error to the warning it should be, added ability to dump cmdinfo from a value passed in command line, added safety check on access to a testconfig dat in case it wasn't actually read successfully check-in: 50be72f3df user: mrwellan tags: v1.60 | |
| 00:29 | Remove call to release-dot-lock where it is no longer used. Added doc for tracking exception blocks check-in: acce517ea5 user: matt tags: v1.60 | |
Changes
Modified db.scm from [a883dc7ed4] to [165209a3bd].
| ︙ | ︙ | |||
180 181 182 183 184 185 186 | (db (sqlite3:open-database fname))) (sqlite3:set-busy-handler! db (make-busy-timeout 136000)) (db:set-sync db) ;; (sqlite3:execute db "PRAGMA synchronous = 0;") (if (not file-exists)(initproc db)) ;; (release-dot-lock fname) db) (begin | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | (db (sqlite3:open-database fname))) (sqlite3:set-busy-handler! db (make-busy-timeout 136000)) (db:set-sync db) ;; (sqlite3:execute db "PRAGMA synchronous = 0;") (if (not file-exists)(initproc db)) ;; (release-dot-lock fname) db) (begin (debug:print 2 "WARNING: opening db in non-writable dir " fname) (sqlite3:open-database fname))))) ;; ) ;; This routine creates the db. It is only called if the db is not already opened ;; (define (db:open-rundb dbstruct run-id #!key (attemptnum 0)(do-not-open #f)) ;; (conc *toppath* "/megatest.db") (car *configinfo*))) (let* ((local (dbr:dbstruct-get-local dbstruct)) (rdb (if local |
| ︙ | ︙ |
Modified megatest.scm from [f4da69fba6] to [854261c21d].
| ︙ | ︙ | |||
125 126 127 128 129 130 131 | -list-db-targets : list the target combinations used in the db -show-config : dump the internal representation of the megatest.config file -show-runconfig : dump the internal representation of the runconfigs.config file -dumpmode json : dump in json format instead of sexpr -show-cmdinfo : dump the command info for a test (run in test environment) -section sectionName -var varName : for config and runconfig lookup value for sectionName varName | | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | -list-db-targets : list the target combinations used in the db -show-config : dump the internal representation of the megatest.config file -show-runconfig : dump the internal representation of the runconfigs.config file -dumpmode json : dump in json format instead of sexpr -show-cmdinfo : dump the command info for a test (run in test environment) -section sectionName -var varName : for config and runconfig lookup value for sectionName varName -since N : get list of runs changed since time N (Unix seconds) Misc -start-dir path : switch to this directory before running megatest -rebuild-db : bring the database schema up to date -cleanup-db : remove any orphan records, vacuum the db -import-megatest.db : migrate a database from v1.55 series to v1.60 series -sync-to-megatest.db : migrate data back to megatest.db |
| ︙ | ︙ | |||
797 798 799 800 801 802 803 |
(json-write data))
(else
(debug:print 0 "ERROR: -dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
(set! *didsomething* #t)
(pop-directory)))
(if (args:get-arg "-show-cmdinfo")
| | | | 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 |
(json-write data))
(else
(debug:print 0 "ERROR: -dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
(set! *didsomething* #t)
(pop-directory)))
(if (args:get-arg "-show-cmdinfo")
(if (or (args:get-arg ":value")(getenv "MT_CMDINFO"))
(let ((data (common:read-encoded-string (or (args:get-arg ":value")(getenv "MT_CMDINFO")))))
(if (equal? (args:get-arg "-dumpmode") "json")
(json-write data)
(pp data))
(set! *didsomething* #t))
(debug:print-info 0 "environment variable MT_CMDINFO is not set")))
;;======================================================================
|
| ︙ | ︙ |
Modified tests.scm from [1b02d35c8f] to [f0ae60320d].
| ︙ | ︙ | |||
137 138 139 140 141 142 143 | (define (tests:check-waiver-eligibility testdat prev-testdat) (let* ((test-registry (make-hash-table)) (testconfig (tests:get-testconfig (db:test-get-testname testdat) test-registry #f)) (test-rundir ;; (sdb:qry 'passstr (db:test-get-rundir testdat)) ;; ) (prev-rundir ;; (sdb:qry 'passstr (db:test-get-rundir prev-testdat)) ;; ) | | | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 |
(define (tests:check-waiver-eligibility testdat prev-testdat)
(let* ((test-registry (make-hash-table))
(testconfig (tests:get-testconfig (db:test-get-testname testdat) test-registry #f))
(test-rundir ;; (sdb:qry 'passstr
(db:test-get-rundir testdat)) ;; )
(prev-rundir ;; (sdb:qry 'passstr
(db:test-get-rundir prev-testdat)) ;; )
(waivers (if testconfig (configf:section-vars testconfig "waivers") '()))
(waiver-rx (regexp "^(\\S+)\\s+(.*)$"))
(diff-rule "diff %file1% %file2%")
(logpro-rule "diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html"))
(if (not (file-exists? test-rundir))
(begin
(debug:print 0 "ERROR: test run directory is gone, cannot propagate waiver")
#f)
|
| ︙ | ︙ |