Comment: | Re-arranged uses and imports and it worked better |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | v1.80-reshape-no-debugprint |
Files: | files | file ages | folders |
SHA1: |
f308bbcbc0acfe5acf70a3afd5d401b1 |
User & Date: | matt on 2023-01-31 06:47:11 |
Other Links: | branch diff | manifest | tags |
2023-01-31
| ||
06:47 | Re-arranged uses and imports and it worked better Leaf check-in: f308bbcbc0 user: matt tags: v1.80-reshape-no-debugprint | |
2023-01-30
| ||
22:06 | removed all imports of debugprint and still can't run megatest exe check-in: 5de6734970 user: matt tags: v1.80-reshape-no-debugprint | |
Modified Makefile from [7f2dc43cfa] to [6b21814662].
︙ | ︙ | |||
27 28 29 30 31 32 33 | ezsteps.scm lock-queue.scm api.scm subrun.scm \ portlogger.scm archive.scm env.scm diff-report.scm \ cgisetup/models/pgdb.scm # server.scm http-transport.scm client.scm rmt.scm # module source files | | | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | ezsteps.scm lock-queue.scm api.scm subrun.scm \ portlogger.scm archive.scm env.scm diff-report.scm \ cgisetup/models/pgdb.scm # server.scm http-transport.scm client.scm rmt.scm # module source files MSRCFILES = dbfile.scm mtargs.scm commonmod.scm dbmod.scm \ configfmod.scm servermod.scm clientmod.scm rmtmod.scm \ artifacts.scm apimod.scm # debugprint.scm all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut # dbmod.import.o is just a hack here mofiles/dbfile.o mofiles/clientmod.o mofiles/dbmod.o mofiles/rmtmod.o : mofiles/commonmod.o # dbmod.import.o mofiles/debugprint.o db.o : dbmod.import.o mofiles/debugprint.o : mofiles/mtargs.o mofiles/servermod.o : mofiles/artifacts.o mofiles/rmtmod.o : mofiles/apimod.o # ftail.scm rmtmod.scm commonmod.scm removed # MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.scm \ |
︙ | ︙ | |||
173 174 175 176 177 178 179 | tests.o db.o launch.o runs.o dashboard-tests.o \ dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o \ monitor.o dashboard.o archive.o megatest.o : db_records.scm megatest-fossil-hash.scm tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm | | | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | tests.o db.o launch.o runs.o dashboard-tests.o \ dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o \ monitor.o dashboard.o archive.o megatest.o : db_records.scm megatest-fossil-hash.scm tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm db.o api.o : mofiles/dbmod.o mofiles/dbfile.o mofiles/commonmod.o dbmod.import.o # mofiles/debugprint.o # tests.o tasks.o dashboard-tasks.o : task_records.scm runs.o : test_records.scm mofiles-made : $(MOFILES) make $(MOIMPFILES) |
︙ | ︙ |
Modified api.scm from [f69c2b585a] to [b16e9ba59b].
︙ | ︙ | |||
24 25 26 27 28 29 30 | (declare (unit api)) (declare (uses rmtmod)) (declare (uses db)) (declare (uses dbmod)) (declare (uses dbfile)) (declare (uses tasks)) | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | (declare (unit api)) (declare (uses rmtmod)) (declare (uses db)) (declare (uses dbmod)) (declare (uses dbfile)) (declare (uses tasks)) ;; (declare (uses debugprint)) (import dbmod) (import dbfile) (import rmtmod ;; debugprint ) |
︙ | ︙ |
Modified archive.scm from [bcfe2cf139] to [2d608c708c].
︙ | ︙ | |||
19 20 21 22 23 24 25 | ;; strftime('%m/%d/%Y %H:%M:%S','now','localtime') (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 format md5 message-digest srfi-18) (declare (unit archive)) (declare (uses db)) (declare (uses common)) | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ;; strftime('%m/%d/%Y %H:%M:%S','now','localtime') (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 format md5 message-digest srfi-18) (declare (unit archive)) (declare (uses db)) (declare (uses common)) ;; (declare (uses debugprint)) (include "common_records.scm") (include "db_records.scm") ;; (import debugprint) ;;====================================================================== |
︙ | ︙ |
Modified clientmod.scm from [da91b5b025] to [ccd4bc7182].
︙ | ︙ | |||
23 24 25 26 27 28 29 | ;;(use srfi-18 extras tcp s11n srfi-1 posix regex srfi-69 hostinfo md5 ;; message-digest matchable spiffy uri-common intarweb http-client ;; spiffy-request-vars uri-common intarweb directory-utils) (declare (unit clientmod)) (declare (uses servermod)) (declare (uses artifacts)) | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | ;;(use srfi-18 extras tcp s11n srfi-1 posix regex srfi-69 hostinfo md5 ;; message-digest matchable spiffy uri-common intarweb http-client ;; spiffy-request-vars uri-common intarweb directory-utils) (declare (unit clientmod)) (declare (uses servermod)) (declare (uses artifacts)) ;; (declare (uses debugprint)) (module clientmod * (import scheme chicken |
︙ | ︙ |
Modified common.scm from [8c719325d3] to [447b601023].
︙ | ︙ | |||
25 26 27 28 29 30 31 | (prefix nanomsg nmsg:) (prefix sqlite3 sqlite3:) pkts (prefix dbi dbi:) ) (declare (unit common)) (declare (uses commonmod)) | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | (prefix nanomsg nmsg:) (prefix sqlite3 sqlite3:) pkts (prefix dbi dbi:) ) (declare (unit common)) (declare (uses commonmod)) ;; (declare (uses debugprint)) (import commonmod ;; debugprint ) (include "common_records.scm") |
︙ | ︙ |
Modified commonmod.scm from [837b476e48] to [6567806c42].
︙ | ︙ | |||
21 22 23 24 25 26 27 | (declare (unit commonmod)) (use srfi-69) (module commonmod * | | | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | (declare (unit commonmod)) (use srfi-69) (module commonmod * (import scheme chicken data-structures extras files ports) (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 md5 message-digest regex srfi-1) ;;====================================================================== ;; CONTENTS |
︙ | ︙ | |||
216 217 218 219 220 221 222 223 224 225 226 227 228 | ;; (define (get-cfg-areas cfgdat) (let ((adat (get-section cfgdat "areas"))) (map (lambda (entry) `(,(car entry) . ,(val->alist (cadr entry)))) adat))) ;;====================================================================== ;; misc stuff ;;====================================================================== ) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | ;; (define (get-cfg-areas cfgdat) (let ((adat (get-section cfgdat "areas"))) (map (lambda (entry) `(,(car entry) . ,(val->alist (cadr entry)))) adat))) ;;====================================================================== ;; debugprint ;;====================================================================== ;;====================================================================== ;; debug stuff ;;====================================================================== (define verbosity (make-parameter '())) (define *default-log-port* (current-error-port)) (define debug:print-logger (make-parameter #f)) ;; set to a proc to call on every logging print (define (debug:setup debug debug-noprop) (let ((debugstr (or debug ;; (args:get-arg "-debug") debug-noprop ;; (args:get-arg "-debug-noprop") (get-environment-variable "MT_DEBUG_MODE")))) (verbosity (debug:calc-verbosity debugstr 'q)) (debug:check-verbosity (verbosity) debugstr) ;; if we were handed a bad verbosity rule then we will override it with 1 and continue (if (not (verbosity))(verbosity 1)) (if (and (not debug-noprop) ;; (args:get-arg "-debug-noprop") (or debug ;; (args:get-arg "-debug") (not (get-environment-variable "MT_DEBUG_MODE")))) (setenv #;set-environment-variable! "MT_DEBUG_MODE" (if (list? (verbosity)) (string-intersperse (map conc (verbosity)) ",") (conc (verbosity))))))) ;; check verbosity, #t is ok (define (debug:check-verbosity verbosity vstr) (if (not (or (number? verbosity) (list? verbosity))) (begin (print "ERROR: Invalid debug value \"" vstr "\"") #f) #t)) ;;====================================================================== ;; (define (debug:print . params) #f) ;; (define (debug:print-info . params) #f) ;; ;; (define (set-functions dbgp dbgpinfo) ;; (set! debug:print dbgp) ;; (set! debug:print-info dbgpinfo)) ;;====================================================================== ;; this was cached based on results from profiling but it turned out the profiling ;; somehow went wrong - perhaps too many processes writing to it. Leaving the caching ;; in for now but can probably take it out later. ;; (define (debug:calc-verbosity vstr arg) ;; arg is 'v (verbose) or 'q (quiet) (let* ((res (cond ((number? vstr) vstr) ((not (string? vstr)) 1) ;; ((string-match "^\\s*$" vstr) 1) (vstr (let ((debugvals (filter number? (map string->number (string-split vstr ","))))) (cond ((> (length debugvals) 1) debugvals) ((> (length debugvals) 0)(car debugvals)) (else 1)))) ((eq? arg 'v) 2) ;; verbose ((eq? arg 'q) 0) ;; quiet (else 1)))) (verbosity res) res)) ;;====================================================================== ;; check verbosity, #t is ok #;(define (debug-check-verbosity verbosity vstr) (if (not (or (number? verbosity) (list? verbosity))) (begin (print "ERROR: Invalid debug value \"" vstr "\"") #f) #t)) (define (debug:debug-mode n) (let* ((vb (verbosity))) (cond ((and (number? vb) ;; number number (number? n)) (<= n vb)) ((and (list? vb) ;; list number (number? n)) (member n vb)) ((and (list? vb) ;; list list (list? n)) (not (null? (lset-intersection! eq? vb n)))) ((and (number? vb) (list? n)) (member vb n)) (else #f)))) (define (debug:handle-remote-logging params) (if (debug:print-logger) ;; NOTE: turn params into string to keep things simple for now ((debug:print-logger)(conc "REMOTE ("(get-host-name)", pid="(current-process-id)") " (string-intersperse (map conc params) " ") "; " (string-intersperse (command-line-arguments) " "))))) (define debug:enable-timestamp (make-parameter #t)) (define (debug:timestamp) (if (debug:enable-timestamp) (conc (time->string (seconds->local-time (current-seconds)) "%H:%M:%S") " ") "")) (define (debug:print n e . params) (if (debug:debug-mode n) (with-output-to-port (or e (current-error-port)) (lambda () ;; (if *logging* ;; (db:log-event (apply conc params)) (apply print (debug:timestamp) params) ;; (debug:handle-remote-logging params) ))) #t ;; only here to make remote stuff happy. It'd be nice to fix that ... ) (define (debug:print-error n e . params) ;; normal print (if (debug:debug-mode n) (with-output-to-port (if (port? e) e (current-error-port)) (lambda () (apply print "ERROR: " (debug:timestamp) params) ;; (debug:handle-remote-logging (cons "ERROR: " params)) ))) ;; pass important messages to stderr (if (and (eq? n 0)(not (eq? e (current-error-port)))) (with-output-to-port (current-error-port) (lambda () (apply print "ERROR: " (debug:timestamp) params) )))) (define (debug:print-info n e . params) (if (debug:debug-mode n) (with-output-to-port (if (port? e) e (current-error-port)) (lambda () (apply print "INFO: (" n ") "(debug:timestamp) params) ;; res) ;; (debug:handle-remote-logging (cons "INFO: " params)) )))) (define (debug:print-warn n e . params) (if (debug:debug-mode n) (with-output-to-port (if (port? e) e (current-error-port)) (lambda () (apply print "WARN: (" n ") " (debug:timestamp) params) ;; res) ;; (debug:handle-remote-logging (cons "WARN: " params)) )))) ;;====================================================================== ;; misc stuff ;;====================================================================== ) |
Modified configf.scm from [87c2b364e6] to [3bd7d5954f].
︙ | ︙ | |||
23 24 25 26 27 28 29 | ;;====================================================================== (use regex regex-case matchable) ;; directory-utils) (declare (unit configf)) (declare (uses process)) (declare (uses env)) (declare (uses keys)) | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | ;;====================================================================== (use regex regex-case matchable) ;; directory-utils) (declare (unit configf)) (declare (uses process)) (declare (uses env)) (declare (uses keys)) ;; (declare (uses debugprint)) (include "common_records.scm") ;; (import debugprint) ;; return list (path fullpath configname) (define (find-config configname #!key (toppath #f)) |
︙ | ︙ |
Modified configfmod.scm from [704df64a44] to [932c929ace].
︙ | ︙ | |||
16 17 18 19 20 21 22 | ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit configfmod)) (declare (uses mtargs)) | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit configfmod)) (declare (uses mtargs)) ;; (declare (uses debugprint)) ;; (declare (uses keysmod)) (module configfmod * (import srfi-1 |
︙ | ︙ |
Modified dashboard-context-menu.scm from [5ecacce2af] to [11413d9f5f].
︙ | ︙ | |||
37 38 39 40 41 42 43 | (declare (uses db)) (declare (uses gutils)) (declare (uses rmtmod)) (declare (uses ezsteps)) ;; (declare (uses sdb)) ;; (declare (uses filedb)) (declare (uses subrun)) | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | (declare (uses db)) (declare (uses gutils)) (declare (uses rmtmod)) (declare (uses ezsteps)) ;; (declare (uses sdb)) ;; (declare (uses filedb)) (declare (uses subrun)) ;; (declare (uses debugprint)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") ;; (import debugprint) |
︙ | ︙ |
Modified dashboard-tests.scm from [65ea816136] to [b054f12cf1].
︙ | ︙ | |||
36 37 38 39 40 41 42 | (declare (uses db)) (declare (uses gutils)) (declare (uses rmtmod)) (declare (uses ezsteps)) ;; (declare (uses sdb)) ;; (declare (uses filedb)) (declare (uses subrun)) | | | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | (declare (uses db)) (declare (uses gutils)) (declare (uses rmtmod)) (declare (uses ezsteps)) ;; (declare (uses sdb)) ;; (declare (uses filedb)) (declare (uses subrun)) ;; (declare (uses debugprint)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") ;; (import debugprint) ;;====================================================================== ;; C O M M O N ;;====================================================================== (define *dashboard-comment-share-slot* #f) |
︙ | ︙ |
Modified dashboard.scm from [eccd259500] to [e79a58e22f].
︙ | ︙ | |||
43 44 45 46 47 48 49 | (declare (uses tree)) (declare (uses dcommon)) (declare (uses dashboard-context-menu)) (declare (uses vg)) (declare (uses subrun)) (declare (uses mt)) (declare (uses dbfile)) | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | (declare (uses tree)) (declare (uses dcommon)) (declare (uses dashboard-context-menu)) (declare (uses vg)) (declare (uses subrun)) (declare (uses mt)) (declare (uses dbfile)) ;; (declare (uses debugprint)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "megatest-version.scm") (include "megatest-fossil-hash.scm") |
︙ | ︙ | |||
571 572 573 574 575 576 577 | 3))) (define (get-curr-sort) (vector-ref *tests-sort-options* *tests-sort-reverse*)) ;;====================================================================== | | | 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 | 3))) (define (get-curr-sort) (vector-ref *tests-sort-options* *tests-sort-reverse*)) ;;====================================================================== (debug:setup (args:get-arg "-debug")(args:get-arg "-debug-noprop")) ;; (define uidat #f) (define-inline (dboard:uidat-get-keycol vec)(vector-ref vec 0)) (define-inline (dboard:uidat-get-lftcol vec)(vector-ref vec 1)) (define-inline (dboard:uidat-get-header vec)(vector-ref vec 2)) (define-inline (dboard:uidat-get-runsvec vec)(vector-ref vec 3)) |
︙ | ︙ |
Modified db.scm from [5080053a94] to [4add2c7e8c].
︙ | ︙ | |||
44 45 46 47 48 49 50 51 | z3 typed-records matchable files) (declare (unit db)) (declare (uses common)) (declare (uses dbmod)) | > | > | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | z3 typed-records matchable files) (declare (unit db)) (declare (uses common)) (declare (uses commonmod)) (declare (uses dbmod)) ;; (declare (uses debugprint)) (declare (uses dbfile)) (declare (uses keys)) (declare (uses ods)) ;; (declare (uses client)) (declare (uses mt)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") (define *number-of-writes* 0) (define *number-non-write-queries* 0) (import dbmod dbfile commonmod ;; debugprint ) ;; record for keeping state,status and count for doing roll-ups in ;; iterated tests ;; (defstruct dbr:counts |
︙ | ︙ |
Modified dbfile.scm from [0a6b9f739f] to [23a7d02699].
︙ | ︙ | |||
15 16 17 18 19 20 21 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit dbfile)) | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit dbfile)) ;; (declare (uses debugprint)) (declare (uses commonmod)) (module dbfile * (import scheme chicken |
︙ | ︙ |
Modified dbmod.scm from [c1b3b278a4] to [d8a82d564f].
︙ | ︙ | |||
15 16 17 18 19 20 21 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit dbmod)) | | > | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit dbmod)) (declare (uses commonmod)) ;; (include "debugprint.scm") (module dbmod * (import scheme chicken ports s11n z3 data-structures extras (prefix base64 base64:) message-digest regex commonmod ;; debugprint ) (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69) (define (db:run-id->dbname run-id) |
︙ | ︙ |
Modified dcommon.scm from [08def52f2a] to [93c134c5ac].
︙ | ︙ | |||
26 27 28 29 30 31 32 | (use regex typed-records matchable) (declare (unit dcommon)) (declare (uses gutils)) (declare (uses db)) (declare (uses commonmod)) | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | (use regex typed-records matchable) (declare (unit dcommon)) (declare (uses gutils)) (declare (uses db)) (declare (uses commonmod)) ;; (declare (uses debugprint)) (import commonmod ;; debugprint ) ;; (declare (uses synchash)) (include "megatest-version.scm") |
︙ | ︙ |
Modified diff-report.scm from [4cec165569] to [dcde58527c].
︙ | ︙ | |||
15 16 17 18 19 20 21 | ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;; (declare (unit diff-report)) (declare (uses common)) (declare (uses rmtmod)) | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;; (declare (unit diff-report)) (declare (uses common)) (declare (uses rmtmod)) ;; (declare (uses debugprint)) (include "common_records.scm") (use matchable) (use fmt) (use ducttape-lib) ;; (import debugprint) |
︙ | ︙ |
Modified env.scm from [63040dd8a5] to [b700c7de78].
︙ | ︙ | |||
15 16 17 18 19 20 21 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit env)) | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit env)) ;; (declare (uses debugprint)) (use sql-de-lite) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables) ;; (import debugprint) (define (env:open-db fname) (let* ((db-exists (common:file-exists? fname)) |
︙ | ︙ |
Modified ezsteps.scm from [9ec9d1ddb6] to [7e870291eb].
︙ | ︙ | |||
23 24 25 26 27 28 29 | z3 csv typed-records pathname-expand matchable) (declare (unit ezsteps)) (declare (uses db)) (declare (uses common)) (declare (uses items)) (declare (uses runconfig)) | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | z3 csv typed-records pathname-expand matchable) (declare (unit ezsteps)) (declare (uses db)) (declare (uses common)) (declare (uses items)) (declare (uses runconfig)) ;; (declare (uses debugprint)) ;; (declare (uses sdb)) ;; (declare (uses filedb)) (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") |
︙ | ︙ |
Modified genexample.scm from [41574e91a8] to [27926430b4].
︙ | ︙ | |||
15 16 17 18 19 20 21 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit genexample)) | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit genexample)) ;; (declare (uses debugprint)) (use posix regex matchable) ;; (import debugprint) (include "db_records.scm") (define genexample:example-logpro |
︙ | ︙ |
Modified items.scm from [0b4646dcb9] to [a9b749fc70].
︙ | ︙ | |||
19 20 21 22 23 24 25 | ;; (define itemdat '((ripeness "green ripe overripe") ;; (temperature "cool medium hot") ;; (season "summer winter fall spring"))) (declare (unit items)) (declare (uses common)) | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ;; (define itemdat '((ripeness "green ripe overripe") ;; (temperature "cool medium hot") ;; (season "summer winter fall spring"))) (declare (unit items)) (declare (uses common)) ;; (declare (uses debugprint)) (include "common_records.scm") ;; (import debugprint) ;; Puts out all combinations (define (process-itemlist hierdepth curritemkey itemlist) |
︙ | ︙ |
Modified keys.scm from [86fab5099e] to [7667066c63].
︙ | ︙ | |||
19 20 21 22 23 24 25 | ;;====================================================================== ;; Run keys, these are used to hierarchially organise tests and run areas ;;====================================================================== (declare (unit keys)) (declare (uses common)) | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ;;====================================================================== ;; Run keys, these are used to hierarchially organise tests and run areas ;;====================================================================== (declare (unit keys)) (declare (uses common)) ;; (declare (uses debugprint)) (use srfi-1 posix regex regex-case srfi-69 (prefix sqlite3 sqlite3:)) ;; (import debugprint) |
︙ | ︙ |
Modified launch.scm from [3d2278b989] to [953b075aa2].
︙ | ︙ | |||
30 31 32 33 34 35 36 | (declare (unit launch)) (declare (uses subrun)) (declare (uses common)) (declare (uses configf)) (declare (uses db)) (declare (uses ezsteps)) | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | (declare (unit launch)) (declare (uses subrun)) (declare (uses common)) (declare (uses configf)) (declare (uses db)) (declare (uses ezsteps)) ;; (declare (uses debugprint)) (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "megatest-fossil-hash.scm") ;; (import debugprint) |
︙ | ︙ |
Modified lock-queue.scm from [0447d3fa52] to [1916682e05].
︙ | ︙ | |||
15 16 17 18 19 20 21 | ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;; (declare (unit lock-queue)) (declare (uses common)) (declare (uses tasks)) | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;; (declare (unit lock-queue)) (declare (uses common)) (declare (uses tasks)) ;; (declare (uses debugprint)) (use (prefix sqlite3 sqlite3:) srfi-18) ;; (import debugprint) ;;====================================================================== ;; attempt to prevent overlapping updates of rollup files by queueing ;; update requests in an sqlite db |
︙ | ︙ |
Modified megatest.scm from [02819968ec] to [a14a18a501].
︙ | ︙ | |||
18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | ;; (include "common.scm") (include "megatest-version.scm") ;; fake out readline usage of toplevel-command (define (toplevel-command . a) #f) (declare (uses common)) ;; (declare (uses megatest-version)) (declare (uses margs)) (declare (uses runs)) (declare (uses launch)) (declare (uses tests)) (declare (uses genexample)) ;; (declare (uses daemon)) (declare (uses db)) ;; (declare (uses dcommon)) (declare (uses tdb)) (declare (uses mt)) (declare (uses api)) (declare (uses tasks)) ;; only used for debugging. (declare (uses env)) (declare (uses diff-report)) (declare (uses db)) (declare (uses dbmod)) | > > > > > > > > > | < | < | | | | < > > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | ;; (include "common.scm") (include "megatest-version.scm") ;; fake out readline usage of toplevel-command (define (toplevel-command . a) #f) ;; notes: ;; 1. the uses of .import are needed ;; 2. the order is important ;; (declare (uses common)) (declare (uses commonmod)) (declare (uses commonmod.import)) (declare (uses dbfile)) (declare (uses dbfile.import)) ;; (declare (uses megatest-version)) (declare (uses margs)) (declare (uses runs)) (declare (uses launch)) (declare (uses tests)) (declare (uses genexample)) ;; (declare (uses daemon)) (declare (uses db)) ;; (declare (uses dcommon)) (declare (uses tdb)) (declare (uses mt)) (declare (uses api)) (declare (uses tasks)) ;; only used for debugging. (declare (uses env)) (declare (uses diff-report)) (declare (uses db)) (declare (uses dbmod)) ;; (declare (uses dbmod.import)) (declare (uses rmtmod)) (declare (uses clientmod)) (declare (uses servermod)) ;; (declare (uses commonmod.import)) ;; (declare (uses dbfile.import)) ;; (declare (uses debugprint)) ;; ;; (declare (uses debugprint.import)) ;; (declare (uses mtargs)) ;; (declare (uses mtargs.import)) ;; (declare (uses ftail)) ;; (import ftail) (import commonmod dbfile dbmod servermod ;; debugprint.import ;; debugprint ) (define *db* #f) ;; this is only for the repl, do not use in general!!!! |
︙ | ︙ | |||
662 663 664 665 666 667 668 | (debug:print 0 *default-log-port* (string-intersperse (argv) " "))) ;;====================================================================== ;; Misc setup stuff ;;====================================================================== | | | 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 | (debug:print 0 *default-log-port* (string-intersperse (argv) " "))) ;;====================================================================== ;; Misc setup stuff ;;====================================================================== (debug:setup (args:get-arg "-debug")(args:get-arg "-debug-noprop")) (if (args:get-arg "-logging")(set! *logging* #t)) ;;(if (debug:debug-mode 3) ;; we are obviously debugging ;; (set! open-run-close open-run-close-no-exception-handling)) (if (args:get-arg "-itempatt") |
︙ | ︙ |
Modified mt.scm from [e9aaac3ad9] to [2eb794b360].
︙ | ︙ | |||
26 27 28 29 30 31 32 | (declare (uses items)) (declare (uses runconfig)) (declare (uses tests)) (declare (uses servermod)) (declare (uses runs)) (declare (uses rmtmod)) ;; (declare (uses filedb)) | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | (declare (uses items)) (declare (uses runconfig)) (declare (uses tests)) (declare (uses servermod)) (declare (uses runs)) (declare (uses rmtmod)) ;; (declare (uses filedb)) ;; (declare (uses debugprint)) (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") (include "test_records.scm") |
︙ | ︙ |
Modified mtut.scm from [a5cf87019e] to [df6eb07f0f].
︙ | ︙ | |||
28 29 30 31 32 33 34 | (prefix sqlite3 sqlite3:) nanomsg) (declare (uses common)) (declare (uses margs)) (declare (uses configf)) ;; (declare (uses rmt)) | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | (prefix sqlite3 sqlite3:) nanomsg) (declare (uses common)) (declare (uses margs)) (declare (uses configf)) ;; (declare (uses rmt)) ;; (declare (uses debugprint)) (use ducttape-lib) ;; (import debugprint) (include "megatest-fossil-hash.scm") |
︙ | ︙ |
Modified newdashboard.scm from [5c2e8b57fe] to [25e748f7c8].
︙ | ︙ | |||
34 35 36 37 38 39 40 | ;; (declare (uses launch)) ;; (declare (uses gutils)) ;; (declare (uses db)) ;; (declare (uses server)) ;; (declare (uses synchash)) (declare (uses dcommon)) | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | ;; (declare (uses launch)) ;; (declare (uses gutils)) ;; (declare (uses db)) ;; (declare (uses server)) ;; (declare (uses synchash)) (declare (uses dcommon)) ;; (declare (uses debugprint)) ;; (declare (uses tree)) ;; ;; (include "common_records.scm") ;; (include "db_records.scm") ;; (include "key_records.scm") ;; (import debugprint) |
︙ | ︙ |
Modified portlogger.scm from [96a3168d68] to [754b691051].
︙ | ︙ | |||
20 21 22 23 24 25 26 | (require-extension (srfi 18) extras tcp s11n) (use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3) (import (prefix sqlite3 sqlite3:)) (declare (unit portlogger)) (declare (uses db)) | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | (require-extension (srfi 18) extras tcp s11n) (use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3) (import (prefix sqlite3 sqlite3:)) (declare (unit portlogger)) (declare (uses db)) ;; (declare (uses debugprint)) ;; (import debugprint) ;; lsof -i (define (portlogger:open-db fname) (let* ((avail (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away (exists (common:file-exists? fname)) |
︙ | ︙ |
Modified process.scm from [05044f9917] to [60c5f21e59].
︙ | ︙ | |||
20 21 22 23 24 25 26 | ;;====================================================================== ;; Process convience utils ;;====================================================================== (use regex directory-utils) (declare (unit process)) | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | ;;====================================================================== ;; Process convience utils ;;====================================================================== (use regex directory-utils) (declare (unit process)) ;; (declare (uses debugprint)) ;; (import debugprint) (define (process:conservative-read port) (let loop ((res "")) (if (not (eof-object? (peek-char port))) (loop (conc res (read-char port))) |
︙ | ︙ |
Modified rmt.scm from [86190a84aa] to [d0b4ed73a0].
︙ | ︙ | |||
20 21 22 23 24 25 26 | (use format typed-records) ;; RADT => purpose of json format?? (declare (unit rmt)) (declare (uses api)) (declare (uses http-transport)) (declare (uses dbfile)) | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | (use format typed-records) ;; RADT => purpose of json format?? (declare (unit rmt)) (declare (uses api)) (declare (uses http-transport)) (declare (uses dbfile)) ;; (declare (uses debugprint)) (include "common_records.scm") ;; (declare (uses rmtmod)) (import dbfile ;; debugprint ) ;; rmtmod) |
︙ | ︙ |
Modified rmtmod.scm from [32ffde6ac2] to [c9947e40de].
︙ | ︙ | |||
18 19 20 21 22 23 24 | ;;====================================================================== (declare (unit rmtmod)) (declare (uses commonmod)) (declare (uses clientmod)) (declare (uses dbmod)) | | > > | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | ;;====================================================================== (declare (unit rmtmod)) (declare (uses commonmod)) (declare (uses clientmod)) (declare (uses dbmod)) ;; (declare (uses debugprint)) (declare (uses apimod)) ;; (include "debugprint.scm") (module rmtmod * (import scheme chicken data-structures posix ;; regex srfi-1 srfi-18 srfi-69 extras commonmod clientmod dbmod apimod ;; debugprint ) ;; ;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!! ;; ;; generate entries for ~/.megatestrc with the following |
︙ | ︙ |
Modified runconfig.scm from [b77047a591] to [606c33435c].
︙ | ︙ | |||
18 19 20 21 22 23 24 | ;;====================================================================== ;; read a config file, loading only the section pertinent ;; to this run field1val/field2val/field3val ... ;;====================================================================== (declare (unit runconfig)) (declare (uses common)) | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | ;;====================================================================== ;; read a config file, loading only the section pertinent ;; to this run field1val/field2val/field3val ... ;;====================================================================== (declare (unit runconfig)) (declare (uses common)) ;; (declare (uses debugprint)) (use format directory-utils) ;; (import debugprint) (include "common_records.scm") |
︙ | ︙ |
Modified runs.scm from [9f966e19c7] to [626d61ee99].
︙ | ︙ | |||
27 28 29 30 31 32 33 | (declare (uses items)) (declare (uses runconfig)) (declare (uses tests)) (declare (uses servermod)) (declare (uses mt)) (declare (uses archive)) ;; (declare (uses filedb)) | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | (declare (uses items)) (declare (uses runconfig)) (declare (uses tests)) (declare (uses servermod)) (declare (uses mt)) (declare (uses archive)) ;; (declare (uses filedb)) ;; (declare (uses debugprint)) (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") (include "test_records.scm") |
︙ | ︙ |
Modified servermod.scm from [e8ef35e2b1] to [23cc0f45b6].
︙ | ︙ | |||
14 15 16 17 18 19 20 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit servermod)) (declare (uses artifacts)) | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit servermod)) (declare (uses artifacts)) ;; (declare (uses debugprint)) (use md5 message-digest posix typed-records extras) (module servermod * (import scheme |
︙ | ︙ |
Modified subrun.scm from [3f1eb31590] to [da48a109f1].
︙ | ︙ | |||
25 26 27 28 29 30 31 | ;;(declare (uses items)) ;;(declare (uses runconfig)) ;;(declare (uses tests)) ;;(declare (uses server)) (declare (uses mt)) ;;(declare (uses archive)) ;; (declare (uses filedb)) | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | ;;(declare (uses items)) ;;(declare (uses runconfig)) ;;(declare (uses tests)) ;;(declare (uses server)) (declare (uses mt)) ;;(declare (uses archive)) ;; (declare (uses filedb)) ;; (declare (uses debugprint)) (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) posix-extras directory-utils pathname-expand typed-records format call-with-environment-variables) ;; (import debugprint) |
︙ | ︙ |
Modified tasks.scm from [84e92d8ec7] to [bdfbc420bf].
︙ | ︙ | |||
23 24 25 26 27 28 29 | (declare (unit tasks)) (declare (uses dbfile)) (declare (uses db)) (declare (uses rmtmod)) (declare (uses common)) (declare (uses pgdb)) | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | (declare (unit tasks)) (declare (uses dbfile)) (declare (uses db)) (declare (uses rmtmod)) (declare (uses common)) (declare (uses pgdb)) ;; (declare (uses debugprint)) (import dbfile ;; debugprint ) ;; (import pgdb) ;; pgdb is a module (include "db_records.scm") |
︙ | ︙ |
Modified tdb.scm from [1aaa951a14] to [5959cc0a2c].
︙ | ︙ | |||
30 31 32 33 34 35 36 | (declare (unit tdb)) (declare (uses common)) (declare (uses keys)) (declare (uses ods)) (declare (uses clientmod)) (declare (uses mt)) (declare (uses db)) | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | (declare (unit tdb)) (declare (uses common)) (declare (uses keys)) (declare (uses ods)) (declare (uses clientmod)) (declare (uses mt)) (declare (uses db)) ;; (declare (uses debugprint)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") ;; (import debugprint) |
︙ | ︙ |
Modified tests.scm from [1c5a178da8] to [07913f4c86].
︙ | ︙ | |||
30 31 32 33 34 35 36 | (declare (uses commonmod)) ;; (declare (uses dcommon)) ;; needed for the steps processing (declare (uses items)) (declare (uses runconfig)) ;; (declare (uses sdb)) (declare (uses servermod)) ;;(declare (uses stml2)) | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | (declare (uses commonmod)) ;; (declare (uses dcommon)) ;; needed for the steps processing (declare (uses items)) (declare (uses runconfig)) ;; (declare (uses sdb)) (declare (uses servermod)) ;;(declare (uses stml2)) ;; (declare (uses debugprint)) ;; (import debugprint) (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils) (import (prefix sqlite3 sqlite3:)) (import commonmod) (require-library stml) |
︙ | ︙ |
Modified tree.scm from [e4f4fe6b37] to [fbe7ce81da].
︙ | ︙ | |||
31 32 33 34 35 36 37 | (declare (uses launch)) ;; (declare (uses megatest-version)) (declare (uses gutils)) (declare (uses db)) ;; (declare (uses server)) ;; (declare (uses synchash)) (declare (uses dcommon)) | | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | (declare (uses launch)) ;; (declare (uses megatest-version)) (declare (uses gutils)) (declare (uses db)) ;; (declare (uses server)) ;; (declare (uses synchash)) (declare (uses dcommon)) ;; (declare (uses debugprint)) (include "megatest-version.scm") (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") ;; (import debugprint) |
︙ | ︙ |