Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -206,21 +206,21 @@ db.o ezsteps.o keys.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 megatest.o : megatest-fossil-hash.scm rmt.scm client.scm common.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 $(MTEGGS) -common_records.scm : altdb.scm +common_records.scm : altdb.scm modules.scm vg.o dashboard.o : vg_records.scm dcommon.o : run_records.scm # Temporary while transitioning to new routine # runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm 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 +$(OFILES) $(GOFILES) : common_records.scm modules.scm # TODO: make modules.scm changes trigger rebuild. modules.scm in following recipe does not work. %.o : %.scm modules.scm csc $(CSCOPTS) -c $< @@ -402,30 +402,30 @@ csc -deploy $(OFILES) $(GOFILES) dashboard.scm -o deploytarg mv deploytarg/deploytarg deploytarg/dboard # DATASHAREO=common.o process.o tree.o dcommon.o margs.o launch.o gutils.o db.o synchash.o server.o \ # megatest-version.o tdb.o ods.o mt.o keys.o -datashare-testing/sd : datashare.scm $(OFILES) +datashare-testing/sd : datashare.scm $(OFILES) modules.scm csc $(CSCOPTS) datashare.scm $(OFILES) -o datashare-testing/sd -datashare-testing/sdat: sharedat.scm $(OFILES) +datashare-testing/sdat: sharedat.scm $(OFILES) modules.scm csc $(CSCOPTS) sharedat.scm $(OFILES) -o datashare-testing/sdat sd : datashare-testing/sd mkdir -p /tmp/$(USER)/datashare/disk1 /tmp/$(USER)/basepath xterm : sd (export BASEPATH=/tmp/$(USER)/basepath ; export PATH="$(PWD)/datashare-testing:$(PATH)" ; xterm &) -datashare-testing/spublish : spublish.scm $(OFILES) +datashare-testing/spublish : spublish.scm $(OFILES) modules.scm csc $(CSCOPTS) spublish.scm megatest-version.o margs.o process.o common.o -o datashare-testing/spublish -datashare-testing/sretrieve : sretrieve.scm $(OFILES) +datashare-testing/sretrieve : sretrieve.scm $(OFILES) modules.scm csc $(CSCOPTS) sretrieve.scm megatest-version.o margs.o process.o common.o -o datashare-testing/sretrieve -datashare-testing/sauthorize : sauthorize.scm $(OFILES) +datashare-testing/sauthorize : sauthorize.scm $(OFILES) modules.scm csc $(CSCOPTS) sauthorize.scm megatest-version.o margs.o process.o common.o -o datashare-testing/sauthorize sauth-init: mkdir -p datashare-testing rm datashare-testing/sauthorize Index: common.scm ================================================================== --- common.scm +++ common.scm @@ -24,11 +24,11 @@ matchable regex posix (srfi 18) extras ;; tcp (prefix nanomsg nmsg:) (prefix sqlite3 sqlite3:) pkts (prefix dbi dbi:) ) - +(declare (uses process)) (declare (unit common)) (use posix-extras pathname-expand files) ;; this plugs a hole in posix-extras in recent chicken versions > 4.9) @@ -169,11 +169,11 @@ (define *test-meta-updated* (make-hash-table)) (define *globalexitstatus* 0) ;; attempt to work around possible thread issues (define *passnum* 0) ;; when running track calls to run-tests or similar ;; (define *alt-log-file* #f) ;; used by -log (define *common:denoise* (make-hash-table)) ;; for low noise printing -(define *default-log-port* (current-error-port)) +;;(define *default-log-port* (current-error-port)) moved to modules.scm (define *time-zero* (current-seconds)) ;; for the watchdog (define *default-area-tag* "local") ;; DATABASE (define *dbstruct-db* #f) ;; used to cache the dbstruct in db:setup. Goal is to remove this. Index: modules.scm ================================================================== --- modules.scm +++ modules.scm @@ -25,18 +25,23 @@ (if (args:get-arg "-v") (debug:set-verbose-mode)) (if (args:get-arg "-q") (debug:set-quiet-mode)) (if (args:get-arg "-debug") (debug:set-debug-mode)) (if (args:get-arg "-color") (case (string->symbol (args:get-arg "-color")) - ((y Y yes YES t T) (debug:force-color)) - ((n N no NO f F) (debug:suppress-color)))) + ((y Y yes YES t T) (debug:force-color)) + ((n N no NO f F) (debug:suppress-color)))) ;; configure mtconfigf +(define *default-log-port* (current-error-port)) (let* ((normal-fn debug:print) (info-fn debug:print-info) (error-fn debug:print-error) (default-port *default-log-port*)) - (set-debug-printers normal-fn info-fn error-fn default-port)) + (configf:set-debug-printers normal-fn info-fn error-fn default-port)) -(configf:add-eval-string "(use (prefix mtargs args:)) - (use mtdebug) - (use (prefix mtconfigf configf:))") +(define *add-eval-string-check* #f) +(cond + ((not *add-eval-string-check*) + (configf:add-eval-string "(import (prefix mtargs args:)) + (import mtdebug) + (import (prefix mtconfigf configf:))") + (set! *add-eval-string-check* #t)))