Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -43,11 +43,11 @@ tcp-transportmod.scm rmtmod.scm portlogger.scm apimod.scm \ configfmod.scm processmod.scm servermod.scm megatestmod.scm \ stml2.scm fsmod.scm cpumod.scm mtmod.scm odsmod.scm \ pkts.scm testsmod.scm pgdb.scm cookie.scm launchmod.scm \ subrunmod.scm runsmod.scm tasksmod.scm archivemod.scm \ - ezstepsmod.scm mtbody.scm envmod.scm genexample.scm + ezstepsmod.scm mtbody.scm envmod.scm genexample.scm mutils.scm transport-mode.scm : transport-mode.scm.template cp transport-mode.scm.template transport-mode.scm dashboard-transport-mode.scm : dashboard-transport-mode.scm.template @@ -56,11 +56,11 @@ mtest : transport-mode.scm dboard : dashboard-transport-mode.scm # dbmod.import.o is just a hack here -mofiles/mtbody.o : mofiles/launchmod.o readline-fix.scm mofiles/envmod.o mofiles/genexample.o +mofiles/mtbody.o : mofiles/launchmod.o readline-fix.scm mofiles/envmod.o mofiles/genexample.o mofiles/mutils.o process.o : mofiles/processmod.o mofiles/configfmod.o : mofiles/processmod.o mofiles/processmod.o : mofiles/commonmod.o mofiles/servermod.o : mofiles/commonmod.o mofiles/rmtmod.o : mofiles/mtmod.o mofiles/apimod.o Index: archivemod.scm ================================================================== --- archivemod.scm +++ archivemod.scm @@ -43,11 +43,11 @@ archive:get-archive-disks archive:allocate-new-archive-block archive:get-timestamp-dir archive:megatest-db archive:bup-get-data - + archive:restore-db ) (import scheme) (cond-expand Index: dbmod.scm ================================================================== --- dbmod.scm +++ dbmod.scm @@ -27,10 +27,12 @@ (declare (uses mtargs)) (declare (uses mtmod)) (module dbmod ( + dbmod:db-to-db-sync + db:test-get-event_time db:test-get-item-path db:test-get-testname db:get-value-by-header Index: launchmod.scm ================================================================== --- launchmod.scm +++ launchmod.scm @@ -45,10 +45,14 @@ (use srfi-69) (module launchmod ( + launch:load-logpro-dat + launch:recover-test + launch:execute + launch:extract-scripts-logpro ) (import scheme) (cond-expand (chicken-4 Index: megatestmod.scm ================================================================== --- megatestmod.scm +++ megatestmod.scm @@ -59,10 +59,11 @@ common:args-get-testpatt tests:filter-test-names-not-matched common:args-get-runname common:load-views-config common:args-get-state + common:args-get-status common:get-runconfig-targets ) (import scheme) (cond-expand Index: mtbody.scm ================================================================== --- mtbody.scm +++ mtbody.scm @@ -33,10 +33,12 @@ (declare (uses apimod)) (declare (uses genexample)) (declare (uses rmtmod)) (declare (uses archivemod)) (declare (uses mutils)) +(declare (uses odsmod)) +(declare (uses testsmod)) (use srfi-69) (module mtbody * @@ -109,11 +111,10 @@ srfi-69 typed-records system-information debugprint - mutils ))) ;; imports common to chk5 and ck4 (import srfi-13) @@ -140,10 +141,13 @@ launchmod fsmod envmod apimod genexample + mutils + odsmod + testsmod ) (include "common_records.scm") (define *db* #f) ;; this is only for the repl, do not use in general!!!! @@ -2074,11 +2078,11 @@ (runs:run-tests target runname #f ;; (common:args-get-testpatt #f) ;; (or (args:get-arg "-testpatt") ;; "%") - user + (current-user-name) args:arg-hash run-count: rerun-cnt))) ;; get lock in db for full run for this directory ;; for all tests with deps @@ -2174,19 +2178,19 @@ ;;====================================================================== ;; Rollup into a run ;;====================================================================== - (if (args:get-arg "-rollup") - (general-run-call - "-rollup" - "rollup tests" - (lambda (target runname keys keyvals) - (runs:rollup-run keys - keyvals - (or (args:get-arg "-runname")(args:get-arg ":runname") ) - user)))) +;; (if (args:get-arg "-rollup") +;; (general-run-call +;; "-rollup" +;; "rollup tests" +;; (lambda (target runname keys keyvals) +;; (runs:rollup-run keys +;; keyvals +;; (or (args:get-arg "-runname")(args:get-arg ":runname") ) +;; user)))) ;;====================================================================== ;; Lock or unlock a run ;;====================================================================== Index: odsmod.scm ================================================================== --- odsmod.scm +++ odsmod.scm @@ -24,10 +24,12 @@ (declare (uses dbfile)) (declare (uses dbmod)) (module odsmod ( + db:extract-ods-file + ods:list->ods ) (import scheme chicken data-structures @@ -41,10 +43,11 @@ commonmod debugprint dbfile dbmod + ) (define ods:dirs '("Configurations2" "Configurations2/toolpanel" Index: rmtmod.scm ================================================================== --- rmtmod.scm +++ rmtmod.scm @@ -29,10 +29,15 @@ (declare (uses apimod)) (declare (uses servermod)) (module rmtmod ( + rmt:import-sexpr + rmt:read-test-data-varpatt + rmt:get-run-status + rmt:set-run-status + rmtmod:send-receive rmt:send-receive rmt:no-sync-get-lock rmt:no-sync-del! rmt:no-sync-set Index: runsmod.scm ================================================================== --- runsmod.scm +++ runsmod.scm @@ -55,10 +55,17 @@ set-item-env-vars runs:set-megatest-env-vars full-runconfigs-read runs:operate-on + + runs:update-all-test_meta + runs:handle-locking + ;; runs:rollup-run ;; not ported + runs:run-tests + runs:remove-all-but-last-n-runs-per-target + general-run-call ) (import scheme) (cond-expand (chicken-4 Index: tasksmod.scm ================================================================== --- tasksmod.scm +++ tasksmod.scm @@ -51,10 +51,14 @@ tests:get-testconfig tests:get-waitons tests:get-test-path-from-environment common:exit-on-version-changed + task:get-run-times + task:get-test-times + tasks:sync-to-postgres + ) (import scheme) (cond-expand (chicken-4 Index: testsmod.scm ================================================================== --- testsmod.scm +++ testsmod.scm @@ -49,10 +49,15 @@ tests:summarize-test tests:save-final-status tests:update-central-meta-info tests:set-full-meta-info tests:get-compressed-steps + tests:create-html-summary + tests:create-html-summary + tests:create-html-tree + tests:summarize-items + tests:test-get-paths-matching ) (import scheme) (cond-expand (chicken-4