Comment: | Merged wip branch |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.65-real-new-runs-view |
Files: | files | file ages | folders |
SHA1: |
2ba22ca68d05cd46347aff72e45c70f3 |
User & Date: | matt on 2021-02-23 21:25:45 |
Other Links: | branch diff | manifest | tags |
2021-02-24
| ||
03:42 | Added some needed deps. check-in: 23492e7b0f user: matt tags: v1.65-real-new-runs-view | |
2021-02-23
| ||
21:25 | Merged wip branch check-in: 2ba22ca68d user: matt tags: v1.65-real-new-runs-view | |
10:57 | basic new view updates check-in: 5a82492081 user: mrwellan tags: v1.65-real-new-runs-view | |
Modified Makefile from [053fff40fb] to [2e835d8cba].
︙ | ︙ | |||
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 \ |
︙ | ︙ | |||
149 150 151 152 153 154 155 156 157 158 | $(PREFIX)/share/js/jquery-3.1.0.slim.min.js : # .fslckout mkdir -p $(PREFIX)/share/js fossil wiki export java-script-lib > $(PREFIX)/share/js/jquery-3.1.0.slim.min.js $(PREFIX)/share/db/mt-pg.sql : mt-pg.sql mkdir -p $(PREFIX)/share/db $(INSTALL) mt-pg.sql $(PREFIX)/share/db/mt-pg.sql # Special dependencies for the module includes $(MOFILE) $(MOIMPFILES) : megatest-fossil-hash.scm | > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | > | | | | | > | | | | | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 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 236 237 238 239 240 241 242 243 | $(PREFIX)/share/js/jquery-3.1.0.slim.min.js : # .fslckout mkdir -p $(PREFIX)/share/js fossil wiki export java-script-lib > $(PREFIX)/share/js/jquery-3.1.0.slim.min.js $(PREFIX)/share/db/mt-pg.sql : mt-pg.sql mkdir -p $(PREFIX)/share/db $(INSTALL) mt-pg.sql $(PREFIX)/share/db/mt-pg.sql # Include the generated dependency file # include build.inc # Special dependencies for the module includes $(MOFILE) $(MOIMPFILES) : megatest-fossil-hash.scm # we are going to generate this by running make without -j # and only adding the needed deps. The full deps have too many # circular deps and can not (yet) be resolved. mofiles/configfmod.o mofiles/ods.o : mofiles/commonmod.o mofiles/dbmod.o : mofiles/commonmod.o mofiles/ods.o mofiles/configfmod.o dcommon.o : mofiles/dcommonmod.o # megatest.o : $(MOIMPFILES) # mofiles/commonmod.o : megatest-fossil-hash.scm # mofiles/dbmod.o \ # mofiles/servermod.o \ # mofiles/apimod.o \ # mofiles/dcommonmod.o \ # mofiles/ods.o : mofiles/commonmod.o mofiles/configfmod.o # # mofiles/dcommonmod.o : mofiles/configfmod.o mofiles/dbmod.o # mofiles/configfmod.o : mofiles/commonmod.o # # mofiles/dbmod.o : mofiles/configfmod.o # mofiles/rmtmod.o : mofiles/apimod.o # # mofiles/servermod.o : mofiles/dbmod.o # common.o : mofiles/commonmod.o # # # commonmod.o dashboard.o megatest.o tcmt.o apimod.o : megatest-fossil-hash.scm # # 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 # 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 # rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm megatest-version.scm common_records.scm : altdb.scm # mofiles/stml2.o : mofiles/cookie.o # configf.o : mofiles/commonmod.o 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 # mofiles/mutils.o : mutils/mutils.scm # mofiles/cookie.o : stml2/cookie.scm # mofiles/stml2.o : stml2/stml2.scm # Temporary while transitioning to new routine # runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm # for the modularized stuff # mofiles/rmtmod.o : mofiles/commonmod.o megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi $(OFILES) $(GOFILES) : common_records.scm |
︙ | ︙ | |||
473 474 475 476 477 478 479 | 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 | | | | 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | 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 |
︙ | ︙ |
Name change from portlogger-example.scm to attic/portlogger-example.scm.
︙ | ︙ |
Added build.inc version [e62c69cea0].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 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 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 103 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 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 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 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 | # To regenerate this file do: # (cd utils/;ck52 csc gendeps.scm) && ./utils/gendeps allunits *scm # cp allunits.inc build.inc # mofiles/apimod.o : mofiles/commonmod.o api.o : rmt.o api.o : db.o api.o : tasks.o api.o : mofiles/commonmod.o api.o : mofiles/apimod.o api.o : mofiles/dbmod.o archive.o : db.o archive.o : common.o archive.o : mofiles/configfmod.o archive.o : mofiles/commonmod.o archive.o : mofiles/dbmod.o client.o : common.o client.o : db.o client.o : mofiles/commonmod.o client.o : mofiles/dbmod.o client.o : rmt.o 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 mofiles/configfmod.o : mofiles/commonmod.o configf.o : process.o configf.o : env.o configf.o : mofiles/commonmod.o configf.o : mofiles/configfmod.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.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 dashboard.o : dashboard-guimonitor.o dashboard.o : tree.o dashboard.o : dcommon.o dashboard.o : dashboard-context-menu.o dashboard.o : vg.o dashboard.o : subrun.o dashboard.o : mt.o dashboard.o : mofiles/commonmod.o # dashboard.o : commonmod.import.o dashboard.o : mofiles/configfmod.o # 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 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 mofiles/dbmod.o : mofiles/commonmod.o mofiles/dbmod.o : ods.o mofiles/dbmod.o : mofiles/configfmod.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/dcommonmod.o : mofiles/commonmod.o mofiles/dcommonmod.o : mofiles/configfmod.o dcommon.o : gutils.o dcommon.o : db.o dcommon.o : mofiles/commonmod.o dcommon.o : mofiles/dbmod.o dcommon.o : mofiles/configfmod.o dcommon.o : mofiles/dcommonmod.o dcommon.o : mofiles/servermod.o diff-report.o : common.o diff-report.o : rmt.o diff-report.o : mofiles/commonmod.o env.o : mofiles/commonmod.o 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 : 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 launch.o : mofiles/dbmod.o lock-queue.o : common.o lock-queue.o : tasks.o lock-queue.o : mofiles/commonmod.o megatest.o : common.o megatest.o : margs.o megatest.o : runs.o megatest.o : launch.o megatest.o : server.o megatest.o : client.o megatest.o : tests.o megatest.o : genexample.o megatest.o : db.o megatest.o : tdb.o megatest.o : mt.o megatest.o : api.o megatest.o : env.o megatest.o : diff-report.o megatest.o : mofiles/commonmod.o # megatest.o : commonmod.import.o megatest.o : mofiles/configfmod.o # megatest.o : configfmod.import.o megatest.o : ods.o # megatest.o : ods.import.o megatest.o : mofiles/dbmod.o # megatest.o : dbmod.import.o megatest.o : mofiles/servermod.o # megatest.o : servermod.import.o megatest.o : mofiles/apimod.o # megatest.o : apimod.import.o megatest.o : mofiles/rmtmod.o # megatest.o : rmtmod.import.o mlaunch.o : db.o mlaunch.o : common.o monitor.o : db.o monitor.o : common.o monitor.o : items.o monitor.o : runconfig.o mtexec.o : margs.o mtexec.o : configf.o mtexec.o : mofiles/configfmod.o mt.o : db.o mt.o : common.o mt.o : tests.o mt.o : rmt.o mt.o : mofiles/commonmod.o mt.o : mofiles/configfmod.o mt.o : mofiles/dbmod.o mtut.o : common.o mtut.o : margs.o mtut.o : configf.o mtut.o : mofiles/commonmod.o mtut.o : mofiles/configfmod.o newdashboard.o : common.o newdashboard.o : megatest-version.o newdashboard.o : margs.o newdashboard.o : mofiles/commonmod.o newdashboard.o : mofiles/dbmod.o newdashboard.o : dcommon.o newdashboard.o : mofiles/configfmod.o ods.o : mofiles/commonmod.o portlogger.o : db.o portlogger.o : mofiles/commonmod.o portlogger.o : mofiles/configfmod.o portlogger.o : mofiles/dbmod.o process.o : mofiles/commonmod.o mofiles/rmtmod.o : mofiles/commonmod.o mofiles/rmtmod.o : mofiles/apimod.o mofiles/rmtmod.o : mofiles/dbmod.o rmt.o : api.o rmt.o : http-transport.o rmt.o : mofiles/commonmod.o rmt.o : mofiles/apimod.o rmt.o : mofiles/rmtmod.o rmt.o : mofiles/dbmod.o rmt.o : mofiles/configfmod.o rmt.o : mofiles/servermod.o runconfig.o : common.o runconfig.o : mofiles/commonmod.o runs.o : db.o runs.o : common.o runs.o : items.o runs.o : runconfig.o runs.o : tests.o runs.o : server.o runs.o : mt.o runs.o : archive.o runs.o : mofiles/commonmod.o runs.o : mofiles/configfmod.o runs.o : mofiles/dbmod.o runs.o : mofiles/servermod.o mofiles/servermod.o : mofiles/commonmod.o mofiles/servermod.o : mofiles/configfmod.o mofiles/servermod.o : mofiles/dbmod.o server.o : common.o server.o : db.o server.o : http-transport.o server.o : launch.o server.o : mofiles/commonmod.o server.o : mofiles/dbmod.o server.o : mofiles/configfmod.o server.o : mofiles/servermod.o sharedat.o : configf.o sharedat.o : margs.o sharedat.o : megatest-version.o spublish.o : margs.o subrun.o : db.o subrun.o : common.o subrun.o : mt.o subrun.o : mofiles/commonmod.o subrun.o : mofiles/configfmod.o subrun.o : mofiles/dbmod.o synchash.o : db.o synchash.o : server.o synchash.o : mofiles/dbmod.o tasks.o : db.o tasks.o : rmt.o tasks.o : common.o tasks.o : cgisetup/models/pgdb.o tasks.o : mofiles/commonmod.o 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 tests.o : lock-queue.o tests.o : db.o tests.o : tdb.o tests.o : common.o tests.o : items.o tests.o : runconfig.o tests.o : server.o tests.o : mofiles/commonmod.o tests.o : mofiles/dbmod.o tests.o : mofiles/configfmod.o tests.o : mofiles/servermod.o tree.o : margs.o tree.o : launch.o tree.o : gutils.o tree.o : db.o tree.o : server.o tree.o : dcommon.o tree.o : mofiles/commonmod.o tree.o : mofiles/dbmod.o ulex.o : pkts.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 [793e75a79e] to [a8edce5622].
︙ | ︙ | |||
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)) |
︙ | ︙ |
Name change from datashare.scm to datashare/datashare.scm.
︙ | ︙ |
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 fs-transport.scm version [094d0befba].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified http-transport.scm from [1ced6f64e6] to [a9beb0fce8].
︙ | ︙ | |||
26 27 28 29 30 31 32 | (tcp-buffer-size 2048) (max-connections 2048) (declare (unit http-transport)) (declare (uses common)) (declare (uses db)) | < | | | > | 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 | (tcp-buffer-size 2048) (max-connections 2048) (declare (unit http-transport)) (declare (uses common)) (declare (uses db)) (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running. ;; (declare (uses server)) ;; (declare (uses daemon)) (declare (uses portlogger)) (declare (uses rmt)) (declare (uses commonmod)) (import commonmod) (declare (uses configfmod)) (import configfmod) (declare (uses dbmod)) (import dbmod) (declare (uses servermod)) (import servermod) (include "common_records.scm") (include "db_records.scm") ;; (include "js-path.scm") ;; (require-library stml) (define (http-transport:make-server-url hostport) (if (not hostport) #f (conc "http://" (car hostport) ":" (cadr hostport)))) (define *server-loop-heart-beat* (current-seconds)) |
︙ | ︙ | |||
645 646 647 648 649 650 651 | ;; (debug:print 0 *default-log-port* " Done.") ;; (exit 4)) ;; "exit on ^C timer"))) ;; (thread-start! th2) ;; (thread-start! th1) ;; (thread-join! th2)))) | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 645 646 647 648 649 650 651 652 653 | ;; (debug:print 0 *default-log-port* " Done.") ;; (exit 4)) ;; "exit on ^C timer"))) ;; (thread-start! th2) ;; (thread-start! th1) ;; (thread-join! th2)))) |
Deleted keys.scm version [82b1675b29].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified mt.scm from [c12acb87b8] to [d6f6eb81e5].
︙ | ︙ | |||
19 20 21 22 23 24 25 | (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils call-with-environment-variables) (import (prefix sqlite3 sqlite3:)) (declare (unit mt)) (declare (uses db)) (declare (uses common)) | | | | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils call-with-environment-variables) (import (prefix sqlite3 sqlite3:)) (declare (unit mt)) (declare (uses db)) (declare (uses common)) ;; (declare (uses items)) ;; (declare (uses runconfig)) (declare (uses tests)) ;; (declare (uses server)) ;; (declare (uses runs)) (declare (uses rmt)) ;; (declare (uses filedb)) (declare (uses commonmod)) (import commonmod) (declare (uses configfmod)) |
︙ | ︙ |
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 |
︙ | ︙ |
Name change from sample-sauth-paths.scm to sauth/sample-sauth-paths.scm.
︙ | ︙ |
Name change from sauth-common.scm to sauth/sauth-common.scm.
︙ | ︙ |
Name change from sauthorize.scm to sauth/sauthorize.scm.
︙ | ︙ |
Name change from sretrieve.scm to sauth/sretrieve.scm.
︙ | ︙ |
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) ;; |
︙ | ︙ |
Modified tests.scm from [7cdd6fc78c] to [d882a4a65c].
︙ | ︙ | |||
23 24 25 26 27 28 29 | ;;====================================================================== (declare (unit tests)) (declare (uses lock-queue)) (declare (uses db)) (declare (uses tdb)) (declare (uses common)) | < < < | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | ;;====================================================================== (declare (unit tests)) (declare (uses lock-queue)) (declare (uses db)) (declare (uses tdb)) (declare (uses common)) (declare (uses items)) (declare (uses runconfig)) (declare (uses server)) (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils) (import (prefix sqlite3 sqlite3:)) (require-library stml) (declare (uses commonmod)) (import commonmod) |
︙ | ︙ | |||
56 57 58 59 60 61 62 63 64 65 66 67 68 69 | (include "run_records.scm") (include "test_records.scm") (include "js-path.scm") (define (init-java-script-lib) (set! *java-script-lib* (conc (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js")) ) ;; Call this one to do all the work and get a standardized list of tests ;; gets paths from configs and finds valid tests ;; returns hash of testname --> fullpath ;; (define (tests:get-all) (let* ((test-search-path (tests:get-tests-search-path *configdat*))) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 103 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 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 | (include "run_records.scm") (include "test_records.scm") (include "js-path.scm") (define (init-java-script-lib) (set! *java-script-lib* (conc (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js")) ) ;;====================================================================== ;; Stuff from http-transport ;;====================================================================== ;;=============================================== ;; Java script ;;=============================================== (define (http-transport:show-jquery) (let* ((data (tests:readlines *java-script-lib*))) (string-join data "\n"))) ;;====================================================================== ;; web pages ;;====================================================================== (define (http-transport:html-test-log $) (let* ((run-id ($ 'runid)) (test-item ($ 'testname)) (parts (string-split test-item ":")) (test-name (car parts)) (item-name (if (equal? (length parts) 1) "" (cadr parts)))) ;(print $) (tests:get-test-log run-id test-name item-name))) (define (http-transport:html-dboard $) (let* ((page ($ 'page)) (oup (open-output-string)) (bdy "--------------------------") (ret (tests:dynamic-dboard page))) (s:output-new oup ret) (close-output-port oup) (set! bdy (get-output-string oup)) (conc "<h1>Dashboard</h1>" bdy "<br/> <br/> " ))) (define (http-transport:main-page) (let ((linkpath (root-path))) (conc "<head><h1>" (pathname-strip-directory *toppath*) "</h1></head>" "<body>" "Run area: " *toppath* "<h2>Server Stats</h2>" (http-transport:stats-table) "<hr>" (http-transport:runs linkpath) "<hr>" ;; (http-transport:run-stats) "</body>" ))) (define (http-transport:stats-table) (mutex-lock! *heartbeat-mutex*) (let ((res (conc "<table>" ;; "<tr><td>Max cached queries</td> <td>" *max-cache-size* "</td></tr>" "<tr><td>Number of cached writes</td> <td>" *number-of-writes* "</td></tr>" "<tr><td>Average cached write time</td> <td>" (if (eq? *number-of-writes* 0) "n/a (no writes)" (/ *writes-total-delay* *number-of-writes*)) " ms</td></tr>" "<tr><td>Number non-cached queries</td> <td>" *number-non-write-queries* "</td></tr>" ;; "<tr><td>Average non-cached time</td> <td>" (if (eq? *number-non-write-queries* 0) ;; "n/a (no queries)" ;; (/ *total-non-write-delay* ;; *number-non-write-queries*)) " ms</td></tr>" "<tr><td>Last access</td><td>" (seconds->time-string *db-last-access*) "</td></tr>" "</table>"))) (mutex-unlock! *heartbeat-mutex*) res)) (define (http-transport:runs linkpath) (conc "<h3>Runs</h3>" (string-intersperse (let ((files (map pathname-strip-directory (glob (conc linkpath "/*"))))) (map (lambda (p) (conc "<a href=\"" p "\">" p "</a><br>")) files)) " "))) #;(define (http-transport:run-stats) (let ((stats (open-run-close db:get-running-stats #f))) (conc "<table>" (string-intersperse (map (lambda (stat) (conc "<tr><td>" (car stat) "</td><td>" (cadr stat) "</td></tr>")) stats) " ") "</table>"))) ;; Call this one to do all the work and get a standardized list of tests ;; gets paths from configs and finds valid tests ;; returns hash of testname --> fullpath ;; (define (tests:get-all) (let* ((test-search-path (tests:get-tests-search-path *configdat*))) |
︙ | ︙ |
Modified utils/gendeps.scm from [420bfe8c32] to [a6a7866112].
︙ | ︙ | |||
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 | srfi-69 ) (define (portprint p . args) (with-output-to-port p (lambda () (apply print args)))) (define (compunit targfname files) (let* ((unitdata (make-hash-table)) (moduledata (make-hash-table)) (filesdata (make-hash-table)) (unitdec (regexp "^\\(declare\\s+\\(unit\\s+([^\\s]+)\\)\\)")) (unituse (regexp "^\\(declare\\s+\\(uses\\s+([^\\s]+)\\)\\)")) (moduledec (regexp "^\\(module\\s+([\\s]+)")) (importuse (regexp "^\\(import\\s+(.*)\\)")) ;; captures string of imports (one line) (dotport (open-output-file (conc targfname ".dot"))) (incport (open-output-file (conc targfname ".inc"))) ) (portprint dotport "digraph usedeps {") (for-each (lambda (fname) (let* ((sname (string-substitute "\\.scm$" "" fname))) (print "Processing "fname" with core name of "sname) (hash-table-set! filesdata sname fname) ;; record the existance of the src file (with-input-from-file fname (lambda () (let loop ((inl (read-line))) (if (not (eof-object? inl)) (begin (regex-case inl (unitdec (_ unitname) (if (equal? sname unitname) ;; good if same (if (not (hash-table-exists? unitdata unitname)) (hash-table-set! unitdata unitname (make-hash-table))))) (unituse (_ usingname) | > > > > > > > > > > > > | | > > > > > > | 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 79 80 81 82 83 84 | srfi-69 ) (define (portprint p . args) (with-output-to-port p (lambda () (apply print args)))) (define (mofiles-adjust->dot-o inf) (regex-case inf ("^.*mod$" _ (conc "mofiles/"inf".o")) ("pgdb" _ (conc "cgisetup/models/"inf".o")) (else (conc inf".o")))) (define (compunit targfname files) (let* ((unitdata (make-hash-table)) (moduledata (make-hash-table)) (filesdata (make-hash-table)) (unitdec (regexp "^\\(declare\\s+\\(unit\\s+([^\\s]+)\\)\\)")) (unituse (regexp "^\\(declare\\s+\\(uses\\s+([^\\s]+)\\)\\)")) (moduledec (regexp "^\\(module\\s+([\\s]+)")) (importuse (regexp "^\\(import\\s+(.*)\\)")) ;; captures string of imports (one line) (dotport (open-output-file (conc targfname ".dot"))) (incport (open-output-file (conc targfname ".inc"))) ) (portprint dotport "digraph usedeps {") (portprint incport "# To regenerate this file do: # (cd utils/;ck52 csc gendeps.scm) && ./utils/gendeps allunits *scm # cp allunits.inc build.inc # ") (for-each (lambda (fname) (let* ((sname (string-substitute "\\.scm$" "" fname))) (print "Processing "fname" with core name of "sname) (hash-table-set! filesdata sname fname) ;; record the existance of the src file (with-input-from-file fname (lambda () (let loop ((inl (read-line))) (if (not (eof-object? inl)) (begin (regex-case inl (unitdec (_ unitname) (if (equal? sname unitname) ;; good if same (if (not (hash-table-exists? unitdata unitname)) (hash-table-set! unitdata unitname (make-hash-table))))) (unituse (_ usingname) (portprint dotport "\""usingname"\" -> \""sname"\"") (portprint incport (if (or (string-search ".import$" sname) (string-search ".import$" usingname)) "# " "") (mofiles-adjust->dot-o sname)" : " (mofiles-adjust->dot-o usingname))) ;; (moduledec (_ modname) (print "Module: " modname)) ;; (importuse (_ importname) (print "Imports: " importname)) (else #f)) (loop (read-line))))))))) files) (portprint dotport "}") (close-output-port dotport) |
︙ | ︙ |