Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -30,11 +30,11 @@
MSRCFILES = dbmod.scm rmtmod.scm commonmod.scm apimod.scm \
archivemod.scm clientmod.scm envmod.scm ezstepsmod.scm itemsmod.scm \
keysmod.scm launchmod.scm odsmod.scm processmod.scm runconfigmod.scm \
runsmod.scm servermod.scm subrunmod.scm tasksmod.scm testsmod.scm \
pkts.scm mtargs.scm mtconfigf.scm ducttape-lib.scm ulex.scm \
-stml2.scm cookie.scm megamod.scm mutils.scm
+stml2.scm cookie.scm megamod.scm mutils.scm pgdbmod.scm mtmod.scm
GMSRCFILES = dcommonmod.scm vgmod.scm treemod.scm gutilsmod.scm
# Eggs to install (straightforward ones)
@@ -190,11 +190,11 @@
mofiles/mtmod.o : mofiles/mtconfigf.o mofiles/rmtmod.o mofiles/tasksmod.o \
mofiles/dbmod.o mofiles/pgdbmod.o mofiles/launchmod.o \
mofiles/subrunmod.o
mofiles/servermod.o : mofiles/commonmod.o mofiles/dbmod.o
mofiles/testsmod.o : mofiles/servermod.o mofiles/dbmod.o
-// mofiles/launchmod.o : mofiles/subrunmod.o
+mofiles/launchmod.o : mofiles/subrunmod.o mofiles/testsmod.o
# Removed from megamod.o dep: mofiles/ftail.o
mofiles/megamod.o : \
mofiles/rmtmod.o \
mofiles/commonmod.o \
@@ -362,19 +362,23 @@
$(PREFIX)/bin/.$(ARCHSTR)/dboard : dboard $(FILES) utils/mk_wrapper
utils/mk_wrapper $(PREFIX) dboard $(PREFIX)/bin/dashboard
chmod a+x $(PREFIX)/bin/dashboard
$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
-install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \
- $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
+install : minstall dinstall
+
+minstall : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \
+ $(HELPERS) $(PREFIX)/bin/nbfake \
$(PREFIX)/bin/.$(ARCHSTR)/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \
$(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \
$(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \
$(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \
$(PREFIX)/bin/tcmt $(PREFIX)/share/db/mt-pg.sql \
$(PREFIX)/share/js/jquery-3.1.0.slim.min.js
-# $(PREFIX)/bin/.$(ARCHSTR)/ndboard
+
+dinstall : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard
+# $(PREFIX)/bin/.$(ARCHSTR)/ndboard
# $(PREFIX)/bin/newdashboard
$(PREFIX)/bin/.$(ARCHSTR) :
mkdir -p $(PREFIX)/bin/.$(ARCHSTR)
Index: client-inc.scm
==================================================================
--- client-inc.scm
+++ client-inc.scm
@@ -34,11 +34,11 @@
((rpc) (rpc:client-connect iface port))
((http) (http:client-connect iface port))
((zmq) (zmq:client-connect iface port))
(else (rpc:client-connect iface port))))
-(define (client:setup areapath #!key (remaining-tries 100) (failed-connects 0))
+#;(define (client:setup areapath #!key (remaining-tries 100) (failed-connects 0))
(client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects)
#;(case (server:get-transport)
((rpc) (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)) ;;(client:setup-rpc run-id))
((http)(client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects))
(else (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)))) ;; (client:setup-rpc run-id))))
@@ -54,11 +54,11 @@
;; client:setup
;;
;; lookup_server, need to remove *runremote* stuff
;;
-(define (client:setup-http areapath #!key (remaining-tries 100) (failed-connects 0)(area-dat #f))
+#;(define (client:setup-http areapath #!key (remaining-tries 100) (failed-connects 0)(area-dat #f))
(debug:print-info 2 *default-log-port* "client:setup remaining-tries=" remaining-tries)
(server:start-and-wait areapath)
(if (<= remaining-tries 0)
(begin
(debug:print-error 0 *default-log-port* "failed to start or connect to server")
Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -20,28 +20,27 @@
(declare (unit commonmod))
(declare (uses mtargs))
;; (declare (uses stml2))
(declare (uses mtconfigf))
-
+
(module commonmod
*
(import scheme chicken data-structures extras)
-
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18
+
+(use (prefix sqlite3 sqlite3:) posix typed-records srfi-18
srfi-1 files format srfi-13 matchable
srfi-69 ports
+ (prefix base64 base64:)
regex-case regex hostinfo srfi-4
pkts (prefix dbi dbi:)
stack
- md5
+ md5
message-digest
(prefix mtconfigf configf:)
- ;; stml2
- ;; (prefix margs args:)
- z3 (prefix base64 base64:)
+ z3
(prefix mtargs args:)
directory-utils
sparse-vectors)
(include "common_records.scm")
Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -17,18 +17,19 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit dbmod))
+
(declare (uses commonmod))
(declare (uses keysmod))
-(declare (uses tasksmod))
-(declare (uses odsmod))
-;; (declare (uses testsmod))
(declare (uses mtargs))
(declare (uses mtconfigf))
+(declare (uses odsmod))
+(declare (uses tasksmod))
;; (declare (uses servermod))
+;; (declare (uses testsmod))
(module dbmod
*
(import scheme chicken data-structures extras)
Index: megamod.scm
==================================================================
--- megamod.scm
+++ megamod.scm
@@ -17,38 +17,42 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit megamod))
-(declare (uses commonmod))
-;; (declare (uses dbmod))
+
+(declare (uses stml2))
+(declare (uses mtargs))
+
(declare (uses apimod))
-;; (declare (uses ftail))
+(declare (uses commonmod))
+(declare (uses dbmod))
+(declare (uses ducttape-lib))
+(declare (uses itemsmod))
+(declare (uses mtconfigf))
+(declare (uses odsmod))
+(declare (uses pgdbmod))
+(declare (uses pkts))
(declare (uses rmtmod))
+(declare (uses runsmod))
+(declare (uses servermod))
+(declare (uses tasksmod))
+(declare (uses testsmod))
+(declare (uses subrunmod))
+(declare (uses itemsmod))
;; (declare (uses archivemod))
;; (declare (uses clientmod))
-;; (declare (uses dbmod))
;; (declare (uses dcommonmod))
;; (declare (uses envmod))
;; (declare (uses ezstepsmod))
-(declare (uses itemsmod))
+;; (declare (uses ftail))
;; (declare (uses keysmod))
;; (declare (uses launchmod))
-;; (declare (uses odsmod))
;; (declare (uses processmod))
;; (declare (uses runconfigmod))
-(declare (uses runsmod))
-;; (declare (uses servermod))
;; (declare (uses subrunmod))
-;; (declare (uses tasksmod))
-(declare (uses testsmod))
;; (declare (uses vgmod))
-(declare (uses pkts))
-(declare (uses mtargs))
-(declare (uses mtconfigf))
-(declare (uses ducttape-lib))
-(declare (uses stml2))
(module megamod
*
(import scheme chicken data-structures extras)
@@ -104,37 +108,41 @@
(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 stml2)
+(import (prefix mtargs args:))
(import apimod)
+(import commonmod)
+(import dbmod)
+(import ducttape-lib)
+(import itemsmod)
+(import pkts)
+(import pgdbmod)
+(import rmtmod)
+(import runsmod)
+(import servermod)
+(import tasksmod)
+(import testsmod)
+(import subrunmod)
+(import itemsmod)
;; (import archivemod)
;; (import clientmod)
-(import commonmod)
-;; (import dbmod)
;; (import dcommonmod)
;; (import envmod)
;; (import ezstepsmod)
;; (import ftail)
-(import itemsmod)
;; (import keysmod)
;; (import launchmod)
;; (import odsmod)
;; (import processmod)
-(import rmtmod)
;; (import runconfigmod)
-(import runsmod)
-;; (import servermod)
;; (import subrunmod)
-;; (import tasksmod)
-(import testsmod)
;; (import vgmod)
-(import pkts)
-(import (prefix mtargs args:))
-(import ducttape-lib)
;; (use (prefix ulex ulex:))
(include "common_records.scm")
(include "db_records.scm")
@@ -166,35 +174,35 @@
(print-call-chain)
(print " message: " ((condition-property-accessor 'exn 'message) exn)))
(common:watchdog)))
"Watchdog thread"))
-;; (include "api-inc.scm") ;; L3
(include "archive-inc.scm")
(include "client-inc.scm")
-(include "common-inc.scm") ;; L5
-(include "db-inc.scm") ;; L4
(include "env-inc.scm")
+(include "portlogger-inc.scm")
+(include "process-inc.scm") ;; L6
+(include "runconfig-inc.scm")
+;; (include "api-inc.scm") ;; L3
+;; (include "common-inc.scm") ;; L5
+;; (include "db-inc.scm") ;; L4
;; (include "http-transport-inc.scm")
;; (include "items-inc.scm")
;; (include "keys-inc.scm")
-(include "launch-inc.scm") ;; L1
+;; (include "launch-inc.scm") ;; L1
;; (include "margs-inc.scm")
-(include "mt-inc.scm")
-(include "ods-inc.scm") ;; L1
-(include "pgdb-inc.scm")
-(include "portlogger-inc.scm")
-(include "process-inc.scm") ;; L6
+;; (include "mt-inc.scm")
+;; (include "ods-inc.scm") ;; L1
+;; (include "pgdb-inc.scm")
;; (include "rmt-inc.scm") ;; L2
-(include "runconfig-inc.scm")
-(include "runs-inc.scm") ;; L1.5
-(include "server-inc.scm")
-(include "subrun-inc.scm")
-(include "tasks-inc.scm")
+;; (include "runs-inc.scm") ;; L1.5
+;; (include "server-inc.scm")
+;; (include "subrun-inc.scm")
+;; (include "tasks-inc.scm")
;; (include "tdb-inc.scm")
-(include "tests-inc.scm")
+;; (include "tests-inc.scm")
;; (include "js-path.scm") ;; moved into init procedure in tests-inc.scm
)
;; http-transport:server-dat definition moved to common_records.scm
;; bunch of small functions factored out of send-receive to make debug easier
Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -29,56 +29,67 @@
;; Added for csv stuff - will be removed
;;
(use sparse-vectors)
(declare (uses mtargs))
-(import (prefix mtargs args:))
(declare (uses mtconfigf))
+
+(import (prefix mtargs args:))
(import (prefix mtconfigf configf:))
-(declare (uses ducttape-lib))
-(import ducttape-lib)
-(declare (uses pkts))
-(import pkts)
-(declare (uses ulex))
-(import ulex)
+
+(declare (uses apimod))
+(declare (uses commonmod))
(declare (uses cookie))
-(import cookie)
-(declare (uses stml2))
-(import stml2)
+(declare (uses dbmod))
+(declare (uses ducttape-lib))
+(declare (uses megamod))
(declare (uses mutils))
+(declare (uses pgdbmod))
+(declare (uses pkts))
+(declare (uses rmtmod))
+(declare (uses runsmod))
+(declare (uses stml2))
+(declare (uses tasksmod))
+(declare (uses testsmod))
+(declare (uses ulex))
+
+(import apimod)
+(import commonmod)
+(import cookie)
+(import dbmod)
+(import ducttape-lib)
+(import megamod)
(import mutils)
+(import pgdbmod)
+(import pkts)
+(import rmtmod)
+(import runsmod)
+(import stml2)
+(import testsmod)
+(import ulex)
+
+;; invoke the imports
+(declare (uses apimod.import))
+(declare (uses commonmod.import))
+(declare (uses cookie.import))
+(declare (uses dbmod))
+(declare (uses ducttape-lib.import))
+(declare (uses megamod.import))
+(declare (uses mutils.import))
+(declare (uses pkts.import))
+(declare (uses pgdbmod.import))
+(declare (uses rmtmod.import))
+(declare (uses runsmod.import))
+(declare (uses stml2.import))
+(declare (uses tasksmod.import))
+(declare (uses testsmod.import))
+(declare (uses ulex.import))
;; invoke the imports
(declare (uses mtargs.import))
(declare (uses mtconfigf.import))
-(declare (uses ducttape-lib.import))
-(declare (uses pkts.import))
-(declare (uses ulex.import))
-(declare (uses cookie.import))
-(declare (uses stml2.import))
-(declare (uses mutils.import))
-
-(declare (uses commonmod))
-(import commonmod)
-
-(declare (uses rmtmod))
-(import rmtmod)
-(declare (uses dbmod))
-(import dbmod)
-(declare (uses runsmod))
-(import runsmod)
-(declare (uses testsmod))
-(import testsmod)
-(declare (uses megamod))
-(import megamod)
-
-;; invoke the imports
-(declare (uses commonmod.import))
-(declare (uses testsmod.import))
-(declare (uses rmtmod.import))
-(declare (uses runsmod.import))
-(declare (uses megamod.import))
+
(configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)
(define *db* #f) ;; this is only for the repl, do not use in general!!!!
(define *default-log-port* (current-error-port))
Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -17,28 +17,29 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit rmtmod))
-(declare (uses ulex))
-(declare (uses itemsmod))
+
+(declare (uses apimod))
(declare (uses commonmod))
-(declare (uses apimod))
(declare (uses dbmod))
+(declare (uses itemsmod))
+(declare (uses ulex))
(module rmtmod
*
(import scheme chicken data-structures extras)
(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable)
(import (prefix ulex ulex:))
-(import
- commonmod
- itemsmod
- apimod
- dbmod)
+
+(import commonmod)
+(import itemsmod)
+(import apimod)
+(import dbmod)
;; (include "rmt-inc.scm")
;;
;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
Index: runsmod.scm
==================================================================
--- runsmod.scm
+++ runsmod.scm
@@ -18,12 +18,10 @@
;;======================================================================
(declare (unit runsmod))
-
-(declare (unit mtmod))
(declare (uses commonmod))
(declare (uses dbmod))
(declare (uses launchmod))
(declare (uses mtargs))
(declare (uses mtconfigf))
@@ -40,46 +38,44 @@
(module runsmod
*
(import scheme chicken data-structures extras ports files)
-(import
- (prefix base64 base64:)
- (prefix mtargs args:)
- (prefix mtconfigf configf:)
- (prefix sqlite3 sqlite3:)
- call-with-environment-variables
- commonmod
- csv
- dbmod
- directory-utils
- format
- itemsmod
- matchable
- message-digest
- md5
- mtmod
- pgdbmod
- ports
- posix
- regex
- rmtmod
- servermod
- srfi-1
- srfi-1
- srfi-13
- srfi-18
- srfi-18
- srfi-69
- srfi-69
- stml2
- subrunmod
- tasksmod
- testsmod
- typed-records
- z3
- )
+(use (prefix base64 base64:)
+ (prefix sqlite3 sqlite3:)
+ call-with-environment-variables
+ csv
+ directory-utils
+ format
+ matchable
+ message-digest
+ md5
+ ports
+ posix
+ regex
+ srfi-1
+ srfi-1
+ srfi-13
+ srfi-18
+ srfi-18
+ srfi-69
+ typed-records
+ z3)
+
+(import commonmod)
+(import dbmod)
+(import itemsmod)
+(import mtmod)
+(import pgdbmod)
+(import (prefix mtargs args:))
+(import (prefix mtconfigf configf:))
+(import rmtmod)
+(import servermod)
+(import stml2)
+(import subrunmod)
+(import tasksmod)
+(import testsmod)
;; (use (prefix ulex ulex:))
(include "run_records.scm")
(include "db_records.scm")
(include "test_records.scm")
Index: tasksmod.scm
==================================================================
--- tasksmod.scm
+++ tasksmod.scm
@@ -17,25 +17,25 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit tasksmod))
+
(declare (uses commonmod))
(declare (uses pgdbmod))
(declare (uses mtconfigf))
(module tasksmod
*
(import scheme chicken data-structures extras)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable
+(use (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable
regex)
-(import commonmod
- (prefix mtconfigf configf:)
- pgdbmod
- )
-;; (use (prefix ulex ulex:))
+
+(import commonmod)
+(import (prefix mtconfigf configf:))
+(import pgdbmod)
(include "common_records.scm")
(include "task_records.scm")
;; (include "tasks-inc.scm")
Index: testsmod.scm
==================================================================
--- testsmod.scm
+++ testsmod.scm
@@ -17,10 +17,11 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit testsmod))
+
(declare (uses commonmod))
(declare (uses mtargs))
(declare (uses servermod))
(declare (uses mtconfigf))
(declare (uses itemsmod))
@@ -29,20 +30,22 @@
(module testsmod
*
(import scheme chicken data-structures extras files)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69
+(use (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69
format ports srfi-1 matchable
directory-utils
- regex srfi-13
- commonmod
- servermod
- itemsmod
- dbmod
- (prefix mtconfigf configf:)
- (prefix mtargs args:))
+ regex srfi-13)
+
+
+(import commonmod)
+(import servermod)
+(import itemsmod)
+(import dbmod)
+(import (prefix mtconfigf configf:))
+(import (prefix mtargs args:))
(include "run_records.scm")
(include "test_records.scm")
(include "db_records.scm")