Overview
Comment: | Fixed/tweaked more deps. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.65-real-new-runs-view-wip |
Files: | files | file ages | folders |
SHA1: |
07b32b8669d182a68dd113a69d95da64 |
User & Date: | mrwellan on 2021-02-22 18:56:19 |
Other Links: | branch diff | manifest | tags |
Context
2021-02-22
| ||
19:02 | odd dredges of code - bad merge? check-in: bd42d6502d user: mrwellan tags: v1.65-real-new-runs-view-wip (unpublished) | |
18:56 | Fixed/tweaked more deps. check-in: 07b32b8669 user: mrwellan tags: v1.65-real-new-runs-view-wip (unpublished) | |
17:33 | Rework the deps. check-in: 653a2890a7 user: mrwellan tags: v1.65-real-new-runs-view-wip (unpublished) | |
Changes
Modified Makefile from [1154ebc6ab] to [79a0e87816].
︙ | ︙ | |||
18 19 20 21 22 23 24 | # make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)' # rm <files>.o ; make install CSCOPTS='-profile' ; ... ; chicken-profile | less SHELL=/bin/bash PREFIX=$(PWD) CSCOPTS= INSTALL=install SRCFILES = common.scm items.scm launch.scm runconfig.scm \ | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | # make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)' # rm <files>.o ; make install CSCOPTS='-profile' ; ... ; chicken-profile | less SHELL=/bin/bash PREFIX=$(PWD) CSCOPTS= INSTALL=install SRCFILES = common.scm items.scm launch.scm runconfig.scm \ server.scm configf.scm db.scm margs.scm \ process.scm runs.scm tasks.scm tests.scm genexample.scm \ http-transport.scm filedb.scm tdb.scm client.scm mt.scm \ ezsteps.scm lock-queue.scm sdb.scm rmt.scm api.scm \ subrun.scm portlogger.scm archive.scm env.scm \ diff-report.scm cgisetup/models/pgdb.scm # module source files |
︙ | ︙ | |||
109 110 111 112 113 114 115 | client.o \ common.o \ configf.o \ db.o \ env.o \ http-transport.o \ items.o \ | < | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | client.o \ common.o \ configf.o \ db.o \ env.o \ http-transport.o \ items.o \ launch.o \ lock-queue.o \ margs.o \ mt.o \ portlogger.o \ process.o \ rmt.o \ |
︙ | ︙ | |||
181 182 183 184 185 186 187 | 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 # dashboard.o : mofiles/apimod.o tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | 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 # dashboard.o : mofiles/apimod.o tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm db.o ezsteps.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm tests.o tasks.o dashboard-tasks.o : task_records.scm runs.o : test_records.scm # api.o rmt.o db.o : mofiles/apimod.o mofiles/dbmod.o mofiles/rmtmod.o mofiles/ods.o mofiles/commonmod.o common.o megatest.o dashboard.o : megatest-fossil-hash.scm megatest-version.scm |
︙ | ︙ | |||
203 204 205 206 207 208 209 | vg.o dashboard.o : vg_records.scm megatest-version.scm dcommon.o : run_records.scm # mofiles/dcommonmod.o mofiles/stml2.o : mofiles/cookie.o | | | | 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | vg.o dashboard.o : vg_records.scm megatest-version.scm dcommon.o : run_records.scm # mofiles/dcommonmod.o mofiles/stml2.o : mofiles/cookie.o # mofiles/dbmod.o : mofiles/ods.o # mofiles/rmtmod.o : mofiles/dbmod.o # # special include based modules # mofiles/pkts.o : pkts/pkts.scm # mofiles/stml2.o : cookie.o # # mofiles/mtargs.o : mtargs/mtargs.scm # # mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm # mofiles/ulex.o : ulex/ulex.scm |
︙ | ︙ | |||
478 479 480 481 482 483 484 | if csi -ne '(use mysql-client)';then \ echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi if csi -ne '(use postgresql)';then \ echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi | | | | 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 | if csi -ne '(use mysql-client)';then \ echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi if csi -ne '(use postgresql)';then \ echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o launch.o lock-queue.o margs.o mt.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o launch.o lock-queue.o margs.o mt.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o # create a pdf dot graphviz diagram from notations in rmt.scm rmt.pdf : rmt.scm grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf buildmanual: cd docs/manual && make |
︙ | ︙ |
Modified build.inc from [79dd1632c6] to [69febbae9f].
︙ | ︙ | |||
23 24 25 26 27 28 29 | client.o : mofiles/servermod.o common.o : mofiles/commonmod.o common.o : mofiles/dbmod.o common.o : mofiles/configfmod.o common.o : mofiles/servermod.o configf.o : process.o configf.o : env.o | < < < | 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 | client.o : mofiles/servermod.o common.o : mofiles/commonmod.o common.o : mofiles/dbmod.o common.o : mofiles/configfmod.o common.o : mofiles/servermod.o configf.o : process.o configf.o : env.o configf.o : mofiles/commonmod.o configf.o : mofiles/configfmod.o mofiles/configfmod.o : mofiles/commonmod.o dashboard-context-menu.o : common.o dashboard-context-menu.o : db.o dashboard-context-menu.o : gutils.o dashboard-context-menu.o : rmt.o dashboard-context-menu.o : ezsteps.o dashboard-context-menu.o : subrun.o dashboard-context-menu.o : mofiles/commonmod.o dashboard-context-menu.o : mofiles/configfmod.o dashboard-context-menu.o : mofiles/dbmod.o dashboard-guimonitor.o : common.o dashboard-guimonitor.o : db.o dashboard-guimonitor.o : tasks.o dashboard-guimonitor.o : mofiles/commonmod.o dashboard-guimonitor.o : mofiles/dbmod.o dashboard-tests.o : common.o dashboard-tests.o : db.o dashboard-tests.o : gutils.o dashboard-tests.o : rmt.o dashboard-tests.o : ezsteps.o dashboard-tests.o : subrun.o dashboard-tests.o : mofiles/commonmod.o dashboard-tests.o : mofiles/configfmod.o dashboard-tests.o : mofiles/dbmod.o dashboard.o : common.o dashboard.o : margs.o dashboard.o : items.o dashboard.o : db.o dashboard.o : configf.o dashboard.o : process.o dashboard.o : launch.o dashboard.o : runs.o dashboard.o : dashboard-tests.o |
︙ | ︙ | |||
78 79 80 81 82 83 84 | # dashboard.o : configfmod.import.o dashboard.o : mofiles/dcommonmod.o # dashboard.o : dcommonmod.import.o dashboard.o : mofiles/apimod.o dashboard.o : mofiles/dbmod.o dashboard.o : mofiles/servermod.o db.o : common.o | < | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | # dashboard.o : configfmod.import.o dashboard.o : mofiles/dcommonmod.o # dashboard.o : dcommonmod.import.o dashboard.o : mofiles/apimod.o dashboard.o : mofiles/dbmod.o dashboard.o : mofiles/servermod.o db.o : common.o db.o : client.o db.o : mt.o db.o : mofiles/commonmod.o db.o : mofiles/configfmod.o db.o : mofiles/dbmod.o db.o : mofiles/servermod.o mofiles/dbmod.o : mofiles/commonmod.o |
︙ | ︙ | |||
108 109 110 111 112 113 114 | ezsteps.o : db.o ezsteps.o : common.o ezsteps.o : items.o ezsteps.o : runconfig.o ezsteps.o : mofiles/commonmod.o ezsteps.o : mofiles/configfmod.o ezsteps.o : mofiles/dbmod.o | < < < < < < < | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | ezsteps.o : db.o ezsteps.o : common.o ezsteps.o : items.o ezsteps.o : runconfig.o ezsteps.o : mofiles/commonmod.o ezsteps.o : mofiles/configfmod.o ezsteps.o : mofiles/dbmod.o genexample.o : mofiles/commonmod.o http-transport.o : common.o http-transport.o : db.o http-transport.o : tests.o http-transport.o : server.o http-transport.o : portlogger.o http-transport.o : rmt.o http-transport.o : mofiles/commonmod.o http-transport.o : mofiles/configfmod.o http-transport.o : mofiles/dbmod.o http-transport.o : mofiles/servermod.o index-tree.o : lock-queue.o index-tree.o : db.o index-tree.o : common.o index-tree.o : items.o index-tree.o : runconfig.o index-tree.o : mofiles/commonmod.o items.o : common.o items.o : mofiles/commonmod.o items.o : mofiles/configfmod.o launch.o : subrun.o launch.o : common.o launch.o : configf.o launch.o : db.o launch.o : ezsteps.o launch.o : mofiles/commonmod.o launch.o : mofiles/configfmod.o |
︙ | ︙ | |||
273 274 275 276 277 278 279 | tasks.o : mofiles/configfmod.o tasks.o : mofiles/dbmod.o tcmt.o : margs.o tcmt.o : rmt.o tcmt.o : common.o tcmt.o : mofiles/commonmod.o tdb.o : common.o | < | 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | tasks.o : mofiles/configfmod.o tasks.o : mofiles/dbmod.o tcmt.o : margs.o tcmt.o : rmt.o tcmt.o : common.o tcmt.o : mofiles/commonmod.o tdb.o : common.o tdb.o : client.o tdb.o : mt.o tdb.o : db.o tdb.o : mofiles/commonmod.o tdb.o : mofiles/dbmod.o tdb.o : ods.o test.o : mtcommon.o |
︙ | ︙ |
Modified commonmod.scm from [ed030edf10] to [729100655f].
︙ | ︙ | |||
1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 | (begin (if message (debug:print-error 0 *default-log-port* message)) (or ovrd '())))) (define (common:get-fields cfgdat) (let ((fields (hash-table-ref/default cfgdat "fields" '()))) (map car fields))) ;;====================================================================== ;; looking only (at least for now) at the MT_ variables craft the full testname ;; (define (common:get-full-test-name) (if (getenv "MT_TEST_NAME") (if (and (getenv "MT_ITEMPATH") | > > | 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 | (begin (if message (debug:print-error 0 *default-log-port* message)) (or ovrd '())))) (define (common:get-fields cfgdat) (let ((fields (hash-table-ref/default cfgdat "fields" '()))) (map car fields))) (define keys:config-get-fields common:get-fields) ;;====================================================================== ;; looking only (at least for now) at the MT_ variables craft the full testname ;; (define (common:get-full-test-name) (if (getenv "MT_TEST_NAME") (if (and (getenv "MT_ITEMPATH") |
︙ | ︙ |
Modified configf.scm from [f2e46e7780] to [b56c2244d5].
︙ | ︙ | |||
22 23 24 25 26 27 28 | ;; Config file handling ;;====================================================================== (use regex regex-case matchable) ;; directory-utils) (declare (unit configf)) (declare (uses process)) (declare (uses env)) | < | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | ;; Config file handling ;;====================================================================== (use regex regex-case matchable) ;; directory-utils) (declare (unit configf)) (declare (uses process)) (declare (uses env)) (declare (uses commonmod)) (import commonmod) (declare (uses configfmod)) (import configfmod) |
︙ | ︙ |
Modified dashboard-guimonitor.scm from [fb51e18df9] to [6d71157ea5].
︙ | ︙ | |||
29 30 31 32 33 34 35 | (use canvas-draw) (use sqlite3 srfi-1 posix regex regex-case srfi-69) (import (prefix sqlite3 sqlite3:)) (declare (unit dashboard-guimonitor)) (declare (uses common)) | < | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | (use canvas-draw) (use sqlite3 srfi-1 posix regex regex-case srfi-69) (import (prefix sqlite3 sqlite3:)) (declare (unit dashboard-guimonitor)) (declare (uses common)) (declare (uses db)) (declare (uses tasks)) (declare (uses commonmod)) (import commonmod) (declare (uses dbmod)) |
︙ | ︙ |
Modified dashboard.scm from [c8787aa02d] to [6d6c48afd4].
︙ | ︙ | |||
29 30 31 32 33 34 35 | (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors matchable) ;; defstruct (import (prefix sqlite3 sqlite3:)) (declare (uses common)) (declare (uses margs)) | < | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors matchable) ;; defstruct (import (prefix sqlite3 sqlite3:)) (declare (uses common)) (declare (uses margs)) (declare (uses items)) (declare (uses db)) (declare (uses configf)) (declare (uses process)) (declare (uses launch)) (declare (uses runs)) (declare (uses dashboard-tests)) |
︙ | ︙ |
Modified db.scm from [a8f36ca69a] to [6e43eefcde].
︙ | ︙ | |||
28 29 30 31 32 33 34 | (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64 format dot-locking z3 typed-records matchable) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) (declare (unit db)) (declare (uses common)) | < < | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64 format dot-locking z3 typed-records matchable) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) (declare (unit db)) (declare (uses common)) (declare (uses client)) (declare (uses mt)) (declare (uses commonmod)) (import commonmod) (declare (uses configfmod)) |
︙ | ︙ |
Modified db_records.scm from [37c233f08b] to [87bd276d2f].
︙ | ︙ | |||
199 200 201 202 203 204 205 | (define-inline (db:test-data-set-expected! vec val)(vector-set! vec 5 val)) (define-inline (db:test-data-set-tol! vec val)(vector-set! vec 6 val)) (define-inline (db:test-data-set-units! vec val)(vector-set! vec 7 val)) (define-inline (db:test-data-set-comment! vec val)(vector-set! vec 8 val)) (define-inline (db:test-data-set-status! vec val)(vector-set! vec 9 val)) (define-inline (db:test-data-set-type! vec val)(vector-set! vec 10 val)) | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | (define-inline (db:test-data-set-expected! vec val)(vector-set! vec 5 val)) (define-inline (db:test-data-set-tol! vec val)(vector-set! vec 6 val)) (define-inline (db:test-data-set-units! vec val)(vector-set! vec 7 val)) (define-inline (db:test-data-set-comment! vec val)(vector-set! vec 8 val)) (define-inline (db:test-data-set-status! vec val)(vector-set! vec 9 val)) (define-inline (db:test-data-set-type! vec val)(vector-set! vec 10 val)) ;; The data structure for handing off requests via wire (define (make-cdb:packet)(make-vector 6)) (define-inline (cdb:packet-get-client-sig vec) (vector-ref vec 0)) (define-inline (cdb:packet-get-qtype vec) (vector-ref vec 1)) (define-inline (cdb:packet-get-immediate vec) (vector-ref vec 2)) (define-inline (cdb:packet-get-query-sig vec) (vector-ref vec 3)) (define-inline (cdb:packet-get-params vec) (vector-ref vec 4)) |
︙ | ︙ |
Deleted keys.scm version [82b1675b29].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified ods.scm from [e27f3d7ece] to [0dda8303e2].
︙ | ︙ | |||
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/>. ;; (use csv-xml regex) (declare (unit ods)) (declare (uses commonmod)) | < | 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/>. ;; (use csv-xml regex) (declare (unit ods)) (declare (uses commonmod)) (module ods * (import scheme chicken data-structures extras files ports) (import commonmod) (import regex |
︙ | ︙ |
Modified tdb.scm from [265cbd519f] to [ea4d7209a0].
︙ | ︙ | |||
25 26 27 28 29 30 31 | (require-extension (srfi 18) extras tcp) (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) (declare (unit tdb)) (declare (uses common)) | < | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | (require-extension (srfi 18) extras tcp) (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) (declare (unit tdb)) (declare (uses common)) (declare (uses client)) (declare (uses mt)) (declare (uses db)) (declare (uses commonmod)) (import commonmod) |
︙ | ︙ | |||
49 50 51 52 53 54 55 56 57 58 59 60 61 62 | (include "run_records.scm") ;;====================================================================== ;; ;; T E S T D A T A B A S E S ;; ;;====================================================================== ;;====================================================================== ;; T E S T S P E C I F I C D B ;;====================================================================== ;; Create the sqlite db for the individual test(s) ;; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | (include "run_records.scm") ;;====================================================================== ;; ;; T E S T D A T A B A S E S ;; ;;====================================================================== ;;====================================================================== ;; S T E P S ;;====================================================================== ;; Run steps ;; make-vector-record "Run steps" db step id test_id stepname step_complete step_pass event_time (define (make-db:step)(make-vector 9)) (define (tdb:step-get-id vec) (vector-ref vec 0)) (define (tdb:step-get-test_id vec) (vector-ref vec 1)) (define (tdb:step-get-stepname vec) (vector-ref vec 2)) (define (tdb:step-get-state vec) (vector-ref vec 3)) (define (tdb:step-get-status vec) (vector-ref vec 4)) (define (tdb:step-get-event_time vec) (vector-ref vec 5)) (define (tdb:step-get-logfile vec) (vector-ref vec 6)) (define (tdb:step-get-comment vec) (vector-ref vec 7)) (define (tdb:step-get-last_update vec) (vector-ref vec 8)) (define (tdb:step-set-id! vec val)(vector-set! vec 0 val)) (define (tdb:step-set-test_id! vec val)(vector-set! vec 1 val)) (define (tdb:step-set-stepname! vec val)(vector-set! vec 2 val)) (define (tdb:step-set-state! vec val)(vector-set! vec 3 val)) (define (tdb:step-set-status! vec val)(vector-set! vec 4 val)) (define (tdb:step-set-event_time! vec val)(vector-set! vec 5 val)) (define (tdb:step-set-logfile! vec val)(vector-set! vec 6 val)) (define (tdb:step-set-comment! vec val)(vector-set! vec 7 val)) ;; The steps table (define (make-db:steps-table)(make-vector 5)) (define (tdb:steps-table-get-stepname vec) (vector-ref vec 0)) (define (tdb:steps-table-get-start vec) (vector-ref vec 1)) (define (tdb:steps-table-get-end vec) (vector-ref vec 2)) (define (tdb:steps-table-get-status vec) (vector-ref vec 3)) (define (tdb:steps-table-get-runtime vec) (vector-ref vec 4)) (define (tdb:steps-table-get-log-file vec) (vector-ref vec 5)) (define (tdb:step-stable-set-stepname! vec val)(vector-set! vec 0 val)) (define (tdb:step-stable-set-start! vec val)(vector-set! vec 1 val)) (define (tdb:step-stable-set-end! vec val)(vector-set! vec 2 val)) (define (tdb:step-stable-set-status! vec val)(vector-set! vec 3 val)) (define (tdb:step-stable-set-runtime! vec val)(vector-set! vec 4 val)) ;;====================================================================== ;; T E S T S P E C I F I C D B ;;====================================================================== ;; Create the sqlite db for the individual test(s) ;; |
︙ | ︙ |