@@ -36,15 +36,17 @@
 (declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
 (declare (uses daemon))
 (declare (uses db))
+;; (declare (uses dcommon))
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
+(declare (uses env))
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
@@ -75,16 +77,18 @@
                             Optionally use :state and :status
   -set-state-status X,Y   : set state to X and status to Y, requires controls per -remove-runs
   -rerun FAIL,WARN...     : force re-run for tests with specificed status(s)
   -rerun-clean            : set all tests not COMPLETED+PASS,WARN,WAIVED to NOT_STARTED,n/a
                             and then run the specified testpatt with -preclean
+  -rerun-all              : set all tests to NOT_STARTED,n/a and run with -preclean
   -lock                   : lock run specified by target and runname
   -unlock                 : unlock run specified by target and runname
   -set-run-status status  : sets status for run to status, requires -target and -runname
   -get-run-status         : gets status for run specified by target and runname
   -run-wait               : wait on run specified by target and runname
   -preclean               : remove the existing test directory before running the test
+  -clean-cache            : remove the cached megatest.config and runconfig.config files
 
 Selectors (e.g. use for -runtests, -remove-runs, -set-state-status, -list-runs etc.)
   -target key1/key2/...   : run for key1, key2, etc.
   -reqtarg key1/key2/...  : run for key1, key2, etc. but key1/key2 must be in runconfig
   -testpatt patt1/patt2,patt3/...  : % is wildcard
@@ -156,10 +160,11 @@
   -ping run-id|host:port  : ping server, exit with 0 if found
   -debug N|N,M,O...       : enable debug 0-N or N and M and O ...
 
 Utilities
   -env2file fname         : write the environment to fname.csh and fname.sh
+  -envcap fname=context   : save current variables labeled as context in file fname
   -refdb2dat refdb        : convert refdb to sexp or to format specified by -dumpmode
                             formats: perl, ruby, sqlite3, csv (for csv the -o param
                             will substitute %s for the sheet name in generating 
                             multiple sheets)
   -o                      : output file for refdb2dat (defaults to stdout)
@@ -230,10 +235,12 @@
 			"-kill-server"
 			"-port"
 			"-extract-ods"
 			"-pathmod"
 			"-env2file"
+			"-envcap"
+			"-envdelta"
 			"-setvars"
 			"-set-state-status"
 			"-set-run-status"
 			"-debug" ;; for *verbosity* > 2
 			"-gen-megatest-test"
@@ -266,10 +273,12 @@
 			"-summarize-items"
 		        "-gui"
 			"-daemonize"
 			"-preclean"
 			"-rerun-clean"
+			"-rerun-all"
+			"-clean-cache"
 
 			;; misc
 			"-repl"
 			"-lock"
 			"-unlock"
@@ -309,16 +318,20 @@
 			"-q" ;; quiet 0, errors/warnings only
 		       )
 		 args:arg-hash
 		 0))
 
+;; Add args that use remargs here
+;;
 (if (and (not (null? remargs))
 	 (not (or
-	       (args:get-arg "-runstep"))
-	      ;; add more args that use remargs here
+	       (args:get-arg "-runstep")
+	       (args:get-arg "-envcap")
+	       (args:get-arg "-envdelta")
+	       )
 	      ))
-    (debug:print 0 "ERROR: Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
+    (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
 
 ;; immediately set MT_TARGET if -reqtarg or -target are available
 ;;
 (let ((targ (or (args:get-arg "-reqtarg")(args:get-arg "-target"))))
   (if targ (setenv "MT_TARGET" targ)))
@@ -346,25 +359,25 @@
 			   (hash-table-ref/default *db-local-sync* run-id #f))
 		      ;; (if (> (- start-time last-write) 5) ;; every five seconds
 		      (begin ;; let ((sync-time (- (current-seconds) start-time)))
 			(db:multi-db-sync (list run-id) 'new2old)
 			(let ((sync-time (- (current-seconds) start-time)))
-			  (debug:print-info 3 "Sync of newdb to olddb for run-id " run-id " completed in " sync-time " seconds")
+			  (debug:print-info 3 *default-log-port* "Sync of newdb to olddb for run-id " run-id " completed in " sync-time " seconds")
 			  (if (common:low-noise-print 30 "sync new to old")
-			      (debug:print-info 0 "Sync of newdb to olddb for run-id " run-id " completed in " sync-time " seconds")))
+			      (debug:print-info 0 *default-log-port* "Sync of newdb to olddb for run-id " run-id " completed in " sync-time " seconds")))
 			;; (if (> sync-time 10) ;; took more than ten seconds, start a server for this run
 			;;     (begin
-			;;       (debug:print-info 0 "Sync is taking a long time, start up a server to assist for run " run-id)
+			;;       (debug:print-info 0 *default-log-port* "Sync is taking a long time, start up a server to assist for run " run-id)
 			;;       (server:kind-run run-id)))))
 			(hash-table-delete! *db-local-sync* run-id)))
 		  (mutex-unlock! *db-multi-sync-mutex*))
 		(hash-table-keys *db-local-sync*))
 	       (if (and debug-mode
 			(> (- start-time last-time) 60))
 		   (begin
 		     (set! last-time start-time)
-		     (debug:print-info 4 "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*))))))
+		     (debug:print-info 4 *default-log-port* "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*))))))
 	     
 	     ;; keep going unless time to exit
 	     ;;
 	     (if (not *time-to-exit*)
 		 (let delay-loop ((count 0))
@@ -373,20 +386,20 @@
 		       (begin
 			 (thread-sleep! 1)
 			 (delay-loop (+ count 1))))
 		   (loop)))
 	     (if (common:low-noise-print 30)
-		 (debug:print-info 0 "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*)))))
+		 (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*)))))
      "Watchdog thread")))
 
 (thread-start! *watchdog*)
+
 
 (if (args:get-arg "-log")
     (let ((oup (open-output-file (args:get-arg "-log"))))
-      (debug:print-info 0 "Sending log output to " (args:get-arg "-log"))
-      (current-error-port oup)
-      (current-output-port oup)))
+      (debug:print-info 0 *default-log-port* "Sending log output to " (args:get-arg "-log"))
+      (set! *default-log-port* oup)))
 
 (if (or (args:get-arg "-h")
 	(args:get-arg "-help")
 	(args:get-arg "--help"))
     (begin
@@ -395,16 +408,16 @@
 
 (if (args:get-arg "-start-dir")
     (if (file-exists? (args:get-arg "-start-dir"))
 	(change-directory (args:get-arg "-start-dir"))
 	(begin
-	  (debug:print 0 "ERROR: non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.")
+	  (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.")
 	  (exit 1))))
 
 (if (args:get-arg "-version")
     (begin
-      (print megatest-version)
+      (print (common:version-signature)) ;; (print megatest-version)
       (exit)))
 
 (define *didsomething* #f)
 
 ;; Overall exit handling setup immediately
@@ -442,29 +455,59 @@
 (if (debug:debug-mode 3) ;; we are obviously debugging
     (set! open-run-close open-run-close-no-exception-handling))
 
 (if (args:get-arg "-itempatt")
     (let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt"))))
-      (debug:print 0 "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval)
+      (debug:print 0 *default-log-port* "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval)
       (hash-table-set! args:arg-hash "-testpatt" newval)
       (hash-table-delete! args:arg-hash "-itempatt")))
 
-
+(if (args:get-arg "-runtests")
+    (debug:print 0 *default-log-port* "WARNING: \"-runtests\" is deprecated. Use \"-run\" with \"-testpatt\" instead"))
 
 (on-exit std-exit-procedure)
 
 ;;======================================================================
 ;; Misc general calls
 ;;======================================================================
 
+;; handle a clean-cache request as early as possible
+;;
+(if (args:get-arg "-clean-cache")
+    (begin
+      (set! *didsomething* #t) ;; suppress the help output.
+      (if (getenv "MT_TARGET") ;; no point in trying if no target
+	  (if (args:get-arg "-runname")
+	      (let* ((toppath  (launch:setup))
+		     (linktree (if toppath (configf:lookup *configdat* "setup" "linktree")))
+		     (runtop   (conc linktree "/" (getenv "MT_TARGET") "/" (args:get-arg "-runname")))
+		     (files    (if (file-exists? runtop)
+				   (append (glob (conc runtop "/.megatest*"))
+					   (glob (conc runtop "/.runconfig*")))
+				   '())))
+		(if (null? files)
+		    (debug:print-info 0 *default-log-port* "No cached megatest or runconfigs files found. None removed.")
+		    (begin
+		      (debug:print-info 0 *default-log-port* "Removing cached files:\n    " (string-intersperse files "\n    "))
+		      (for-each 
+		       (lambda (f)
+			 (handle-exceptions
+			     exn
+			     (debug:print 0 *default-log-port* "WARNING: Failed to remove file " f)
+			   (delete-file f)))
+		       files))))
+	      (debug:print-error 0 *default-log-port* "-clean-cache requires -runname."))
+	  (debug:print-error 0 *default-log-port* "-clean-cache requires -target or -reqtarg"))))
+	    
+	  
 (if (args:get-arg "-env2file")
     (begin
       (save-environment-as-files (args:get-arg "-env2file"))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-list-disks")
-    (let ((toppath (launch:setup-for-run)))
+    (let ((toppath (launch:setup)))
       (print 
        (string-intersperse 
 	(map (lambda (x)
 	       (string-intersperse 
 		x
@@ -471,33 +514,10 @@
 		" => "))
 	     (common:get-disks *configdat*))
 	"\n"))
       (set! *didsomething* #t)))
 
-(define (make-sparse-array)
-  (let ((a (make-sparse-vector)))
-    (sparse-vector-set! a 0 (make-sparse-vector))
-    a))
-
-(define (sparse-array? a)
-  (and (sparse-vector? a)
-       (sparse-vector? (sparse-vector-ref a 0))))
-
-(define (sparse-array-ref a x y)
-  (let ((row (sparse-vector-ref a x)))
-    (if row
-	(sparse-vector-ref row y)
-	#f)))
-
-(define (sparse-array-set! a x y val)
-  (let ((row (sparse-vector-ref a x)))
-    (if row
-	(sparse-vector-set! row y val)
-	(let ((new-row (make-sparse-vector)))
-	  (sparse-vector-set! a x new-row)
-	  (sparse-vector-set! new-row y val)))))
-
 (defstruct refdb:csv svec rows cols maxrow maxcol)
 
 ;; csv processing record
 (define (actual-make-refdb:csv)
   (make-refdb:csv 
@@ -534,11 +554,11 @@
 			 (current-output-port)))
 	   (res-data (configf:read-refdb input-db))
 	   (data     (car res-data))
 	   (msg      (cadr res-data)))
       (if (not data)
-	  (debug:print 0 "Bad input? data=" data) ;; some error occurred
+	  (debug:print 0 *default-log-port* "Bad input? data=" data) ;; some error occurred
 	  (with-output-to-port out-port
 	    (lambda ()
 	      (case (string->symbol out-fmt)
 		((scheme)(pp data))
 		((perl)
@@ -655,17 +675,50 @@
 (if (args:get-arg "-ping")
     (let* ((run-id        (string->number (args:get-arg "-run-id")))
 	   (host:port     (args:get-arg "-ping")))
       (server:ping run-id host:port)))
 
-;;       (set! *did-something* #t)
-;; 	      (begin
-;; 		(print ((rpc:procedure 'testing (car host-port)(cadr host-port))))
-;; 		(case (server:get-transport)
-;; 		  ((http)(http:ping run-id host-port))
-;; 		  ((rpc) (rpc:procedure 'server:login (car host-port)(cadr host-port));;  *toppath*)) ;; (rpc-transport:ping  run-id (car host-port)(cadr host-port)))
-;; 		  (else  (debug:print 0 "ERROR: No transport set")(exit)))))
+;;======================================================================
+;; Capture, save and manipulate environments
+;;======================================================================
+
+;; NOTE: Keep these above the section where the server or client code is setup
+
+(let ((envcap (args:get-arg "-envcap")))
+  (if envcap
+      (let* ((db      (env:open-db (if (null? remargs) "envdat.db" (car remargs)))))
+	(env:save-env-vars db envcap)
+	(env:close-database db)
+	(set! *didsomething* #t))))
+
+;; delta "language" will eventually be res=a+b-c but for now it is just res=a-b 
+;;
+(let ((envdelta (args:get-arg "-envdelta")))
+  (if envdelta
+      (let ((match (string-split envdelta "-")));; (string-match "([a-z0-9_]+)=([a-z0-9_\\-,]+)" envdelta)))
+	(if (not (null? match))
+	    (let* ((db        (env:open-db (if (null? remargs) "envdat.db" (car remargs))))
+		   ;; (resctx    (cadr match))
+		   ;; (equn      (caddr match))
+		   (parts     match) ;; (string-split equn "-"))
+		   (minuend   (car parts))
+		   (subtraend (cadr parts))
+		   (added     (env:get-added   db minuend subtraend))
+		   (removed   (env:get-removed db minuend subtraend))
+		   (changed   (env:get-changed db minuend subtraend)))
+	      ;; (pp (hash-table->alist added))
+	      ;; (pp (hash-table->alist removed))
+	      ;; (pp (hash-table->alist changed))
+	      (if (args:get-arg "-o")
+		  (with-output-to-file
+		      (args:get-arg "-o")
+		    (lambda ()
+		      (env:print added removed changed)))
+		  (env:print added removed changed))
+	      (env:close-database db)
+	      (set! *didsomething* #t))
+	    (debug:print-error 0 *default-log-port* "Parameter to -envdelta should be new=star-end")))))
 
 ;;======================================================================
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
 ;;======================================================================
@@ -672,38 +725,38 @@
 
 (if (args:get-arg "-server")
 
     ;; Server? Start up here.
     ;;
-    (let ((tl        (launch:setup-for-run))
+    (let ((tl        (launch:setup))
 	  (run-id    (and (args:get-arg "-run-id")
 			  (string->number (args:get-arg "-run-id")))))
       (if run-id
 	  (begin
 	    (server:launch run-id)
 	    (set! *didsomething* #t))
-	  (debug:print 0 "ERROR: server requires run-id be specified with -run-id")))
+	  (debug:print-error 0 *default-log-port* "server requires run-id be specified with -run-id")))
 
     ;; Not a server? This section will decide how to communicate
     ;;
     ;;  Setup client for all expect listed here
     (if (null? (lset-intersection 
-		     equal?
-		     (hash-table-keys args:arg-hash)
-		     '("-list-servers"
-		       "-stop-server"
-		       "-show-cmdinfo"
-		       "-list-runs"
-		       "-ping")))
-	(if (launch:setup-for-run)
+		equal?
+		(hash-table-keys args:arg-hash)
+		'("-list-servers"
+		  "-stop-server"
+		  "-show-cmdinfo"
+		  "-list-runs"
+		  "-ping")))
+	(if (launch:setup)
 	    (let ((run-id    (and (args:get-arg "-run-id")
 				  (string->number (args:get-arg "-run-id")))))
 	      ;; (set! *fdb*   (filedb:open-db (conc *toppath* "/db/paths.db")))
 	      ;; if not list or kill then start a client (if appropriate)
 	      (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
 		      (eq? (length (hash-table-keys args:arg-hash)) 0))
-		  (debug:print-info 1 "Server connection not needed")
+		  (debug:print-info 1 *default-log-port* "Server connection not needed")
 		  (begin
 		    ;; (if run-id 
 		    ;;     (client:launch run-id) 
 		    ;;     (client:launch 0)      ;; without run-id we'll start a server for "0"
 		    #t
@@ -712,11 +765,11 @@
 ;; MAY STILL NEED THIS
 ;;		       (set! *megatest-db* (make-dbr:dbstruct path: *toppath* local: #t))))))))))
 
 (if (or (args:get-arg "-list-servers")
 	(args:get-arg "-stop-server"))
-    (let ((tl (launch:setup-for-run)))
+    (let ((tl (launch:setup)))
       (if tl 
 	  (let* ((tdbdat  (tasks:open-db))
 		 (servers (tasks:get-all-servers (db:delay-if-busy tdbdat)))
 		 (fmtstr  "~5a~12a~8a~20a~24a~10a~10a~10a~10a\n")
 		 (servers-to-kill '())
@@ -752,14 +805,14 @@
 		 (format #t fmtstr id mt-ver pid hostname (conc interface ":" pullport) pubport last-update
 			 (if status "alive" "dead") transport)
 		 (if (or (equal? id sid)
 			 (equal? sid 0)) ;; kill all/any
 		     (begin
-		       (debug:print-info 0 "Attempting to stop server with pid " pid)
+		       (debug:print-info 0 *default-log-port* "Attempting to stop server with pid " pid)
 		       (tasks:kill-server status hostname pullport pid transport)))))
 	     servers)
-	    (debug:print-info 1 "Done with listservers")
+	    (debug:print-info 1 *default-log-port* "Done with listservers")
 	    (set! *didsomething* #t)
 	    (exit)) ;; must do, would have to add checks to many/all calls below
 	  (exit))))
 
 ;;======================================================================
@@ -766,40 +819,64 @@
 ;; Weird special calls that need to run *after* the server has started?
 ;;======================================================================
 
 (if (args:get-arg "-list-targets")
     (let ((targets (common:get-runconfig-targets)))
-      (debug:print 1 "Found "(length targets) " targets")
+      (debug:print 1 *default-log-port* "Found "(length targets) " targets")
       (case (string->symbol (or (args:get-arg "-dumpmode") "alist"))
 	((alist)
 	 (for-each (lambda (x)
 		     ;; (print "[" x "]"))
 		     (print x))
 		   targets))
 	((json)
 	 (json-write targets))
 	(else
-	 (debug:print 0 "ERROR: dump output format " (args:get-arg "-dumpmode") " not supported for -list-targets")))
+	 (debug:print-error 0 *default-log-port* "dump output format " (args:get-arg "-dumpmode") " not supported for -list-targets")))
       (set! *didsomething* #t)))
 
+;; cache the runconfigs in $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME/.runconfig
+;;
 (define (full-runconfigs-read)
-  (let* ((keys   (rmt:get-keys))
-	 (target (common:args-get-target))
-	 (key-vals (if target (keys:target->keyval keys target) #f))
-	 (sections (if target (list "default" target) #f))
-	 (data     (begin
-		     (setenv "MT_RUN_AREA_HOME" *toppath*)
-		     (if key-vals
-			 (for-each (lambda (kt)
-				     (setenv (car kt) (cadr kt)))
-				   key-vals))
-		     (read-config (conc *toppath* "/runconfigs.config") #f #t sections: sections))))
-    data))
-
+;; in the envprocessing branch the below code replaces the further below code
+;;  (if (eq? *configstatus* 'fulldata)
+;;      *runconfigdat*
+;;      (begin
+;;	(launch:setup)
+;;	*runconfigdat*)))
+
+  (let* ((rundir (if (and (getenv "MT_LINKTREE")(getenv "MT_TARGET")(getenv "MT_RUNNAME"))
+		     (conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME"))
+		     #f))
+	 (cfgf   (if rundir (conc rundir "/.runconfig." megatest-version "-" megatest-fossil-hash) #f)))
+    (if (and cfgf
+	     (file-exists? cfgf)
+	     (file-write-access? cfgf))
+	(configf:read-alist cfgf)
+	(let* ((keys   (rmt:get-keys))
+	       (target (common:args-get-target))
+	       (key-vals (if target (keys:target->keyval keys target) #f))
+	       (sections (if target (list "default" target) #f))
+	       (data     (begin
+			   (setenv "MT_RUN_AREA_HOME" *toppath*)
+			   (if key-vals
+			       (for-each (lambda (kt)
+					   (setenv (car kt) (cadr kt)))
+					 key-vals))
+			   (read-config (conc *toppath* "/runconfigs.config") #f #t sections: sections))))
+	  (if (and rundir ;; have all needed variabless
+		   (directory-exists? rundir)
+		   (file-write-access? rundir))
+	      (begin
+		(configf:write-alist data cfgf)
+		;; force re-read of megatest.config - this resolves circular references between megatest.config
+		(launch:setup force: #t)
+		(launch:cache-config))) ;; we can safely cache megatest.config since we have a valid runconfig
+	  data))))
 
 (if (args:get-arg "-show-runconfig")
-    (let ((tl (launch:setup-for-run)))
+    (let ((tl (launch:setup)))
       (push-directory *toppath*)
       (let ((data (full-runconfigs-read)))
 	;; keep this one local
 	(cond
 	 ((and (args:get-arg "-section")
@@ -812,16 +889,16 @@
 	 ((string=? (args:get-arg "-dumpmode") "json")
 	  (json-write data))
 	 ((string=? (args:get-arg "-dumpmode") "ini")
 	  (configf:config->ini data))
 	 (else
-	  (debug:print 0 "ERROR: -dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
+	  (debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
 	(set! *didsomething* #t))
       (pop-directory)))
 
 (if (args:get-arg "-show-config")
-    (let ((tl   (launch:setup-for-run))
+    (let ((tl   (launch:setup))
 	  (data *configdat*)) ;; (read-config "megatest.config" #f #t)))
       (push-directory *toppath*)
       ;; keep this one local
       (cond 
        ((and (args:get-arg "-section")
@@ -836,11 +913,11 @@
        ((string=? (args:get-arg "-dumpmode") "json")
 	(json-write data))
        ((string=? (args:get-arg "-dumpmode") "ini")
 	(configf:config->ini data))
        (else
-	(debug:print 0 "ERROR: -dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
+	(debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
       (set! *didsomething* #t)
       (pop-directory)))
 
 (if (args:get-arg "-show-cmdinfo")
     (if (or (args:get-arg ":value")(getenv "MT_CMDINFO"))
@@ -847,11 +924,11 @@
 	(let ((data (common:read-encoded-string (or (args:get-arg ":value")(getenv "MT_CMDINFO")))))
 	  (if (equal? (args:get-arg "-dumpmode") "json")
 	      (json-write data)
 	      (pp data))
 	  (set! *didsomething* #t))
-	(debug:print-info 0 "environment variable MT_CMDINFO is not set")))
+	(debug:print-info 0 *default-log-port* "environment variable MT_CMDINFO is not set")))
 
 ;;======================================================================
 ;; Remove old run(s)
 ;;======================================================================
 
@@ -860,34 +937,37 @@
 (define (operate-on action)
   (let* ((runrec (runs:runrec-make-record))
 	 (target (common:args-get-target)))
     (cond
      ((not target)
-      (debug:print 0 "ERROR: Missing required parameter for " action ", you must specify -target or -reqtarg")
+      (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify -target or -reqtarg")
       (exit 1))
      ((not (or (args:get-arg ":runname")
 	       (args:get-arg "-runname")))
-      (debug:print 0 "ERROR: Missing required parameter for " action ", you must specify the run name pattern with -runname patt")
+      (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify the run name pattern with -runname patt")
       (exit 2))
      ((not (args:get-arg "-testpatt"))
-      (debug:print 0 "ERROR: Missing required parameter for " action ", you must specify the test pattern with -testpatt")
+      (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify the test pattern with -testpatt")
       (exit 3))
      (else
       (if (not (car *configinfo*))
 	  (begin
-	    (debug:print 0 "ERROR: Attempted " action "on test(s) but run area config file not found")
+	    (debug:print-error 0 *default-log-port* "Attempted " action "on test(s) but run area config file not found")
 	    (exit 1))
 	  ;; put test parameters into convenient variables
-	  (runs:operate-on  action
-			    target
-			    (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			    (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			    state: (common:args-get-state)
-			    status: (common:args-get-status)
-			    new-state-status: (args:get-arg "-set-state-status")))
+	  (begin
+	    ;; check for correct version, exit with message if not correct
+	    (common:exit-on-version-changed)
+	    (runs:operate-on  action
+			      target
+			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+			      (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+			      state: (common:args-get-state)
+			      status: (common:args-get-status)
+			      new-state-status: (args:get-arg "-set-state-status"))))
       (set! *didsomething* #t)))))
-	  
+
 (if (args:get-arg "-remove-runs")
     (general-run-call 
      "-remove-runs"
      "remove runs"
      (lambda (target runname keys keyvals)
@@ -911,11 +991,11 @@
 					#f #f #f))
 	      (header   (vector-ref runsdat 0))
 	      (rows     (vector-ref runsdat 1)))
 	 (if (null? rows)
 	     (begin
-	       (debug:print-info 0 "No matching run found.")
+	       (debug:print-info 0 *default-log-port* "No matching run found.")
 	       (exit 1))
 	     (let* ((row      (car (vector-ref runsdat 1)))
 		    (run-id   (db:get-value-by-header row header "id")))
 	       (if (args:get-arg "-set-run-status")
 		   (rmt:set-run-status run-id (args:get-arg "-set-run-status") msg: (args:get-arg "-m"))
@@ -954,11 +1034,11 @@
 ;;
 ;; IDEA: megatest list -runname blah% ...
 ;;
 (if (or (args:get-arg "-list-runs")
 	(args:get-arg "-list-db-targets"))
-    (if (launch:setup-for-run)
+    (if (launch:setup)
 	(let* (;; (dbstruct    (make-dbr:dbstruct path: *toppath* local: (args:get-arg "-local")))
 	       (runpatt     (args:get-arg "-list-runs"))
 	       (testpatt    (common:args-get-testpatt #f))
 	       ;; (if (args:get-arg "-testpatt") 
 	       ;;  	        (args:get-arg "-testpatt") 
@@ -1011,11 +1091,11 @@
 			       (tal (cdr adj-tests-spec))
 			       (idx 0))
 		      (hash-table-set! test-field-index hed idx)
 		      (if (not (null? tal))(loop (car tal)(cdr tal)(+ idx 1))))
 		    (begin
-		      (debug:print 0 "ERROR: Invalid test fields specified: " (string-intersperse invalid-tests-spec ", "))
+		      (debug:print-error 0 *default-log-port* "Invalid test fields specified: " (string-intersperse invalid-tests-spec ", "))
 		      (exit)))))
 
 	  ;; Each run
 	  (for-each 
 	   (lambda (run)
@@ -1039,11 +1119,13 @@
 				       (rmt:get-tests-for-run run-id testpatt states statuses #f #f #f 'testname 'asc ;; (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc 
 							     ;; use qryvals if test-spec provided
 							     (if tests-spec
 								 (string-intersperse adj-tests-spec ",")
 								 ;; db:test-record-fields
-								 #f))
+								 #f)
+							     #f
+							     'normal)
 				       '())))
 		     (case dmode
 		       ((json ods)
 			(if runs-spec
 			    (for-each 
@@ -1078,13 +1160,13 @@
 		     (for-each 
 		      (lambda (test)
 		      	(handle-exceptions
 			 exn
 			 (begin
-			   (debug:print 0 "ERROR: Bad data in test record? " test)
+			   (debug:print-error 0 *default-log-port* "Bad data in test record? " test)
 			   (print "exn=" (condition->list exn))
-			   (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+			   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
 			   (print-call-chain (current-error-port)))
 			 (let* ((test-id      (if (member "id"           tests-spec)(get-value-by-fieldname test test-field-index "id"          ) #f)) ;; (dbr:test-id         test))
 				(testname     (if (member "testname"     tests-spec)(get-value-by-fieldname test test-field-index "testname"    ) #f)) ;; (dbr:test-testname   test))
 				(itempath     (if (member "item_path"    tests-spec)(get-value-by-fieldname test test-field-index "item_path"   ) #f)) ;; (dbr:test-item-path  test))
 				(comment      (if (member "comment"      tests-spec)(get-value-by-fieldname test test-field-index "comment"     ) #f)) ;; (dbr:test-comment    test))
@@ -1224,11 +1306,11 @@
 						(map (lambda (field)
 						       (let ((tmp (assoc field metadat)))
 							 (if tmp (cdr tmp) "")))
 						     metadat-fields)
 						(begin
-						  (debug:print 0 "WARNING: meta data for run " runname " not found")
+						  (debug:print 0 *default-log-port* "WARNING: meta data for run " runname " not found")
 						  '()))))
 					allrundat)))
 		 ;; '( ( "target" ( "runname" ( "data" ( "runid" ( "id . "37" ) ( ... ))))
 		 (run-pages      (map (lambda (targdat)
 					(let* ((target  (car targdat))
@@ -1253,11 +1335,11 @@
 							     (cons (conc target "/" runname)
 								   (cons (list (conc target "/" runname))
 									 (cons '()
 									       (cons run-fields tests)))))
 							   (begin
-							     (debug:print 0 "WARNING: run " target "/" runname " appears to have no data")
+							     (debug:print 0 *default-log-port* "WARNING: run " target "/" runname " appears to have no data")
 							     ;; (pp rundat)
 							     '()))))
 						   runsdat)
 					      '())))
 				      newdat)) ;; we use newdat to get target
@@ -1274,21 +1356,21 @@
 		(let* ((tempdir    (conc "/tmp/" (current-user-name) "/" (random 10000) "_" (current-process-id)))
 		       (outputfile (or (args:get-arg "-o") "out.ods"))
 		       (ouf        (if (string-match (regexp "^[/~]+.*") outputfile) ;; full path?
 				       outputfile
 				       (begin
-					 (debug:print 0 "WARNING: path given, " outputfile " is relative, prefixing with current directory")
+					 (debug:print 0 *default-log-port* "WARNING: path given, " outputfile " is relative, prefixing with current directory")
 					 (conc (current-directory) "/" outputfile)))))
 		  (create-directory tempdir #t)
 		  (ods:list->ods tempdir ouf sheets))))
 	  ;; (system (conc "rm -rf " tempdir))
 	  (set! *didsomething* #t))))
 
 ;; Don't think I need this. Incorporated into -list-runs instead
 ;;
 ;; (if (and (args:get-arg "-since")
-;; 	 (launch:setup-for-run))
+;; 	 (launch:setup))
 ;;     (let* ((since-time (string->number (args:get-arg "-since")))
 ;; 	   (run-ids    (db:get-changed-run-ids since-time)))
 ;;       ;; (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
 ;;       (print (sort run-ids <))
 ;;       (set! *didsomething* #t)))
@@ -1314,10 +1396,11 @@
 
 ;; run all tests are are Not COMPLETED and PASS or CHECK
 (if (or (args:get-arg "-runall")
 	(args:get-arg "-run")
 	(args:get-arg "-rerun-clean")
+	(args:get-arg "-rerun-all")
 	(args:get-arg "-runtests"))
     (general-run-call 
      "-runall"
      "run all tests"
      (lambda (target runname keys keyvals)
@@ -1338,10 +1421,28 @@
 			      target
 			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
 			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
 			      ;; state:  states
 			      status: statuses
+			      new-state-status: "NOT_STARTED,n/a")))
+       ;; RERUN ALL
+       (if (args:get-arg "-rerun-all") ;; first set states/statuses correct
+	   (begin
+	     (hash-table-set! args:arg-hash "-preclean" #t)
+	     (runs:operate-on 'set-state-status
+			      target
+			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+			      state:  #f
+			      ;; status: statuses
+			      new-state-status: "NOT_STARTED,n/a")
+	     (runs:operate-on 'set-state-status
+			      target
+			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+			      ;; state:  states
+			      status: #f
 			      new-state-status: "NOT_STARTED,n/a")))
        (runs:run-tests target
 		       runname
 		       #f ;; (common:args-get-testpatt #f)
 		       ;; (or (args:get-arg "-testpatt")
@@ -1440,15 +1541,15 @@
 	       (target    (args:get-arg "-target"))
 	       (toppath   (assoc/default 'toppath   cmdinfo)))
 	  (change-directory toppath)
 	  (if (not target)
 	      (begin
-		(debug:print 0 "ERROR: -target is required.")
+		(debug:print-error 0 *default-log-port* "-target is required.")
 		(exit 1)))
-	  (if (not (launch:setup-for-run))
+	  (if (not (launch:setup))
 	      (begin
-		(debug:print 0 "Failed to setup, giving up on -test-paths or -test-files, exiting")
+		(debug:print 0 *default-log-port* "Failed to setup, giving up on -test-paths or -test-files, exiting")
 		(exit 1)))
 	  (let* ((keys     (rmt:get-keys))
 		 ;; db:test-get-paths must not be run remote
 		 (paths    (tests:test-get-paths-matching keys target (args:get-arg "-test-files"))))
 	    (set! *didsomething* #t)
@@ -1491,11 +1592,11 @@
        (let ((dbstruct   (make-dbr:dbstruct path: *toppath* local: #t))
 	     (outputfile (args:get-arg "-extract-ods"))
 	     (runspatt   (or (args:get-arg "-runname")(args:get-arg ":runname")))
 	     (pathmod    (args:get-arg "-pathmod")))
 	     ;; (keyvalalist (keys->alist keys "%")))
-	 (debug:print 2 "Extract ods, outputfile: " outputfile " runspatt: " runspatt " keyvals: " keyvals)
+	 (debug:print 2 *default-log-port* "Extract ods, outputfile: " outputfile " runspatt: " runspatt " keyvals: " keyvals)
 	 (db:extract-ods-file dbstruct outputfile keyvals (if runspatt runspatt "%") pathmod)
 	 (db:close-all dbstruct)
 	 (set! *didsomething* #t)))))
 
 ;;======================================================================
@@ -1524,21 +1625,21 @@
 	    (if (and run-id test-id)
 		(begin
 		  (launch:recover-test run-id test-id)
 		  (set! *didsomething* #t))
 		(begin
-		  (debug:print 0 "ERROR: bad run-id or test-id, must be integers")
+		  (debug:print-error 0 *default-log-port* "bad run-id or test-id, must be integers")
 		  (exit 1)))))))
 
 ;;======================================================================
 ;; Test commands (i.e. for use inside tests)
 ;;======================================================================
 
 (define (megatest:step step state status logfile msg)
   (if (not (getenv "MT_CMDINFO"))
       (begin
-	(debug:print 0 "ERROR: MT_CMDINFO env var not set, -step must be called *inside* a megatest invoked environment!")
+	(debug:print-error 0 *default-log-port* "MT_CMDINFO env var not set, -step must be called *inside* a megatest invoked environment!")
 	(exit 5))
       (let* ((cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
 	     (transport (assoc/default 'transport cmdinfo))
 	     (testpath  (assoc/default 'testpath  cmdinfo))
 	     (test-name (assoc/default 'test-name cmdinfo))
@@ -1548,18 +1649,20 @@
 	     (test-id   (assoc/default 'test-id   cmdinfo))
 	     (itemdat   (assoc/default 'itemdat   cmdinfo))
 	     (work-area (assoc/default 'work-area cmdinfo))
 	     (db        #f))
 	(change-directory testpath)
-	(if (not (launch:setup-for-run))
+	(if (not (launch:setup))
 	    (begin
-	      (debug:print 0 "Failed to setup, exiting")
+	      (debug:print 0 *default-log-port* "Failed to setup, exiting")
 	      (exit 1)))
 	(if (and state status)
-	    (rmt:teststep-set-status! run-id test-id step state status msg logfile)
+	    (let ((comment (launch:load-logpro-dat run-id test-id step)))
+	      ;; (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
+	      (rmt:teststep-set-status! run-id test-id step state status (or comment msg) logfile))
 	    (begin
-	      (debug:print 0 "ERROR: You must specify :state and :status with every call to -step")
+	      (debug:print-error 0 *default-log-port* "You must specify :state and :status with every call to -step")
 	      (exit 6))))))
 
 (if (args:get-arg "-step")
     (begin
       (megatest:step 
@@ -1580,11 +1683,11 @@
 	(args:get-arg "-load-test-data")
 	(args:get-arg "-runstep")
 	(args:get-arg "-summarize-items"))
     (if (not (getenv "MT_CMDINFO"))
 	(begin
-	  (debug:print 0 "ERROR: MT_CMDINFO env var not set, commands -test-status, -runstep and -setlog must be called *inside* a megatest environment!")
+	  (debug:print-error 0 *default-log-port* "MT_CMDINFO env var not set, commands -test-status, -runstep and -setlog must be called *inside* a megatest environment!")
 	  (exit 5))
 	(let* ((startingdir (current-directory))
 	       (cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
 	       (transport (assoc/default 'transport cmdinfo))
 	       (testpath  (assoc/default 'testpath  cmdinfo))
@@ -1595,17 +1698,18 @@
 	       (test-id   (assoc/default 'test-id   cmdinfo))
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (work-area (assoc/default 'work-area cmdinfo))
 	       (db        #f) ;; (open-db))
 	       (state     (args:get-arg ":state"))
-	       (status    (args:get-arg ":status")))
-	  (if (not (launch:setup-for-run))
+	       (status    (args:get-arg ":status"))
+	       (stepname  (args:get-arg "-step")))
+	  (if (not (launch:setup))
 	      (begin
-		(debug:print 0 "Failed to setup, exiting")
+		(debug:print 0 *default-log-port* "Failed to setup, exiting")
 		(exit 1)))
 
-	  (if (args:get-arg "-runstep")(debug:print-info 1 "Running -runstep, first change to directory " work-area))
+	  (if (args:get-arg "-runstep")(debug:print-info 1 *default-log-port* "Running -runstep, first change to directory " work-area))
 	  (change-directory work-area)
 	  ;; can setup as client for server mode now
 	  ;; (client:setup)
 
 	  (if (args:get-arg "-load-test-data")
@@ -1622,11 +1726,11 @@
 	      ;; DO NOT run remote
 	      (tests:summarize-items run-id test-id test-name #t)) ;; do force here
 	  (if (args:get-arg "-runstep")
 	      (if (null? remargs)
 		  (begin
-		    (debug:print 0 "ERROR: nothing specified to run!")
+		    (debug:print-error 0 *default-log-port* "nothing specified to run!")
 		    (if db (sqlite3:finalize! db))
 		    (exit 6))
 		  (let* ((stepname   (args:get-arg "-runstep"))
 			 (logprofile (args:get-arg "-logpro"))
 			 (logfile    (conc stepname ".log"))
@@ -1645,21 +1749,21 @@
 						(cons cmd params) " ")
 					   ") " redir " " logfile)))
 		    ;; mark the start of the test
 		    (rmt:teststep-set-status! run-id test-id stepname "start" "n/a" (args:get-arg "-m") logfile)
 		    ;; run the test step
-		    (debug:print-info 2 "Running \"" fullcmd "\" in directory \"" startingdir)
+		    (debug:print-info 2 *default-log-port* "Running \"" fullcmd "\" in directory \"" startingdir)
 		    (change-directory startingdir)
 		    (set! exitstat (system fullcmd))
 		    (set! *globalexitstatus* exitstat)
 		    ;; (change-directory testpath)
 		    ;; run logpro if applicable ;; (process-run "ls" (list "/foo" "2>&1" "blah.log"))
 		    (if logprofile
 			(let* ((htmllogfile (conc stepname ".html"))
 			       (oldexitstat exitstat)
 			       (cmd         (string-intersperse (list "logpro" logprofile htmllogfile "<" logfile ">" (conc stepname "_logpro.log")) " ")))
-			  (debug:print-info 2 "running \"" cmd "\"")
+			  (debug:print-info 2 *default-log-port* "running \"" cmd "\"")
 			  (change-directory startingdir)
 			  (set! exitstat (system cmd))
 			  (set! *globalexitstatus* exitstat) ;; no necessary
 			  (change-directory testpath)
 			  (rmt:test-set-log! run-id test-id htmllogfile)))
@@ -1683,11 +1787,11 @@
 				 res)))
 		(if (and (args:get-arg "-test-status")
 			 (or (not state)
 			     (not status)))
 		    (begin
-		      (debug:print 0 "ERROR: You must specify :state and :status with every call to -test-status\n" help)
+		      (debug:print-error 0 *default-log-port* "You must specify :state and :status with every call to -test-status\n" help)
 		      (if (sqlite3:database? db)(sqlite3:finalize! db))
 		      (exit 6)))
 		(let* ((msg    (args:get-arg "-m"))
 		       (numoth (length (hash-table-keys otherdata))))
 		  ;; Convert to rpc inside the tests:test-set-status! call, not here
@@ -1701,22 +1805,22 @@
 
 (if (or (args:get-arg "-showkeys")
         (args:get-arg "-show-keys"))
     (let ((db #f)
 	  (keys #f))
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup))
 	  (begin
-	    (debug:print 0 "Failed to setup, exiting")
+	    (debug:print 0 *default-log-port* "Failed to setup, exiting")
 	    (exit 1)))
       (set! keys (rmt:get-keys)) ;;  db))
-      (debug:print 1 "Keys: " (string-intersperse keys ", "))
+      (debug:print 1 *default-log-port* "Keys: " (string-intersperse keys ", "))
       (if (sqlite3:database? db)(sqlite3:finalize! db))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-gui")
     (begin
-      (debug:print 0 "Look at the dashboard for now")
+      (debug:print 0 *default-log-port* "Look at the dashboard for now")
       ;; (megatest-gui)
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-gen-megatest-area")
     (begin
@@ -1732,42 +1836,32 @@
 ;; Update the database schema, clean up the db
 ;;======================================================================
 
 (if (args:get-arg "-rebuild-db")
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup))
 	  (begin
-	    (debug:print 0 "Failed to setup, exiting") 
+	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       (open-run-close patch-db #f)
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-cleanup-db")
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup))
 	  (begin
-	    (debug:print 0 "Failed to setup, exiting") 
+	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
-      ;; keep this one local
-      ;; (open-run-close db:clean-up #f)
-      (db:multi-db-sync 
-       #f ;; do all run-ids
-       ;; 'new2old
-       'killservers
-       'dejunk
-       ;; 'adj-testids
-       ;; 'old2new
-       'new2old
-       )
+      (common:cleanup-db)
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup))
 	  (begin
-	    (debug:print 0 "Failed to setup, exiting") b
+	    (debug:print 0 *default-log-port* "Failed to setup, exiting")
 	    (exit 1)))
       (open-run-close db:find-and-mark-incomplete #f)
       (set! *didsomething* #t)))
 
 ;;======================================================================
@@ -1774,13 +1868,13 @@
 ;; Update the tests meta data from the testconfig files
 ;;======================================================================
 
 (if (args:get-arg "-update-meta")
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup))
 	  (begin
-	    (debug:print 0 "Failed to setup, exiting") 
+	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
       ;; now can find our db
       ;; keep this one local
       (open-run-close runs:update-all-test_meta #f)
       (set! *didsomething* #t)))
@@ -1789,46 +1883,66 @@
 ;; Start a repl
 ;;======================================================================
 
 ;; fakeout readline
 
-(if (or (args:get-arg "-repl")
+(if (or (getenv "MT_RUNSCRIPT")
+	(args:get-arg "-repl")
 	(args:get-arg "-load"))
-    (let* ((toppath (launch:setup-for-run))
+    (let* ((toppath (launch:setup))
 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
       (if dbstruct
-	  (begin
-	    (set! *db* dbstruct)
-	    (set! *client-non-blocking-mode* #t)
-	    (import extras) ;; might not be needed
-	    ;; (import csi)
-	    (import readline)
-	    (import apropos)
-	    ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
-	    (include "readline-fix.scm")
-	    (gnu-history-install-file-manager
-	     (string-append
-	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
-	    (current-input-port (make-gnu-readline-port "megatest> "))
-	    (if (args:get-arg "-repl")
-		(repl)
-		(load (args:get-arg "-load")))
-	    (db:close-all dbstruct))
-	  (exit))
-      (set! *didsomething* #t)))
+	  (cond
+	   ((getenv "MT_RUNSCRIPT")
+	    ;; How to run megatest scripts
+	    ;;
+	    ;; #!/bin/bash
+	    ;;
+	    ;; export MT_RUNSCRIPT=yes
+	    ;; megatest << EOF
+	    ;; (print "Hello world")
+	    ;; (exit)
+	    ;; EOF
+
+	    (repl))
+	   (else
+	    (begin
+	      (set! *db* dbstruct)
+	      (set! *client-non-blocking-mode* #t)
+	      (import extras) ;; might not be needed
+	      ;; (import csi)
+	      (import readline)
+	      (import apropos)
+	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
+	      (include "readline-fix.scm")
+	      (if *use-new-readline*
+		  (begin
+		    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])
+		    (current-input-port (make-readline-port "megatest> ")))
+		  (begin
+		    (gnu-history-install-file-manager
+		     (string-append
+		      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
+		    (current-input-port (make-gnu-readline-port "megatest> "))))
+	      (if (args:get-arg "-repl")
+		  (repl)
+		  (load (args:get-arg "-load")))
+	      (db:close-all dbstruct))
+	    (exit)))
+	  (set! *didsomething* #t))))
 
 ;;======================================================================
 ;; Wait on a run to complete
 ;;======================================================================
 
 (if (and (args:get-arg "-run-wait")
 	 (not (or (args:get-arg "-run")
 		  (args:get-arg "-runtests")))) ;; run-wait is built into runtests now
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup))
 	  (begin
-	    (debug:print 0 "Failed to setup, exiting") 
+	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
       (operate-on 'run-wait)
       (set! *didsomething* #t)))
 
 ;; ;; ;; redo me ;; Not converted to use dbstruct yet
@@ -1837,24 +1951,24 @@
 ;; ;; ;; redo me     (let* ((toppath (setup-for-run))
 ;; ;; ;; redo me 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t))))
 ;; ;; ;; redo me       (for-each 
 ;; ;; ;; redo me        (lambda (field)
 ;; ;; ;; redo me 	 (let ((dat '()))
-;; ;; ;; redo me 	   (debug:print-info 0 "Getting data for field " field)
+;; ;; ;; redo me 	   (debug:print-info 0 *default-log-port* "Getting data for field " field)
 ;; ;; ;; redo me 	   (sqlite3:for-each-row
 ;; ;; ;; redo me 	    (lambda (id val)
 ;; ;; ;; redo me 	      (set! dat (cons (list id val) dat)))
 ;; ;; ;; redo me 	    (db:get-db db run-id)
 ;; ;; ;; redo me 	    (conc "SELECT id," field " FROM tests;"))
-;; ;; ;; redo me 	   (debug:print-info 0 "found " (length dat) " items for field " field)
+;; ;; ;; redo me 	   (debug:print-info 0 *default-log-port* "found " (length dat) " items for field " field)
 ;; ;; ;; redo me 	   (let ((qry (sqlite3:prepare db (conc "UPDATE tests SET " field "=? WHERE id=?;"))))
 ;; ;; ;; redo me 	     (for-each
 ;; ;; ;; redo me 	      (lambda (item)
 ;; ;; ;; redo me 		(let ((newval ;; (sdb:qry 'getid 
 ;; ;; ;; redo me 		       (cadr item))) ;; )
 ;; ;; ;; redo me 		  (if (not (equal? newval (cadr item)))
-;; ;; ;; redo me 		      (debug:print-info 0 "Converting " (cadr item) " to " newval " for test #" (car item)))
+;; ;; ;; redo me 		      (debug:print-info 0 *default-log-port* "Converting " (cadr item) " to " newval " for test #" (car item)))
 ;; ;; ;; redo me 		  (sqlite3:execute qry newval (car item))))
 ;; ;; ;; redo me 	      dat)
 ;; ;; ;; redo me 	     (sqlite3:finalize! qry))))
 ;; ;; ;; redo me        (db:close-all dbstruct)
 ;; ;; ;; redo me        (list "uname" "rundir" "final_logf" "comment"))
@@ -1885,20 +1999,20 @@
 ;;======================================================================
 
 (if *runremote* (close-all-connections!))
 
 (if (not *didsomething*)
-    (debug:print 0 help))
+    (debug:print 0 *default-log-port* help))
 
 (set! *time-to-exit* #t)
 (thread-join! *watchdog*)
 
 (if (not (eq? *globalexitstatus* 0))
     (if (or (args:get-arg "-run")(args:get-arg "-runtests")(args:get-arg "-runall"))
         (begin
-           (debug:print 0 "NOTE: Subprocesses with non-zero exit code detected: " *globalexitstatus*)
+           (debug:print 0 *default-log-port* "NOTE: Subprocesses with non-zero exit code detected: " *globalexitstatus*)
            (exit 0))
         (case *globalexitstatus*
          ((0)(exit 0))
          ((1)(exit 1))
          ((2)(exit 2))
          (else (exit 3)))))