Comment: | wip |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.6584-nanomsg |
Files: | files | file ages | folders |
SHA1: |
e7cab516817e257fa4ba0c4809b38ff7 |
User & Date: | matt on 2021-11-07 20:14:11 |
Other Links: | branch diff | manifest | tags |
2021-11-07
| ||
20:53 | getting bit closer to dashboard compiling for mtver 2.0 check-in: 083868cc40 user: matt tags: v1.6584-nanomsg | |
20:14 | wip check-in: e7cab51681 user: matt tags: v1.6584-nanomsg | |
2021-11-06
| ||
20:35 | wip check-in: 9718466510 user: matt tags: v1.6584-nanomsg | |
Modified Makefile from [577905b51c] to [3a2ebe41ff].
︙ | ︙ | |||
32 33 34 35 36 37 38 | cookie.scm mutils.scm mtargs.scm apimod.scm \ configfmod.scm commonmod.scm dbmod.scm rmtmod.scm \ debugprint.scm mtver.scm csv-xml.scm servermod.scm \ hostinfo.scm adjutant.scm processmod.scm testsmod.scm \ itemsmod.scm keysmod.scm mtmod.scm rmtmod.scm \ tasksmod.scm pgdb.scm launchmod.scm runsmod.scm \ portloggermod.scm archivemod.scm ezstepsmod.scm \ | | < | | | | 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 | cookie.scm mutils.scm mtargs.scm apimod.scm \ configfmod.scm commonmod.scm dbmod.scm rmtmod.scm \ debugprint.scm mtver.scm csv-xml.scm servermod.scm \ hostinfo.scm adjutant.scm processmod.scm testsmod.scm \ itemsmod.scm keysmod.scm mtmod.scm rmtmod.scm \ tasksmod.scm pgdb.scm launchmod.scm runsmod.scm \ portloggermod.scm archivemod.scm ezstepsmod.scm \ subrunmod.scm bigmod.scm testsmod.scm GUISRCF = dashboard-tests.scm vgmod.scm \ dashboard-guimonitor.scm tree.scm GUIMODFILES = dashboard-context-menu.scm dcommon.scm gutils.scm mofiles/dashboard-context-menu.o : mofiles/dcommon.o mofiles/dcommon.o : mofiles/gutils.o OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o)) GMOFILES = $(addprefix mofiles/,$(GUIMODFILES:%.scm=%.o)) # compiled import files MOIMPFILES = $(MSRCFILES:%.scm=%.import.o) %.import.o : %.import.scm csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o |
︙ | ︙ | |||
123 124 125 126 127 128 129 | # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE") # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr) ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi) # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE") PNGFILES = $(shell cd docs/manual;ls *png) | | | | | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE") # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr) ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi) # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE") PNGFILES = $(shell cd docs/manual;ls *png) mtest: megatest.scm $(MOFILES) $(MOIMPFILES) csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.scm -o mtest showmtesthash: @echo $(MTESTHASH) dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) $(GMOFILES) megatest-fossil-hash.scm csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) $(MOIMPFILES) $(GMOFILES) -o dboard mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut # include makefile.inc TCMTOBJS = \ |
︙ | ︙ | |||
417 418 419 420 421 422 423 | if csi -ne '(import mysql-client)';then \ echo "(import mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi if csi -ne '(import postgresql)';then \ echo "(import postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi | | | 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 | if csi -ne '(import mysql-client)';then \ echo "(import mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi if csi -ne '(import postgresql)';then \ echo "(import postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi portlogger-example : portlogger-example.scm api.o archive.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.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 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 keys.o launch.o lock-queue.o margs.o mt.o ods.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 buildmanual: cd docs/manual && make targets: @grep : Makefile | perl -ne '/^([A-Za-z0-9_-]+):/ && print "$$1\n"' |
︙ | ︙ |
Name change from filedb.scm to attic/filedb.scm.
︙ | ︙ |
Name change from monitor.scm to attic/monitor.scm.
︙ | ︙ |
Modified common_records.scm from [9505f2c8b8] to [604a3f05dd].
︙ | ︙ | |||
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/>. ;; ;;====================================================================== ;; (use trace) | | | 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/>. ;; ;;====================================================================== ;; (use trace) ;; (include "altdb.scm") ;; Some of these routines use: ;; ;; http://www.cs.toronto.edu/~gfb/scheme/simple-macros.html ;; ;; Syntax for defining macros in a simple style similar to function definiton, ;; when there is a single pattern for the argument list and there are no keywords. |
︙ | ︙ |
Modified commonmod.scm from [152c0c5af4] to [2a172336a9].
︙ | ︙ | |||
90 91 92 93 94 95 96 | ;; config file utils ;; misc conversion, data manipulation functions ;; testsuite and area utilites ;; ;;====================================================================== (include "megatest-fossil-hash.scm") | > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 378 379 380 381 382 383 384 385 | ;; config file utils ;; misc conversion, data manipulation functions ;; testsuite and area utilites ;; ;;====================================================================== (include "megatest-fossil-hash.scm") ;;====================================================================== ;; Make available the old db_records.scm stuff ;;====================================================================== ;; ;; (include "db_records.scm") ;;====================================================================== ;; dbstruct ;;====================================================================== ;; ;; -path-|-megatest.db ;; |-db-|-main.db ;; |-monitor.db ;; |-sdb.db ;; |-fdb.db ;; |-1.db ;; |-<N>.db ;; ;; ;; Accessors for a dbstruct ;; ;; (define-inline (dbr:dbstruct-main vec) (vector-ref vec 0)) ;; ( db path ) ;; (define-inline (dbr:dbstruct-strdb vec) (vector-ref vec 1)) ;; ( db path ) ;; (define-inline (dbr:dbstruct-path vec) (vector-ref vec 2)) ;; (define-inline (dbr:dbstruct-local vec) (vector-ref vec 3)) ;; (define-inline (dbr:dbstruct-rundb vec) (vector-ref vec 4)) ;; ( db path ) ;; (define-inline (dbr:dbstruct-inmem vec) (vector-ref vec 5)) ;; ( db #f ) ;; (define-inline (dbr:dbstruct-mtime vec) (vector-ref vec 6)) ;; (define-inline (dbr:dbstruct-rtime vec) (vector-ref vec 7)) ;; (define-inline (dbr:dbstruct-stime vec) (vector-ref vec 8)) ;; (define-inline (dbr:dbstruct-inuse vec) (vector-ref vec 9)) ;; (define-inline (dbr:dbstruct-refdb vec) (vector-ref vec 10)) ;; ( db path ) ;; (define-inline (dbr:dbstruct-locdbs vec) (vector-ref vec 11)) ;; (define-inline (dbr:dbstruct-olddb vec) (vector-ref vec 12)) ;; ( db path ) ;; ;; (define-inline (dbr:dbstruct-main-path vec) (vector-ref vec 13)) ;; ;; (define-inline (dbr:dbstruct-rundb-path vec) (vector-ref vec 14)) ;; ;; (define-inline (dbr:dbstruct-run-id vec) (vector-ref vec 13)) ;; ;; (define-inline (dbr:dbstruct-main-set! vec val)(vector-set! vec 0 val)) ;; (define-inline (dbr:dbstruct-strdb-set! vec val)(vector-set! vec 1 val)) ;; (define-inline (dbr:dbstruct-path-set! vec val)(vector-set! vec 2 val)) ;; (define-inline (dbr:dbstruct-local-set! vec val)(vector-set! vec 3 val)) ;; (define-inline (dbr:dbstruct-rundb-set! vec val)(vector-set! vec 4 val)) ;; (define-inline (dbr:dbstruct-inmem-set! vec val)(vector-set! vec 5 val)) ;; (define-inline (dbr:dbstruct-mtime-set! vec val)(vector-set! vec 6 val)) ;; (define-inline (dbr:dbstruct-rtime-set! vec val)(vector-set! vec 7 val)) ;; (define-inline (dbr:dbstruct-stime-set! vec val)(vector-set! vec 8 val)) ;; (define-inline (dbr:dbstruct-inuse-set! vec val)(vector-set! vec 9 val)) ;; (define-inline (dbr:dbstruct-refdb-set! vec val)(vector-set! vec 10 val)) ;; (define-inline (dbr:dbstruct-locdbs-set! vec val)(vector-set! vec 11 val)) ;; (define-inline (dbr:dbstruct-olddb-set! vec val)(vector-set! vec 12 val)) ;; (define-inline (dbr:dbstruct-main-path-set! vec val)(vector-set! vec 13 val)) ;; (define-inline (dbr:dbstruct-rundb-path-set! vec val)(vector-set! vec 14 val)) ;; ; (define-inline (dbr:dbstruct-run-id-set! vec val)(vector-set! vec 13 val)) ;; constructor for dbstruct ;; ;; (define (make-dbr:dbstruct #!key (path #f)(local #f)) ;; (let ((v (make-vector 15 #f))) ;; (dbr:dbstruct-path-set! v path) ;; (dbr:dbstruct-local-set! v local) ;; (dbr:dbstruct-locdbs-set! v (make-hash-table)) ;; v)) (define (make-db:test)(make-vector 20)) (define (db:test-get-id vec) (vector-ref vec 0)) (define (db:test-get-run_id vec) (vector-ref vec 1)) (define (db:test-get-testname vec) (vector-ref vec 2)) (define (db:test-get-state vec) (vector-ref vec 3)) (define (db:test-get-status vec) (vector-ref vec 4)) (define (db:test-get-event_time vec) (vector-ref vec 5)) (define (db:test-get-host vec) (vector-ref vec 6)) (define (db:test-get-cpuload vec) (vector-ref vec 7)) (define (db:test-get-diskfree vec) (vector-ref vec 8)) (define (db:test-get-uname vec) (vector-ref vec 9)) ;; (define (db:test-get-rundir vec) (sdb:qry 'getstr (vector-ref vec 10))) (define (db:test-get-rundir vec) (vector-ref vec 10)) (define (db:test-get-item-path vec) (vector-ref vec 11)) (define (db:test-get-run_duration vec) (vector-ref vec 12)) (define (db:test-get-final_logf vec) (vector-ref vec 13)) (define (db:test-get-comment vec) (vector-ref vec 14)) (define (db:test-get-process_id vec) (vector-ref vec 16)) (define (db:test-get-archived vec) (vector-ref vec 17)) (define (db:test-get-last_update vec) (vector-ref vec 18)) ;; (define (db:test-get-pass_count vec) (vector-ref vec 15)) ;; (define (db:test-get-fail_count vec) (vector-ref vec 16)) (define (db:test-get-fullname vec) (conc (db:test-get-testname vec) "/" (db:test-get-item-path vec))) ;; replace runs:make-full-test-name with this routine (define (db:test-make-full-name testname itempath) (if (equal? itempath "") testname (conc testname "/" itempath))) (define (db:test-get-first_err vec) (conc #;printable (vector-ref vec 15))) (define (db:test-get-first_warn vec) (conc #;printable (vector-ref vec 16))) ;; RADT => reference 16 is repeated (define (db:test-set-cpuload! vec val)(vector-set! vec 7 val)) (define (db:test-set-diskfree! vec val)(vector-set! vec 8 val)) (define (db:test-set-testname! vec val)(vector-set! vec 2 val)) (define (db:test-set-state! vec val)(vector-set! vec 3 val)) (define (db:test-set-status! vec val)(vector-set! vec 4 val)) (define (db:test-set-run_duration! vec val)(vector-set! vec 12 val)) (define (db:test-set-final_logf! vec val)(vector-set! vec 13 val)) ;; Test record utility functions ;; Is a test a toplevel? ;; (define (db:test-get-is-toplevel vec) (and (equal? (db:test-get-item-path vec) "") ;; test is not an item (equal? (db:test-get-uname vec) "n/a"))) ;; test has never been run ;; make-vector-record "" db mintest id run_id testname state status event_time item_path ;; RADT => purpose of mintest?? ;; (define (make-db:mintest)(make-vector 7)) (define (db:mintest-get-id vec) (vector-ref vec 0)) (define (db:mintest-get-run_id vec) (vector-ref vec 1)) (define (db:mintest-get-testname vec) (vector-ref vec 2)) (define (db:mintest-get-state vec) (vector-ref vec 3)) (define (db:mintest-get-status vec) (vector-ref vec 4)) (define (db:mintest-get-event_time vec) (vector-ref vec 5)) (define (db:mintest-get-item_path vec) (vector-ref vec 6)) ;; make-vector-record db testmeta id testname author owner description reviewed iterated avg_runtime avg_disk (define (make-db:testmeta)(make-vector 10 "")) (define (db:testmeta-get-id vec) (vector-ref vec 0)) (define (db:testmeta-get-testname vec) (vector-ref vec 1)) (define (db:testmeta-get-author vec) (vector-ref vec 2)) (define (db:testmeta-get-owner vec) (vector-ref vec 3)) (define (db:testmeta-get-description vec) (vector-ref vec 4)) (define (db:testmeta-get-reviewed vec) (vector-ref vec 5)) (define (db:testmeta-get-iterated vec) (vector-ref vec 6)) (define (db:testmeta-get-avg_runtime vec) (vector-ref vec 7)) (define (db:testmeta-get-avg_disk vec) (vector-ref vec 8)) (define (db:testmeta-get-tags vec) (vector-ref vec 9)) (define (db:testmeta-set-id! vec val)(vector-set! vec 0 val)) (define (db:testmeta-set-testname! vec val)(vector-set! vec 1 val)) (define (db:testmeta-set-author! vec val)(vector-set! vec 2 val)) (define (db:testmeta-set-owner! vec val)(vector-set! vec 3 val)) (define (db:testmeta-set-description! vec val)(vector-set! vec 4 val)) (define (db:testmeta-set-reviewed! vec val)(vector-set! vec 5 val)) (define (db:testmeta-set-iterated! vec val)(vector-set! vec 6 val)) (define (db:testmeta-set-avg_runtime! vec val)(vector-set! vec 7 val)) (define (db:testmeta-set-avg_disk! vec val)(vector-set! vec 8 val)) ;;====================================================================== ;; S I M P L E R U N ;;====================================================================== ;; (defstruct id "runname" "state" "status" "owner" "event_time" ;;====================================================================== ;; T E S T D A T A ;;====================================================================== (define (make-db:test-data)(make-vector 10)) (define (db:test-data-get-id vec) (vector-ref vec 0)) (define (db:test-data-get-test_id vec) (vector-ref vec 1)) (define (db:test-data-get-category vec) (vector-ref vec 2)) (define (db:test-data-get-variable vec) (vector-ref vec 3)) (define (db:test-data-get-value vec) (vector-ref vec 4)) (define (db:test-data-get-expected vec) (vector-ref vec 5)) (define (db:test-data-get-tol vec) (vector-ref vec 6)) (define (db:test-data-get-units vec) (vector-ref vec 7)) (define (db:test-data-get-comment vec) (vector-ref vec 8)) (define (db:test-data-get-status vec) (vector-ref vec 9)) (define (db:test-data-get-type vec) (vector-ref vec 10)) (define (db:test-data-get-last_update vec) (vector-ref vec 11)) (define (db:test-data-set-id! vec val)(vector-set! vec 0 val)) (define (db:test-data-set-test_id! vec val)(vector-set! vec 1 val)) (define (db:test-data-set-category! vec val)(vector-set! vec 2 val)) (define (db:test-data-set-variable! vec val)(vector-set! vec 3 val)) (define (db:test-data-set-value! vec val)(vector-set! vec 4 val)) (define (db:test-data-set-expected! vec val)(vector-set! vec 5 val)) (define (db:test-data-set-tol! vec val)(vector-set! vec 6 val)) (define (db:test-data-set-units! vec val)(vector-set! vec 7 val)) (define (db:test-data-set-comment! vec val)(vector-set! vec 8 val)) (define (db:test-data-set-status! vec val)(vector-set! vec 9 val)) (define (db:test-data-set-type! vec val)(vector-set! vec 10 val)) ;;====================================================================== ;; 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)) ;; The data structure for handing off requests via wire (define (make-cdb:packet)(make-vector 6)) (define (cdb:packet-get-client-sig vec) (vector-ref vec 0)) (define (cdb:packet-get-qtype vec) (vector-ref vec 1)) (define (cdb:packet-get-immediate vec) (vector-ref vec 2)) (define (cdb:packet-get-query-sig vec) (vector-ref vec 3)) (define (cdb:packet-get-params vec) (vector-ref vec 4)) (define (cdb:packet-get-qtime vec) (vector-ref vec 5)) (define (cdb:packet-set-client-sig! vec val)(vector-set! vec 0 val)) (define (cdb:packet-set-qtype! vec val)(vector-set! vec 1 val)) (define (cdb:packet-set-immediate! vec val)(vector-set! vec 2 val)) (define (cdb:packet-set-query-sig! vec val)(vector-set! vec 3 val)) (define (cdb:packet-set-params! vec val)(vector-set! vec 4 val)) (define (cdb:packet-set-qtime! vec val)(vector-set! vec 5 val)) ;;====================================================================== ;; end of old db_records.scm ;; ;;====================================================================== ;; old run_records stuff ;; (define (runs:runrec-make-record) (make-vector 13)) (define (runs:runrec-get-target vec)(vector-ref vec 0)) ;; a/b/c (define (runs:runrec-get-runname vec)(vector-ref vec 1)) ;; string (define (runs:runrec-testpatt vec)(vector-ref vec 2)) ;; a,b/c,d% (define (runs:runrec-keys vec)(vector-ref vec 3)) ;; (key1 key2 ...) (define (runs:runrec-keyvals vec)(vector-ref vec 4)) ;; ((key1 val1)(key2 val2) ...) (define (runs:runrec-environment vec)(vector-ref vec 5)) ;; environment, alist key val (define (runs:runrec-mconfig vec)(vector-ref vec 6)) ;; megatest.config (define (runs:runrec-runconfig vec)(vector-ref vec 7)) ;; runconfigs.config (define (runs:runrec-serverdat vec)(vector-ref vec 8)) ;; (host port) (define (runs:runrec-transport vec)(vector-ref vec 9)) ;; 'http (define (runs:runrec-db vec)(vector-ref vec 10)) ;; <sqlite3db> (if 'fs) (define (runs:runrec-top-path vec)(vector-ref vec 11)) ;; *toppath* (define (runs:runrec-run_id vec)(vector-ref vec 12)) ;; run-id (define (test:get-id vec) (vector-ref vec 0)) (define (test:get-run_id vec) (vector-ref vec 1)) (define (test:get-test-name vec)(vector-ref vec 2)) (define (test:get-state vec) (vector-ref vec 3)) (define (test:get-status vec) (vector-ref vec 4)) (define (test:get-item-path vec)(vector-ref vec 5)) (define (test:test-get-fullname test) (conc (db:test-get-testname test) (if (equal? (db:test-get-item-path test) "") "" (conc "(" (db:test-get-item-path test) ")")))) ;;====================================================================== ;; end of run_records ;; ;; these come from processmod ;; ;; (define setenv set-environment-variable!) ;; (define unsetenv unset-environment-variable!) ;; (define getenv get-environment-variable) |
︙ | ︙ |
Modified dashboard-context-menu.scm from [9a243d4266] to [8caa43c5f0].
︙ | ︙ | |||
69 70 71 72 73 74 75 | debugprint configfmod testsmod dcommon ) ;; (include "common_records.scm") | | | | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | debugprint configfmod testsmod dcommon ) ;; (include "common_records.scm") ;; (include "db_records.scm") ;; (include "run_records.scm") (define (dboard:launch-testpanel run-id test-id) (let* ((dboardexe (common:find-local-megatest "dashboard")) (cmd (conc dboardexe " -test " run-id "," test-id " &"))) (system cmd))) |
︙ | ︙ |
Modified dashboard-guimonitor.scm from [cc16a02e38] to [e2aa5f076a].
︙ | ︙ | |||
35 36 37 38 39 40 41 | (declare (uses commonmod)) (declare (uses keysmod)) (declare (uses dbmod)) (declare (uses tasksmod)) (declare (uses debugprint)) ;; (include "common_records.scm") | | | | | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | (declare (uses commonmod)) (declare (uses keysmod)) (declare (uses dbmod)) (declare (uses tasksmod)) (declare (uses debugprint)) ;; (include "common_records.scm") ;; (include "db_records.scm") ;; (include "run_records.scm") ;; (include "task_records.scm") (import commonmod keysmod dbmod tasksmod debugprint |
︙ | ︙ |
Modified dashboard-tests.scm from [23e63d3822] to [88eb1109dc].
︙ | ︙ | |||
18 19 20 21 22 23 24 | ;;====================================================================== ;;====================================================================== ;; Test info panel ;;====================================================================== | < < < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | > > > > > | > | 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 | ;;====================================================================== ;;====================================================================== ;; Test info panel ;;====================================================================== (declare (unit dashboard-tests)) (declare (uses commonmod)) (declare (uses dbmod)) (declare (uses gutils)) (declare (uses rmtmod)) (declare (uses ezstepsmod)) ;; (declare (uses sdb)) ;; (declare (uses filedb)) (declare (uses subrunmod)) (declare (uses debugprint)) (declare (uses configfmod)) (declare (uses testsmod)) (declare (uses mtmod)) (declare (uses dcommon)) (declare (uses launchmod)) (module dashboard-tests * (import scheme chicken.file.posix chicken.base chicken.string chicken.condition chicken.file chicken.process-context chicken.time format fmt (prefix iup iup:) canvas-draw srfi-1 srfi-18 regex regex-case srfi-69 (prefix sqlite3 sqlite3:)) ;; (include "common_records.scm") ;; (include "db_records.scm") ;; (include "run_records.scm") (import commonmod dcommon dbmod rmtmod ezstepsmod subrunmod debugprint gutils configfmod testsmod mtmod launchmod ) ;;====================================================================== ;; C O M M O N ;;====================================================================== (define *tim* (iup:timer)) (define *dashboard-comment-share-slot* #f) (define (message-window msg) (iup:show (iup:dialog (iup:vbox |
︙ | ︙ | |||
467 468 469 470 471 472 473 | dlog)) ;;====================================================================== ;; ;;====================================================================== (define (dashboard-tests:examine-test run-id test-id) ;; run-id run-key origtest) | | | | 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 | dlog)) ;;====================================================================== ;; ;;====================================================================== (define (dashboard-tests:examine-test run-id test-id) ;; run-id run-key origtest) (let* ((db-path (common:get-db-tmp-area)) ;; (conc (configf:lookup *configdat* "setup" "linktree") "/db/" run-id ".db")) (dbstruct #f) ;; NOT ACTUALLY USED (db:setup)) ;; (make-dbr:dbstruct path: (common:get-db-tmp-area #f) ;; (configf:lookup *configdat* "setup" "linktree") ;; local: #t)) (testdat (rmt:get-test-info-by-id run-id test-id)) ;; (db:get-test-info-by-id dbstruct run-id test-id)) (db-mod-time 0) ;; (file-modification-time db-path)) (last-update 0) ;; (current-seconds)) (request-update #t)) (if (not testdat) (begin |
︙ | ︙ | |||
875 876 877 878 879 880 881 | (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records)) (dcommon:redraw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records)) )) (define (dboard:tabdat-test-patts-use vec) (let ((val (dboard:tabdat-test-patts vec)))(if val val ""))) ;;RADT => What is the if for? | | | | | 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 | (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records)) (dcommon:redraw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records)) )) (define (dboard:tabdat-test-patts-use vec) (let ((val (dboard:tabdat-test-patts vec)))(if val val ""))) ;;RADT => What is the if for? ;; ;; additional setters for dboard:data ;; (define (dboard:tabdat-test-patts-set!-use vec val) ;; (dboard:tabdat-test-patts-set! vec (if (equal? val "") #f val))) ;; Extract the various bits of data from tabdat and create the command line equivalent that will be displayed ;; (define (dashboard:update-run-command tabdat) (let* ((cmd-tb (dboard:tabdat-command-tb tabdat)) (cmd (dboard:tabdat-command tabdat)) (test-patt (let ((tp (dboard:tabdat-test-patts tabdat))) |
︙ | ︙ | |||
941 942 943 944 945 946 947 | (if (equal? selected-item item) (iup:attribute-set! lb "VALUE" i))) ;; (number->string i)))) (set! i (+ i 1))) items) ;; (iup:attribute-set! lb "VALUE" (if selected-item selected-item "")) i)) | < < < < < < < < < < | | 963 964 965 966 967 968 969 970 | (if (equal? selected-item item) (iup:attribute-set! lb "VALUE" i))) ;; (number->string i)))) (set! i (+ i 1))) items) ;; (iup:attribute-set! lb "VALUE" (if selected-item selected-item "")) i)) ) |
Modified dashboard.scm from [0e31bd95fb] to [2fa2ea0b07].
︙ | ︙ | |||
19 20 21 22 23 24 25 | ;;====================================================================== (import format) (declare (uses ducttape-lib)) (declare (uses bigmod)) (declare (uses debugprint)) | < < < < < < < < < < < < < < < < < < > > > > > > > > > > > > > > > > > > | | | | | < | | | | | | | | | | | | | | > | 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 | ;;====================================================================== (import format) (declare (uses ducttape-lib)) (declare (uses bigmod)) (declare (uses debugprint)) (declare (uses commonmod)) (declare (uses configfmod)) (declare (uses dashboard-context-menu)) (declare (uses dashboard-guimonitor)) (declare (uses dashboard-tests)) (declare (uses dbmod)) (declare (uses dcommon)) (declare (uses itemsmod)) (declare (uses launchmod)) (declare (uses mtmod)) (declare (uses mtargs)) (declare (uses mtver)) (declare (uses processmod)) (declare (uses runsmod)) (declare (uses subrunmod)) (declare (uses tree)) (declare (uses vgmod)) (declare (uses bigmod.import)) (declare (uses debugprint.import)) ;; (declare (uses dashboard-main)) (import (prefix iup iup:)) (import canvas-draw) ;; (import canvas-draw-iup) (import ducttape-lib bigmod) (import (prefix sqlite3 sqlite3:) srfi-1 chicken.file.posix chicken.string chicken.process-context regex regex-case srfi-69 typed-records sparse-vectors) ;; (include "common_records.scm") ;; (include "db_records.scm") ;; (include "run_records.scm") ;; (include "task_records.scm") ;; (include "megatest-version.scm") (include "megatest-fossil-hash.scm") ;; (include "vg_records.scm") (import commonmod configfmod dbmod debugprint itemsmod launchmod (prefix mtargs args:) mtmod mtver processmod runsmod subrunmod vgmod dcommon dashboard-context-menu dashboard-tests) (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " license GPL, Copyright (C) Matt Welland 2012-2017 Usage: dashboard [options] |
︙ | ︙ | |||
302 303 304 305 306 307 308 | (debug:print 4 *default-log-port* "Found these updaters: " updaters " for tab-num: " tnum) (for-each ;; perform the function calls for the complete updaters list (lambda (updater) ;; (debug:print 3 *default-log-port* "Running " updater) (updater)) updaters)))) | < < < < < < < < < < < < < < < < < < | | | 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 | (debug:print 4 *default-log-port* "Found these updaters: " updaters " for tab-num: " tnum) (for-each ;; perform the function calls for the complete updaters list (lambda (updater) ;; (debug:print 3 *default-log-port* "Running " updater) (updater)) updaters)))) ;; register tabdat with BBpp ;; this is used by BBpp (Brandon's pretty printer) to convert dboard:tabdat into a composition of lists that pp will handle (hash-table-set! *BBpp_custom_expanders_list* TABDAT: (cons dboard:tabdat? (lambda (tabdat-item) (filter (lambda (alist-entry) (member (car alist-entry) '(allruns-by-id allruns))) ;; FIELDS OF INTEREST (dboard:tabdat->alist tabdat-item))))) (define (dboard:tabdat-target-string vec) (let ((targ (dboard:tabdat-target vec))) (if (list? targ)(string-intersperse targ "/") "no-target-specified"))) (define (dboard:tabdat-make-data) (let ((dat (make-dboard:tabdat))) (dboard:setup-tabdat dat) (dboard:setup-num-rows dat) dat)) (define (dboard:setup-tabdat tabdat) (dboard:tabdat-dbdir-set! tabdat (common:get-db-tmp-area)) ;; (conc (configf:lookup *configdat* "setup" "linktree") "/.db")) (dboard:tabdat-dbfpath-set! tabdat (common:get-db-tmp-area)) (dboard:tabdat-monitor-db-path-set! tabdat (conc (dboard:tabdat-dbdir tabdat) "/monitor.db")) ;; HACK ALERT: this is a hack, please fix. (dboard:tabdat-ro-set! tabdat (not (file-read-access? (dboard:tabdat-dbfpath tabdat)))) (dboard:tabdat-keys-set! tabdat (rmt:get-keys)) (dboard:tabdat-dbkeys-set! tabdat (append (dboard:tabdat-keys tabdat) (list "runname"))) |
︙ | ︙ | |||
507 508 509 510 511 512 513 | (sparse-array-set! (dboard:runsdat-matrix-dat dat) col-num row-num tdat) tdat) #f))) (define *dashboard-mode* (string->symbol (or (configf:lookup *configdat* "dashboard" "mode") "dashboard"))) | < < | 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | (sparse-array-set! (dboard:runsdat-matrix-dat dat) col-num row-num tdat) tdat) #f))) (define *dashboard-mode* (string->symbol (or (configf:lookup *configdat* "dashboard" "mode") "dashboard"))) ;; sorting global data (would apply to many testsuites so leave it global for now) ;; (define *tests-sort-options* (vector (vector "Sort +a" 'testname "ASC") (vector "Sort -a" 'testname "DESC") (vector "Sort +t" 'event_time "ASC") (vector "Sort -t" 'event_time "DESC") (vector "Sort +s" 'statestatus "ASC") |
︙ | ︙ | |||
555 556 557 558 559 560 561 | (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)) (if (get-environment-variable "MT_RUN_AREA_HOME")(change-directory (get-environment-variable "MT_RUN_AREA_HOME"))) | < < < < < < < < < < < < < < < < < < | 535 536 537 538 539 540 541 542 543 544 545 546 547 548 | (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)) (if (get-environment-variable "MT_RUN_AREA_HOME")(change-directory (get-environment-variable "MT_RUN_AREA_HOME"))) (define (pad-list l n)(append l (make-list (- n (length l))))) (define (colors-similar? color1 color2) (let* ((c1 (map string->number (string-split color1))) (c2 (map string->number (string-split color2))) (delta (map (lambda (a b)(abs (- a b))) c1 c2))) (null? (filter (lambda (x)(> x 3)) delta)))) |
︙ | ︙ | |||
1309 1310 1311 1312 1313 1314 1315 | (hash-table-delete! alltgls item) (hash-table-set! alltgls item #t)) (let ((all (hash-table-keys alltgls))) (proc all))) "text-list-toggle-box")))) items)))) | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 | (hash-table-delete! alltgls item) (hash-table-set! alltgls item #t)) (let ((all (hash-table-keys alltgls))) (proc all))) "text-list-toggle-box")))) items)))) ;;====================================================================== ;; R U N C O N T R O L S ;;====================================================================== ;; ;; A gui for launching tests ;; |
︙ | ︙ | |||
2974 2975 2976 2977 2978 2979 2980 | (define (dboard:setup-num-rows tabdat) (dboard:tabdat-num-tests-set! tabdat (string->number (or (args:get-arg "-rows") (get-environment-variable "DASHBOARDROWS") "15")))) | < | 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 | (define (dboard:setup-num-rows tabdat) (dboard:tabdat-num-tests-set! tabdat (string->number (or (args:get-arg "-rows") (get-environment-variable "DASHBOARDROWS") "15")))) (define *ord* #f) (iup:attribute-set! *tim* "TIME" (or (configf:lookup *configdat* "dashboard" "poll-interval") "1000")) (iup:attribute-set! *tim* "RUN" "YES") (define *last-recalc-ended-time* 0) (define (dashboard:recalc modtime please-update-buttons last-db-update-time) |
︙ | ︙ |
Modified db_records.scm from [fefce42cd2] to [1501321c72].
︙ | ︙ | |||
11 12 13 14 15 16 17 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 11 12 13 14 15 16 17 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. |
Modified dcommon.scm from [68d4432f8c] to [f9d2919c2b].
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | ;; ;; 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 dcommon)) (module dcommon * (import scheme chicken.base chicken.condition chicken.string chicken.pretty-print chicken.sort chicken.time chicken.file chicken.file.posix chicken.process chicken.process-context | > > > > > > > > > > | | | > | < < < < < < < < < < < < < < | < | | | | | | > > | > > > > > > > | 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 | ;; ;; 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 dcommon)) (declare (uses gutils)) (declare (uses dbmod)) (declare (uses mtver)) (declare (uses debugprint)) (declare (uses commonmod)) (declare (uses configfmod)) (declare (uses rmtmod)) (declare (uses mtargs)) (declare (uses testsmod)) (module dcommon * (import scheme chicken.base chicken.condition chicken.string chicken.pretty-print chicken.sort chicken.time chicken.file chicken.file.posix chicken.port chicken.process chicken.process-context chicken.process-context.posix) (import srfi-18 format iup (prefix iup iup:) canvas-draw canvas-draw-iup regex typed-records matchable srfi-69 sparse-vectors srfi-1 ) (import mtver dbmod commonmod debugprint configfmod rmtmod gutils (prefix mtargs args:) testsmod) ;; (include "megatest-version.scm") (include "common_records.scm") ;; (include "db_records.scm") ;; (include "key_records.scm") ;; (include "run_records.scm") ;; yes, this is non-ideal (define dashboard:update-summary-tab #f) (define dashboard:update-servers-table #f) (define *last-monitor-update-time* 0) (define *exit-started* #f) ;;====================================================================== ;; C O M M O N D A T A S T R U C T U R E ;;====================================================================== ;; ;; data common to all tabs goes here ;; |
︙ | ︙ | |||
257 258 259 260 261 262 263 264 265 266 267 268 269 270 | (runs-summary-source-runname-label #f) (runs-summary-dest-runname-label #f) ;; runs summary view tests-tree ;; used in newdashboard ) ;;====================================================================== ;; D O T F I L E ;;====================================================================== (define (dcommon:write-dotfile fname dat) (with-output-to-file fname | > > > > > > | 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | (runs-summary-source-runname-label #f) (runs-summary-dest-runname-label #f) ;; runs summary view tests-tree ;; used in newdashboard ) ;; additional setters for dboard:data (define (dboard:tabdat-test-patts-set!-use vec val) (dboard:tabdat-test-patts-set! vec (if (equal? val "") #f val))) (define (dboard:tabdat-test-patts-use vec) (let ((val (dboard:tabdat-test-patts vec)))(if val val ""))) ;;RADT => What is the if for? ;;====================================================================== ;; D O T F I L E ;;====================================================================== (define (dcommon:write-dotfile fname dat) (with-output-to-file fname |
︙ | ︙ | |||
844 845 846 847 848 849 850 851 852 853 854 855 856 857 | (if (not (equal? (iup:attribute stats-matrix key) value)) (begin (set! changed #t) (iup:attribute-set! stats-matrix key value))))) run-stats) (if changed (iup:attribute-set! stats-matrix "REDRAW" "ALL"))))) (define (dcommon:run-stats commondat tabdat #!key (tab-num #f)) (let* ((stats-matrix (iup:matrix expand: "YES")) (stats-updater (lambda () (dcommon:stats-updater commondat tabdat stats-matrix)))) ;; (dboard:commondat-please-update-set! commondat #t) ;; force redraw on first pass ;; (mark-for-update tabdat) | > > > > > > > > > > > > > > > > > > > > > > | 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 | (if (not (equal? (iup:attribute stats-matrix key) value)) (begin (set! changed #t) (iup:attribute-set! stats-matrix key value))))) run-stats) (if changed (iup:attribute-set! stats-matrix "REDRAW" "ALL"))))) ;; if tab-num passed in then use it, otherwise look in commondat at curr-tab-num ;; adds the updater passed in the updaters list at that hashkey ;; (define (dboard:commondat-add-updater commondat updater #!key (tab-num #f)) (let* ((tnum (or tab-num (dboard:commondat-curr-tab-num commondat))) (curr-updaters (hash-table-ref/default (dboard:commondat-updaters commondat) tnum '()))) (hash-table-set! (dboard:commondat-updaters commondat) tnum (cons updater curr-updaters)))) ;; ;; if tab-num passed in then use it, otherwise look in commondat at curr-tab-num ;; ;; adds the updater passed in the updaters list at that hashkey ;; ;; ;; (define (dboard:commondat-add-updater commondat updater #!key (tab-num #f)) ;; (let* ((tnum (or tab-num ;; (dboard:commondat-curr-tab-num commondat))) ;; (curr-updaters (hash-table-ref/default (dboard:commondat-updaters commondat) tnum '()))) ;; (hash-table-set! (dboard:commondat-updaters commondat) ;; tnum ;; (cons updater curr-updaters)))) ;; (define (dcommon:run-stats commondat tabdat #!key (tab-num #f)) (let* ((stats-matrix (iup:matrix expand: "YES")) (stats-updater (lambda () (dcommon:stats-updater commondat tabdat stats-matrix)))) ;; (dboard:commondat-please-update-set! commondat #t) ;; force redraw on first pass ;; (mark-for-update tabdat) |
︙ | ︙ | |||
1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 | tb) (iup:button "Execute" #:size "50x" #:action (lambda (obj) ;; (let ((cmd (conc ;; "xterm -geometry 180x20 -e \"" (common:run-a-command (iup:attribute (dboard:tabdat-command-tb data) "VALUE"))))))) ;; ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &"))) ;; (system cmd))))))) (define (dcommon:command-action-selector commondat tabdat #!key (tab-num #f)) (iup:frame #:title "Set the action to take" (iup:hbox ;; (iup:label "Command to run" #:expand "HORIZONTAL" #:size "70x" #:alignment "LEFT:ACENTER") (let* ((cmds-list '("run" "remove-runs")) ;; "set-state-status" "lock-runs" "unlock-runs")) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 | tb) (iup:button "Execute" #:size "50x" #:action (lambda (obj) ;; (let ((cmd (conc ;; "xterm -geometry 180x20 -e \"" (common:run-a-command (iup:attribute (dboard:tabdat-command-tb data) "VALUE"))))))) ;; ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &"))) ;; (system cmd))))))) ;; Extract the various bits of data from tabdat and create the command line equivalent that will be displayed ;; (define (dashboard:update-run-command tabdat) (let* ((cmd-tb (dboard:tabdat-command-tb tabdat)) (cmd (dboard:tabdat-command tabdat)) (test-patt (let ((tp (dboard:tabdat-test-patts tabdat))) (if (or (not tp) (equal? tp "")) "%" tp))) (states (dboard:tabdat-states tabdat)) (statuses (dboard:tabdat-statuses tabdat)) (target (let ((targ-list (dboard:tabdat-target tabdat))) (if targ-list (string-intersperse targ-list "/") "no-target-selected"))) (run-name (dboard:tabdat-run-name tabdat)) (states-str (if (or (not states) (null? states)) "" (conc " -state " (string-intersperse states ",")))) (statuses-str (if (or (not statuses) (null? statuses)) "" (conc " -status " (string-intersperse statuses ",")))) (full-cmd "megatest")) (case (string->symbol cmd) ((run) (set! full-cmd (conc full-cmd " -run" " -testpatt " test-patt " -target " target " -runname " run-name " -clean-cache" ))) ((remove-runs) (set! full-cmd (conc full-cmd " -remove-runs -runname " run-name " -target " target " -testpatt " test-patt states-str statuses-str ))) (else (set! full-cmd " no valid command "))) (iup:attribute-set! cmd-tb "VALUE" full-cmd))) (define (dcommon:command-action-selector commondat tabdat #!key (tab-num #f)) (iup:frame #:title "Set the action to take" (iup:hbox ;; (iup:label "Command to run" #:expand "HORIZONTAL" #:size "70x" #:alignment "LEFT:ACENTER") (let* ((cmds-list '("run" "remove-runs")) ;; "set-state-status" "lock-runs" "unlock-runs")) |
︙ | ︙ |
Modified gutils.scm from [19987744e3] to [3b20c6cd4b].
︙ | ︙ | |||
38 39 40 41 42 43 44 45 46 47 48 49 50 51 | chicken.file.posix chicken.process chicken.process-context chicken.process-context.posix) (import srfi-1 regex regex-case srfi-69) ;; NOTE: These functions will move to iuputils (define (gutils:colors-similar? color1 color2) (let* ((c1 (map string->number (string-split color1))) (c2 (map string->number (string-split color2))) (delta (map (lambda (a b)(abs (- a b))) c1 c2))) | > > > > > > > > > > > > > > > > > > | 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 | chicken.file.posix chicken.process chicken.process-context chicken.process-context.posix) (import srfi-1 regex regex-case srfi-69) (define (iuplistbox-fill-list lb items #!key (selected-item #f)) (let ((i 1)) (for-each (lambda (item) (iup:attribute-set! lb (number->string i) item) (if selected-item (if (equal? selected-item item) (iup:attribute-set! lb "VALUE" i))) ;; (number->string i)))) (set! i (+ i 1))) items) ;; (iup:attribute-set! lb "VALUE" (if selected-item selected-item "")) i)) (define (message-window msg) (iup:show (iup:dialog (iup:vbox (iup:label msg #:margin "40x40"))))) ;; NOTE: These functions will move to iuputils (define (gutils:colors-similar? color1 color2) (let* ((c1 (map string->number (string-split color1))) (c2 (map string->number (string-split color2))) (delta (map (lambda (a b)(abs (- a b))) c1 c2))) |
︙ | ︙ |
Modified index-tree.scm from [278bba416b] to [d459040d7e].
︙ | ︙ | |||
30 31 32 33 34 35 36 | (declare (uses lock-queue)) (declare (uses dbmod)) (declare (uses commonmod)) (declare (uses itemsmod)) (declare (uses runconfigmod)) ;; (include "common_records.scm") | | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | (declare (uses lock-queue)) (declare (uses dbmod)) (declare (uses commonmod)) (declare (uses itemsmod)) (declare (uses runconfigmod)) ;; (include "common_records.scm") ;; (include "key_records.scm") ;; (include "db_records.scm") ;; (include "run_records.scm") ;; (include "test_records.scm") ;; Populate the links tree with index.html files ;; ;; - start from most recent tests and work towards oldest -OR- ;; start from deepest hierarchy and work way up ;; - look up tests in megatest.db ;; - cross-reference the tests to stats.db |
︙ | ︙ |
Modified run_records.scm from [737eaad866] to [c29e6ca202].
︙ | ︙ | |||
13 14 15 16 17 18 19 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;; ;;====================================================================== | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 13 14 15 16 17 18 19 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;; ;;====================================================================== |