Overview
Comment: | dashboard works and megatest has deps on X removed (not tested). |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.65-try3 |
Files: | files | file ages | folders |
SHA1: |
f7cdc16245d3f850767e0c1e4b4ec954 |
User & Date: | matt on 2019-11-24 22:24:30 |
Other Links: | branch diff | manifest | tags |
Context
2019-11-25
| ||
20:26 | Added an *import.o list - still not there yet. check-in: b433734ae4 user: matt tags: v1.65-try3 | |
2019-11-24
| ||
22:24 | dashboard works and megatest has deps on X removed (not tested). check-in: f7cdc16245 user: matt tags: v1.65-try3 | |
20:51 | Moved dbmod.scm back to MSRCFILES where it belongs. check-in: 830231e662 user: matt tags: v1.65-try3 | |
Changes
Modified Makefile from [96d8167165] to [313792e945].
︙ | ︙ | |||
94 95 96 97 98 99 100 | mtest: readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest showmtesthash: @echo $(MTESTHASH) # removing $(GOFILES) | | | | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | mtest: readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest showmtesthash: @echo $(MTESTHASH) # removing $(GOFILES) dboard : dashboard.o $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) csc $(CSCOPTS) dashboard.o $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard ndboard : newdashboard.scm $(GOFILES) csc $(CSCOPTS) $(GOFILES) newdashboard.scm -o ndboard mtut: $(MOFILES) megatest-fossil-hash.scm mtut.scm csc $(CSCOPTS) $(MOFILES) mtut.scm -o mtut |
︙ | ︙ | |||
208 209 210 211 212 213 214 | mofiles/runsmod.o \ mofiles/servermod.o \ mofiles/subrunmod.o \ mofiles/tasksmod.o \ mofiles/testsmod.o \ *-inc.scm | | | > > > | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 | mofiles/runsmod.o \ mofiles/servermod.o \ mofiles/subrunmod.o \ mofiles/tasksmod.o \ mofiles/testsmod.o \ *-inc.scm mofiles/dcommonmod.o : \ mofiles/vgmod.o \ mofiles/treemod.o \ mofiles/ezstepsmod.o # $(MOFILES) : 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 |
︙ | ︙ | |||
376 377 378 379 380 381 382 | fossil clone https://www.kiatoa.com/fossils/megatest_qa $(MTQA_FOSSIL) clean : rm -f $(OFILES) $(GOFILES) $(MOFILES) $(MOIMPFILES) $(TCMTOBJS) \ $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut \ tcmt *.import.scm readline-fix.scm serialize-env dboard \ dboard.o megatest.o dashboard.o megatest-fossil-hash.* \ | | | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 | fossil clone https://www.kiatoa.com/fossils/megatest_qa $(MTQA_FOSSIL) clean : rm -f $(OFILES) $(GOFILES) $(MOFILES) $(MOIMPFILES) $(TCMTOBJS) \ $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut \ tcmt *.import.scm readline-fix.scm serialize-env dboard \ dboard.o megatest.o dashboard.o megatest-fossil-hash.* \ altdb.scm mofiles/*.o vg.o $(GMOIMPFILES) rm -rf share #====================================================================== # Make the records files #====================================================================== # vg_records.scm : records.sh |
︙ | ︙ |
Modified archive-inc.scm from [c38a444850] to [3375af4b51].
︙ | ︙ | |||
18 19 20 21 22 23 24 | ;; strftime('%m/%d/%Y %H:%M:%S','now','localtime') ;;====================================================================== ;; ;;====================================================================== | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | ;; strftime('%m/%d/%Y %H:%M:%S','now','localtime') ;;====================================================================== ;; ;;====================================================================== ;; NOT CURRENTLY USED - commented out as it has unresolved dependencies ;; #;(define (archive:main linktree target runname testname itempath options) (let ((testdir (conc linktree "/" target "/" runname "/" testname "/" itempatt)) (flavor 'plain) ;; type of machine to run jobs on (maxload 1.5) ;; max allowed load for this work (adisks (archive:get-archive-disks))) ;; get testdir size |
︙ | ︙ |
Modified dashboard.scm from [9d7877c2c7] to [1d934893fb].
cannot compute difference between binary files
Modified dcommonmod.scm from [27b2251e02] to [ed2046f80e].
︙ | ︙ | |||
15 16 17 18 19 20 21 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit dcommonmod)) | | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > | 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 | ;; ;; 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 dcommonmod)) ;; (declare (uses commonmod)) (declare (uses megamod)) (module dcommonmod * (import scheme chicken data-structures extras) (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable (prefix iup iup:) canvas-draw ;; blindly copied from megamod (prefix base64 base64:) (prefix dbi dbi:) (prefix nanomsg nmsg:) (prefix sqlite3 sqlite3:) call-with-environment-variables csv csv-xml data-structures directory-utils dot-locking extras files fmt format hostinfo http-client intarweb irregex matchable md5 message-digest pathname-expand pkts ports posix ;; queue regex regex-case s11n sparse-vectors spiffy spiffy-directory-listing spiffy-request-vars sql-de-lite srfi-1 srfi-4 srfi-13 srfi-18 srfi-69 stack stml2 tcp typed-records udp uri-common z3 ) (use (prefix mtconfigf configf:)) ;; (import commonmod) (import megamod) (import canvas-draw) (import canvas-draw-iup) (use (prefix iup iup:)) (define *tim* (iup:timer)) ;; (use (prefix ulex ulex:)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") (include "task_records.scm") (include "test_records.scm") (include "vg_records.scm") (include "dcommon-inc.scm") (include "dashboard-tests-inc.scm") (include "vg-inc.scm") (include "tree-inc.scm") (include "dashboard-context-menu-inc.scm") (include "ezsteps-inc.scm") |
︙ | ︙ |
Modified megamod.scm from [66dc0599fb] to [8f577b7c68].
︙ | ︙ | |||
51 52 53 54 55 56 57 | (import scheme chicken data-structures extras) (use (prefix base64 base64:) (prefix dbi dbi:) (prefix nanomsg nmsg:) (prefix sqlite3 sqlite3:) call-with-environment-variables | < < | 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 | (import scheme chicken data-structures extras) (use (prefix base64 base64:) (prefix dbi dbi:) (prefix nanomsg nmsg:) (prefix sqlite3 sqlite3:) call-with-environment-variables csv csv-xml data-structures directory-utils dot-locking extras files fmt format hostinfo http-client intarweb irregex matchable md5 message-digest pathname-expand pkts ports posix |
︙ | ︙ | |||
101 102 103 104 105 106 107 | ) (use (prefix mtconfigf configf:)) (define read-config configf:read-config) (define find-and-read-config configf:find-and-read-config) (define config:eval-string-in-environment configf:eval-string-in-environment) | | | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 | ) (use (prefix mtconfigf configf:)) (define read-config configf:read-config) (define find-and-read-config configf:find-and-read-config) (define config:eval-string-in-environment configf:eval-string-in-environment) (import spiffy) ;; (import apimod) ;; (import archivemod) ;; (import clientmod) ;; (import commonmod) ;; (import dbmod) ;; (import dcommonmod) |
︙ | ︙ | |||
134 135 136 137 138 139 140 | (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") (include "task_records.scm") (include "test_records.scm") | | < < | 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 | (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") (include "task_records.scm") (include "test_records.scm") ;; (include "vg_records.scm") ;;====================================================================== ;; L O C K I N G M E C H A N I S M S ;;====================================================================== (include "megatest-fossil-hash.scm") (include "megatest-version.scm") ;; globals (define *writes-total-delay* 0) (define *exit-started* #f) (define *last-monitor-update-time* 0) ;; The watchdog is to keep an eye on things like db sync etc. ;; ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage (define *watchdog* (make-thread (lambda () (handle-exceptions |
︙ | ︙ |
Modified vgmod.scm from [cada4e5927] to [bff69312ab].
︙ | ︙ | |||
15 16 17 18 19 20 21 | ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== (declare (unit vgmod)) | | | | | | > | 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 vgmod)) ;; (declare (uses commonmod)) ;; (import commonmod) (module vgmod * (import scheme chicken data-structures extras) (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable) ;; (import commonmod) ;; (use (prefix ulex ulex:)) ;; (include "common_records.scm") ;; (include "vg_records.scm") ;; (include "vg-inc.scm") ) |