Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -43,14 +43,18 @@
 (define home (getenv "HOME"))
 (define user (getenv "USER"))
 
 ;; GLOBAL GLETCHES
 (define *db-keys* #f)
-(define *configinfo* #f)
-(define *configdat*  #f)
-(define *toppath*    #f)
+
+(define *configinfo*   #f)   ;; raw results from setup, includes toppath and table from megatest.config
+(define *runconfigdat* #f)   ;; run configs data
+(define *configdat*    #f)   ;; megatest.config data
+(define *configstatus* #f)   ;; status of data; 'fulldata : all processing done, #f : no data yet, 'partialdata : partial read done
+(define *toppath*      #f)
 (define *already-seen-runconfig-info* #f)
+
 (define *waiting-queue*     (make-hash-table))
 (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 *write-frequency*   (make-hash-table)) ;; run-id => (vector (current-seconds) 0))
@@ -447,35 +451,42 @@
 			       rtestpatt)
 			  args-testpatt)))
     (if rtestpatt (debug:print-info 0 "TESTPATT from runconfigs: " rtestpatt))
     testpatt))
 
+(define (common:get-linktree)
+  (or (getenv "MT_LINKTREE")
+      (if *configdat*
+	  (configf:lookup *configdat* "setup" "linktree"))))
+
 (define (common:args-get-runname)
-  (or (args:get-arg "-runname")
-      (args:get-arg ":runname")))
+  (let ((res (or (args:get-arg "-runname")
+		 (args:get-arg ":runname")
+		 (getenv "MT_RUNNAME"))))
+    ;; (if res (set-environment-variable "MT_RUNNAME" res)) ;; not sure if this is a good idea. side effect and all ...
+    res))
 
 (define (common:args-get-target #!key (split #f))
-  (let* ((keys    (keys:config-get-fields *configdat*))
+  (let* ((keys    (if *configdat* (keys:config-get-fields *configdat*) '()))
 	 (numkeys (length keys))
-	 (target  (if (args:get-arg "-reqtarg")
-		      (args:get-arg "-reqtarg")
-		      (if (args:get-arg "-target")
-			  (args:get-arg "-target")
-			  (getenv "MT_TARGET"))))
+	 (target  (or (args:get-arg "-reqtarg")
+		      (args:get-arg "-target")
+		      (getenv "MT_TARGET")))
 	 (tlist   (if target (string-split target "/" #t) '()))
 	 (valid   (if target
-		      (and (not (null? tlist))
-			   (eq? numkeys (length tlist))
-			   (null? (filter string-null? tlist)))
+		      (or (null? keys) ;; probably don't know our keys yet
+			  (and (not (null? tlist))
+			       (eq? numkeys (length tlist))
+			       (null? (filter string-null? tlist))))
 		      #f)))
     (if valid
 	(if split
 	    tlist
 	    target)
 	(if target
 	    (begin
-	      (debug:print 0 "ERROR: Invalid target, spaces or blanks not allowed \"" target "\", target should be: " (string-intersperse keys "/"))
+	      (debug:print 0 "ERROR: Invalid target, spaces or blanks not allowed \"" target "\", target should be: " (string-intersperse keys "/") ", have " tlist " for elements")
 	      #f)
 	    #f))))
 
 ;;======================================================================
 ;; M I S C   L I S T S

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -99,10 +99,12 @@
 		;; (print "fullcmd=" fullcmd)
 		(handle-exceptions
 		 exn
 		 (begin
 		   (debug:print 0 "WARNING: failed to process config input \"" l "\"")
+		   (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+		   ;; (print "exn=" (condition->list exn))
 		   (set! result (conc "#{( " cmdtype ") " cmd"}")))
 		 (if (or allow-system
 			 (not (member cmdtype '("system" "shell"))))
 		     (with-input-from-string fullcmd
 		       (lambda ()
@@ -159,11 +161,18 @@
 			(configf:process-line inl ht allow-processing)))))
 	    (if (and (string? res)
 		     (not (equal? (hash-table-ref/default settings "trim-trailing-spaces" "no") "no")))
 		(string-substitute "\\s+$" "" res)
 		res))))))
-      
+  
+(define (calc-allow-system allow-system section sections)
+  (if sections
+      (and (or (equal? "default" section)
+	       (member section sections))
+	   allow-system) ;; account for sections and return allow-system as it might be a symbol such as return-strings
+      allow-system))
+    
 ;; read a config file, returns hash table of alists
 
 ;; read a config file, returns hash table of alists
 ;; adds to ht if given (must be #f otherwise)
 ;; envion-patt is a regex spec that identifies sections that will be eval'd
@@ -182,11 +191,11 @@
       (let ((inp        (open-input-file path))
 	    (res        (if (not ht)(make-hash-table) ht))
 	    (metapath   (if (or (debug:debug-mode 9)
 				keep-filenames)
 			    path #f)))
-	(let loop ((inl               (configf:read-line inp res allow-system settings)) ;; (read-line inp))
+	(let loop ((inl               (configf:read-line inp res (calc-allow-system allow-system curr-section sections) settings)) ;; (read-line inp))
 		   (curr-section-name (if curr-section curr-section "default"))
 		   (var-flag #f);; turn on for key-var-pr and cont-ln-rx, turn off elsewhere
 		   (lead     #f))
 	  (debug:print-info 8 "curr-section-name: " curr-section-name " var-flag: " var-flag "\n   inl: \"" inl "\"")
 	  (if (eof-object? inl) 
@@ -195,15 +204,15 @@
 		(hash-table-delete! res "") ;; we are using "" as a dumping ground and must remove it before returning the ht
 		(debug:print 9 "END: " path)
 		res)
 	      (regex-case 
 	       inl 
-	       (configf:comment-rx _                  (loop (configf:read-line inp res allow-system settings) curr-section-name #f #f))
-	       (configf:blank-l-rx _                  (loop (configf:read-line inp res allow-system settings) curr-section-name #f #f))
+	       (configf:comment-rx _                  (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))
+	       (configf:blank-l-rx _                  (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))
 	       (configf:settings   ( x setting val  ) (begin
 							(hash-table-set! settings setting val)
-							(loop (configf:read-line inp res allow-system settings) curr-section-name #f #f)))
+							(loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))
 	       (configf:include-rx ( x include-file ) (let* ((curr-conf-dir (pathname-directory path))
 							     (full-conf     (if (absolute-pathname? include-file)
 										include-file
 										(nice-path 
 										 (conc (if curr-conf-dir
@@ -214,31 +223,31 @@
 							    (begin
 							      ;; (push-directory conf-dir)
 							      (debug:print 9 "Including: " full-conf)
 							      (read-config full-conf res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections settings: settings keep-filenames: keep-filenames)
 							      ;; (pop-directory)
-							      (loop (configf:read-line inp res allow-system settings) curr-section-name #f #f))
+							      (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))
 							    (begin
 							      (debug:print '(2 9) "INFO: include file " include-file " not found (called from " path ")")
 							      (debug:print 2 "        " full-conf)
-							      (loop (configf:read-line inp res allow-system settings) curr-section-name #f #f)))))
+							      (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))))
 	       (configf:section-rx ( x section-name ) (begin
 							;; call post-section-procs
 							(for-each 
 							 (lambda (dat)
 							   (let ((patt (car dat))
 								 (proc (cdr dat)))
 							     (if (string-match patt curr-section-name)
 								 (proc curr-section-name section-name res path))))
 							 post-section-procs)
-							(loop (configf:read-line inp res allow-system settings)
+							(loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
 							      ;; if we have the sections list then force all settings into "" and delete it later?
 							      (if (or (not sections) 
 								      (member section-name sections))
 								  section-name "") ;; stick everything into ""
 							      #f #f)))
-	       (configf:key-sys-pr ( x key cmd      ) (if allow-system
+	       (configf:key-sys-pr ( x key cmd      ) (if (calc-allow-system allow-system curr-section-name sections)
 							  (let ((alist    (hash-table-ref/default res curr-section-name '()))
 								(val-proc (lambda ()
 									    (let* ((start-time (current-seconds))
 										   (cmdres     (process:cmd-run->list cmd))
 										   (delta      (- (current-seconds) start-time))
@@ -256,17 +265,17 @@
 										  ""
 										  (string-intersperse res " "))))))
 							    (hash-table-set! res curr-section-name 
 									     (config:assoc-safe-add alist
 									   			    key 
-												    (case allow-system
+												    (case (calc-allow-system allow-system curr-section-name sections)
 												      ((return-procs) val-proc)
 												      ((return-string) cmd)
 												      (else (val-proc)))
 												    metadata: metapath))
-							    (loop (configf:read-line inp res allow-system settings) curr-section-name #f #f))
-							  (loop (configf:read-line inp res allow-system settings) curr-section-name #f #f)))
+							    (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))
+							  (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))
 	       (configf:key-val-pr ( x key unk1 val unk2 ) (let* ((alist   (hash-table-ref/default res curr-section-name '()))
 								  (envar   (and environ-patt (string-search (regexp environ-patt) curr-section-name)))
 								  (realval (if envar
 									       (config:eval-string-in-environment val)
 									       val)))
@@ -273,16 +282,16 @@
 							     (debug:print-info 6 "read-config env setting, envar: " envar " realval: " realval " val: " val " key: " key " curr-section-name: " curr-section-name)
 							     (if envar (safe-setenv key realval))
 							     (debug:print 10 "   setting: [" curr-section-name "] " key " = " val)
 							     (hash-table-set! res curr-section-name 
 									      (config:assoc-safe-add alist key realval metadata: metapath))
-							     (loop (configf:read-line inp res allow-system settings) curr-section-name key #f)))
+							     (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name key #f)))
 	       (configf:key-no-val ( x key val)             (let* ((alist   (hash-table-ref/default res curr-section-name '())))
 							      (debug:print 10 "   setting: [" curr-section-name "] " key " = #t")
 							      (hash-table-set! res curr-section-name 
 									       (config:assoc-safe-add alist key #t metadata: metapath))
-							      (loop (configf:read-line inp res allow-system settings) curr-section-name key #f)))
+							      (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name key #f)))
 	       ;; if a continued line
 	       (configf:cont-ln-rx ( x whsp val     ) (let ((alist (hash-table-ref/default res curr-section-name '())))
 						(if var-flag             ;; if set to a string then we have a continued var
 						    (let ((newval (conc 
 								   (config-lookup res curr-section-name var-flag) "\n"
@@ -292,15 +301,15 @@
 								       "")
 								   val)))
 						      ;; (print "val: " val "\nnewval: \"" newval "\"\nvarflag: " var-flag)
 						      (hash-table-set! res curr-section-name 
 								       (config:assoc-safe-add alist var-flag newval metadata: metapath))
-						      (loop (configf:read-line inp res allow-system settings) curr-section-name var-flag (if lead lead whsp)))
-						    (loop (configf:read-line inp res allow-system settings) curr-section-name #f #f))))
+						      (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name var-flag (if lead lead whsp)))
+						    (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))))
 	       (else (debug:print 0 "ERROR: problem parsing " path ",\n   \"" inl "\"")
 		     (set! var-flag #f)
-		     (loop (configf:read-line inp res allow-system settings) curr-section-name #f #f))))))))
+		     (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))))))))
   
 ;; pathenvvar will set the named var to the path of the config
 (define (find-and-read-config fname #!key (environ-patt #f)(given-toppath #f)(pathenvvar #f))
   (let* ((curr-dir   (current-directory))
          (configinfo (find-config fname toppath: given-toppath))

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -81,11 +81,11 @@
 (if (args:get-arg "-h")
     (begin
       (print help)
       (exit)))
 
-(if (not (launch:setup-for-run))
+(if (not (launch:setup))
     (begin
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
 (define *useserver* (cond
@@ -239,10 +239,11 @@
 	    test1-older)
 	(if same-time
 	    (string>? test-name1 test-name2)
 	    test1-older))))
     
+;; create a virtual table of all the tests
 ;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") )
 (define (update-rundat runnamepatt numruns testnamepatt keypatts)
   (let* ((referenced-run-ids '())
 	 (allruns     (if *useserver*
 			  (rmt:get-runs runnamepatt numruns *start-run-offset* keypatts)

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -728,11 +728,11 @@
 ;;  'closeall     - close all opened dbs
 ;;
 ;;  run-ids: '(1 2 3 ...) or #f (for all)
 ;;
 (define (db:multi-db-sync run-ids . options)
-  (let* ((toppath  (launch:setup-for-run))
+  (let* ((toppath  (launch:setup))
 	 (dbstruct (if toppath (make-dbr:dbstruct path: toppath) #f))
 	 (mtdb     (if toppath (db:open-megatest-db)))
 	 (allow-cleanup (if run-ids #f #t))
 	 (run-ids  (if run-ids 
 		       run-ids

Index: docs/manual/Makefile
==================================================================
--- docs/manual/Makefile
+++ docs/manual/Makefile
@@ -1,8 +1,8 @@
 
 ASCPATH = $(shell which asciidoc)
-EXEPATH = $(shell realpath $(ASCPATH))
+EXEPATH = $(shell readlink -f $(ASCPATH))
 BINPATH = $(shell dirname $(EXEPATH))
 DISPATH = $(shell dirname $(BINPATH))
 
 # broad_goals.csv  needed_features.csv : tables/*.dat
 #         ./refdb2csv tables

Index: docs/manual/megatest_manual.html
==================================================================
--- docs/manual/megatest_manual.html
+++ docs/manual/megatest_manual.html
@@ -1177,17 +1177,15 @@
 </div></div>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_requirements_section">Requirements section</h3>
-<div class="sect3">
-<h4 id="_header_2">Header</h4>
 <div class="listingblock">
+<div class="title">Header</div>
 <div class="content monospaced">
 <pre>[requirements]</pre>
 </div></div>
-</div>
 <div class="sect3">
 <h4 id="_wait_on_other_tests">Wait on Other Tests</h4>
 <div class="listingblock">
 <div class="content monospaced">
 <pre># A normal waiton waits for the prior tests to be COMPLETED
@@ -1218,10 +1216,25 @@
 <div class="content monospaced">
 <pre>[requirements]
 mode itemmatch</pre>
 </div></div>
 </div>
+</div>
+<div class="sect2">
+<h3 id="_overriding_enviroment_variables">Overriding Enviroment Variables</h3>
+<div class="paragraph"><p>Override variables before starting the test. Can include files (perhaps generated by megatest -envdelta or similar).</p></div>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[pre-launch-env-vars]
+VAR1 value1
+
+# Get some generated settings
+[include ../generated-vars.config]
+
+# Use this trick to unset variables
+#{scheme (unsetenv "FOOBAR")}</pre>
+</div></div>
 </div>
 <div class="sect2">
 <h3 id="_itemmap_handling">Itemmap Handling</h3>
 <div class="paragraph"><p>For cases were the dependent test has a similar but not identical
 itempath to the downstream test an itemmap can allow for itemmatch
@@ -1291,11 +1304,11 @@
 <pre>[requirements]
 waiton A B
 
 [itemmap]
 A (\d+)/aa aa/\1
-B (\d+)/bb bb/\1</pre>
+B (\d+)/bb</pre>
 </div></div>
 <div class="listingblock">
 <div class="title">Testconfig for Test D</div>
 <div class="content monospaced">
 <pre>[requirements]
@@ -1317,18 +1330,19 @@
 <div class="content monospaced">
 <pre>[requirements]
 # With a toplevel test you may wish to generate your list
 # of tests to run dynamically
 #
-# waiton #{shell get-valid-tests-to-run.sh}</pre>
+waiton #{shell get-valid-tests-to-run.sh}</pre>
 </div></div>
 </div>
 <div class="sect3">
 <h4 id="_run_time_limit_2">Run time limit</h4>
 <div class="listingblock">
 <div class="content monospaced">
-<pre>runtimelim 1h 2m 3s  # this will automatically kill the test if it runs for more than 1h 2m and 3s</pre>
+<pre>[requirements]
+runtimelim 1h 2m 3s  # this will automatically kill the test if it runs for more than 1h 2m and 3s</pre>
 </div></div>
 </div>
 <div class="sect3">
 <h4 id="_skip">Skip</h4>
 <div class="paragraph"><p>A test with a skip section will conditional skip running.</p></div>
@@ -1485,10 +1499,53 @@
 #  &lt;testsuite&gt;/&lt;creationdate&gt;
 # Within the archive the data is structured like this:
 #  &lt;target&gt;/&lt;runname&gt;/&lt;test&gt;/
 archive0 /mfs/myarchive-data/adisk1</pre>
 </div></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_handling_environment_variables">Handling Environment Variables</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>It is often necessary to capture and or manipulate environment
+variables. Megatest has some facilities built in to help.</p></div>
+<div class="sect2">
+<h3 id="_capture_variables">Capture variables</h3>
+<div class="listingblock">
+<div class="title">Commands</div>
+<div class="content monospaced">
+<pre># capture the current enviroment into a db called envdat.db under
+# the context "before"
+megatest -envcap before
+
+# capture the current environment into a db called startup.db with
+# context "after"
+megatest -envcap after startup.db
+
+# write the diff from before to after
+megatest -envdelta before-after -dumpmode bash</pre>
+</div></div>
+<div class="paragraph"><p>Dump modes include bash, csh and config. You can include config data
+into megatest.config or runconfigs.config.</p></div>
+<div class="listingblock">
+<div class="title">Example of generating and using config data</div>
+<div class="content monospaced">
+<pre>megatest -envcap original
+# do some stuff here
+megatest -envcap munged
+megatest -envdelta original-munged -dumpmode ini -o modified.config</pre>
+</div></div>
+<div class="paragraph"><p>Then in runconfigs.config</p></div>
+<div class="listingblock">
+<div class="title">Example of using modified.config in a testconfig</div>
+<div class="content monospaced">
+<pre>cat testconfig
+
+[pre-launch-env-vars]
+[include modified.config]</pre>
+</div></div>
+</div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_programming_api">Programming API</h2>
 <div class="sectionbody">
@@ -1656,11 +1713,10 @@
 </div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
 Version 1.0<br>
-Last updated
- 2015-09-10 21:54:17 MST
+Last updated 2015-09-13 12:16:43 MST
 </div>
 </div>
 </body>
 </html>

Index: docs/manual/reference.txt
==================================================================
--- docs/manual/reference.txt
+++ docs/manual/reference.txt
@@ -89,13 +89,11 @@
 -------------------
 
 Requirements section
 ~~~~~~~~~~~~~~~~~~~~
 
-Header
-^^^^^^
-
+.Header
 -------------------
 [requirements]
 -------------------
 
 Wait on Other Tests
@@ -132,10 +130,26 @@
 
 -------------------
 [requirements]
 mode itemmatch
 -------------------
+
+Overriding Enviroment Variables
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Override variables before starting the test. Can include files (perhaps generated by megatest -envdelta or similar).
+
+--------------------
+[pre-launch-env-vars]
+VAR1 value1
+
+# Get some generated settings
+[include ../generated-vars.config]
+
+# Use this trick to unset variables
+#{scheme (unsetenv "FOOBAR")}
+--------------------
 
 Itemmap Handling
 ~~~~~~~~~~~~~~~~
 
 For cases were the dependent test has a similar but not identical
@@ -186,11 +200,12 @@
 [requirements]
 waiton A B
 
 [itemmap]
 A (\d+)/aa aa/\1
-B (\d+)/bb --------------------
+B (\d+)/bb 
+----------------------
 
 .Testconfig for Test D
 ----------------------
 [requirements]
 waiton C
@@ -384,10 +399,54 @@
 #  <testsuite>/<creationdate>
 # Within the archive the data is structured like this:
 #  <target>/<runname>/<test>/
 archive0 /mfs/myarchive-data/adisk1
 --------------
+
+Handling Environment Variables
+------------------------------
+
+It is often necessary to capture and or manipulate environment
+variables. Megatest has some facilities built in to help.
+
+Capture variables
+~~~~~~~~~~~~~~~~~
+
+.Commands
+------------------------------
+# capture the current enviroment into a db called envdat.db under
+# the context "before"
+megatest -envcap before
+
+# capture the current environment into a db called startup.db with 
+# context "after"
+megatest -envcap after startup.db
+
+# write the diff from before to after
+megatest -envdelta before-after -dumpmode bash
+------------------------------
+
+Dump modes include bash, csh and config. You can include config data
+into megatest.config or runconfigs.config.
+
+.Example of generating and using config data
+------------------------------
+megatest -envcap original
+# do some stuff here
+megatest -envcap munged
+megatest -envdelta original-munged -dumpmode ini -o modified.config
+------------------------------
+
+Then in runconfigs.config
+
+.Example of using modified.config in a testconfig
+------------------------------
+cat testconfig
+
+[pre-launch-env-vars]
+[include modified.config]
+------------------------------
 
 Programming API
 ---------------
 
 These routines can be called from the megatest repl. 

Index: docs/manual/server.png
==================================================================
--- docs/manual/server.png
+++ docs/manual/server.png
cannot compute difference between binary files

Index: env.scm
==================================================================
--- env.scm
+++ env.scm
@@ -27,11 +27,11 @@
     (set-busy-handler! db (busy-timeout 10000))
     db))
 
 ;; save vars in given context, this is NOT incremental by default
 ;;
-(define (env:save-env-vars db context #!key (incremental #f))
+(define (env:save-env-vars db context #!key (incremental #f)(vardat #f))
   (with-transaction
    db
    (lambda ()
      ;; first clear out any vars for this context
      (if (not incremental)(exec (sql db "DELETE FROM envvars WHERE context=?") context))
@@ -39,40 +39,83 @@
       (lambda (varval)
 	(let ((var (car varval))
 	      (val (cdr varval)))
 	  (if incremental (exec (sql db "DELETE FROM envvars WHERE context=? AND var=?") context var))
 	  (exec (sql db "INSERT INTO envvars (context,var,val) VALUES (?,?,?)") context var val)))
-	(get-environment-variables)))))
+	(if vardat
+	    (hash-table->alist vardat)
+	    (get-environment-variables))))))
 
-;; apply contexts to current environment
+;; merge contexts in the order given
 ;;  - each context is applied in the given order
 ;;  - variables in the paths list are split on the separator and the components
 ;;    merged using simple delta addition
+;;    returns a hash of the merged vars
+;;
+(define (env:merge-contexts db basecontext contexts paths)
+  (let ((result (make-hash-table)))
+    (for-each
+     (lambda (context)
+       (query
+	(for-each-row
+	 (lambda (row)
+	   (let ((var  (car row))
+		 (val  (cadr row)))
+	     (hash-table-set! result var 
+			      (if (and (hash-table-ref/default results var #f)
+				       (assoc var paths)) ;; this var is a path and there is a previous path
+				  (let ((sep (cadr (assoc var paths))))
+				    (env:merge-path-envvar sep (hash-table-ref results var) valb))
+				  valb)))))
+	(sql db "SELECT var,val FROM envvars WHERE context=?")
+	context))
+     contexts)
+    result))
+
+;;  get list of removed variables between two contexts
+;;
+(define (env:get-removed db contexta contextb)
+  (let ((result (make-hash-table)))
+    (query
+     (for-each-row
+      (lambda (row)
+	(let ((var  (car row))
+	      (val  (cadr row)))
+	  (hash-table-set! result var val))))
+     (sql db "SELECT var,val FROM envvars WHERE context=? AND var NOT IN (SELECT var FROM envvars WHERE context=?)")
+     contexta contextb)
+    result))
+
+;;  get list of variables added to contextb from contexta
+;;
+(define (env:get-added db contexta contextb)
+  (let ((result (make-hash-table)))
+    (query
+     (for-each-row
+      (lambda (row)
+	(let ((var  (car row))
+	      (val  (cadr row)))
+	  (hash-table-set! result var val))))
+     (sql db "SELECT var,val FROM envvars WHERE context=? AND var NOT IN (SELECT var FROM envvars WHERE context=?)")
+     contextb contexta)
+    result))
+
+;;  get list of variables in both contexta and contexb that have been changed
 ;;
-(define (env:apply-contexts db basecontext contexts paths outputf formats)
-  
-  (for-each
-   (lambda (context)
-     (query
-      (for-each-row
-       (lambda (row)
-	 (let ((var  (car row))
-	       (vala (cadr row))
-	       (valb (caddr row)))
-	    ;;(print "var: " var " vala: " vala " valb" valb " paths: " paths)
-	   (if (assoc var paths) ;; this var is a PATH
-	       (let ((current (get-environment-variable var))) ;; use this NOT vala
-	         ;;(pp paths)
-                 ;;(pp var)
-		 (env:process-path-envvar var (cadr (assoc var paths)) current valb))
-	       (begin
-		 (setenv var valb))))))
-      (sql db "SELECT b.var,a.val,b.val FROM envvars AS a JOIN envvars AS b ON a.var=b.var WHERE a.context=? AND b.context=? AND a.val != b.val")
-      ;;(sql db "SELECT b.var,a.val,b.val FROM envvars AS a JOIN envvars AS b ON a.var=b.var WHERE a.context=? AND b.context=?")
-      basecontext context))
-   contexts))
-
+(define (env:get-changed db contexta contextb)
+  (let ((result (make-hash-table)))
+    (query
+     (for-each-row
+      (lambda (row)
+	(let ((var  (car row))
+	      (val  (cadr row)))
+	  (hash-table-set! result var val))))
+     (sql db "SELECT var,val FROM envvars AS a WHERE context=? AND val != (SELECT val FROM envvars WHERE var=a.var AND context=?)")
+     contexta contextb)
+    result))
+
+;;
 (define (env:blind-merge l1 l2)
   (if (null? l1) l2
       (if (null? l2) l1
 	  (cons (car l1) (cons (car l2) (env:blind-merge (cdr l1) (cdr l2)))))))
 
@@ -88,13 +131,10 @@
 ;;     (print "AFTER:    " (string-intersperse pathb-parts  "\n       "))
 ;;     (print "COMMON:   " (string-intersperse common-parts "\n       "))
     (string-intersperse final separator)))
 
 (define (env:process-path-envvar varname separator patha pathb)
-  (begin
-    (print "Process-path-envvar: " varname)
-  ) 
   (let ((newpath (env:merge-path-envvar separator patha pathb)))
     (setenv varname newpath)))
 
 (define (env:have-context db context)
   (> (query fetch-value (sql db "SELECT count(id) FROM envvars WHERE context=?") context)
@@ -101,5 +141,71 @@
      0))
 
 ;; this is so the calling block does not need to import sql-de-lite
 (define (env:close-database db)
   (close-database db))
+
+(define (env:lazy-hash-table->alist indat)
+  (if (hash-table? indat)
+      (let ((dat (hash-table->alist indat)))
+	(if (null? dat)
+	    #f 
+	    dat))
+      #f))
+
+(define (env:print added removed changed)
+  (let ((a  (env:lazy-hash-table->alist added))
+	(r  (env:lazy-hash-table->alist removed))
+	(c  (env:lazy-hash-table->alist changed)))
+    (case (if (args:get-arg "-dumpmode")
+	      (string->symbol (args:get-arg "-dumpmode"))
+	      'bash)
+      ((bash)
+       (if a
+	   (begin
+	     (print "# Added vars")
+	     (map (lambda (dat)(print "export " (car dat) "=" (cdr dat)))
+		  (hash-table->alist added))))
+       (if r
+	   (begin
+	     (print "# Removed vars")
+	     (map (lambda (dat)(print "unset " (car dat)))
+		  (hash-table->alist removed))))
+       (if c
+	   (begin
+	     (print "# Changed vars")
+	     (map (lambda (dat)(print "export " (car dat) "=" (cdr dat)))
+		  (hash-table->alist changed)))))
+      ((csh)
+       (if a
+	   (begin
+	     (print "# Added vars")
+	     (map (lambda (dat)(print "setenv " (car dat) " " (cdr dat)))
+		  (hash-table->alist added))))
+       (if r
+	   (begin
+	     (print "# Removed vars")
+	     (map (lambda (dat)(print "unsetenv " (car dat)))
+		  (hash-table->alist removed))))
+       (if c
+	   (begin
+	     (print "# Changed vars")
+	     (map (lambda (dat)(print "setenv " (car dat) " " (cdr dat)))
+		  (hash-table->alist changed)))))
+      ((config ini)
+       (if a
+	   (begin
+	     (print "# Added vars")
+	     (map (lambda (dat)(print (car dat) " " (cdr dat)))
+		  (hash-table->alist added))))
+       (if r
+	   (begin
+	     (print "# Removed vars")
+	     (map (lambda (dat)(print "#{scheme (unsetenv \"" (car dat) "\")}"))
+		  (hash-table->alist removed))))
+       (if c
+	   (begin
+	     (print "# Changed vars")
+	     (map (lambda (dat)(print (car dat) " " (cdr dat)))
+		  (hash-table->alist changed)))))
+      (else
+       (debug:print 0 "ERROR: No dumpmode specified, use -dumpmode [bash|csh|config]")))))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -245,11 +245,11 @@
 		  (loop (+ count 1)))))
 
 	  (let ((sighand (lambda (signum)
 			   ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
 			   (if (eq? signum signal/stop)
-			 (debug:print 0 "ERROR: attempt to STOP process. Exiting."))
+			       (debug:print 0 "ERROR: attempt to STOP process. Exiting."))
 			   (set! *time-to-exit* #t)
 			   (print "Received signal " signum ", cleaning up before exit. Please wait...")
 			   (let ((th1 (make-thread (lambda ()
 						     (tests:test-force-state-status! run-id test-id "INCOMPLETE" "KILLED")
 						     (print "Killed by signal " signum ". Exiting")
@@ -284,11 +284,11 @@
 	  
 	  (debug:print 2 "Exectuing " test-name " (id: " test-id ") on " (get-host-name))
 	  (set! keys       (rmt:get-keys))
 	  ;; (runs:set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals) ;; these may be needed by the launching process
 	  ;; one of these is defunct/redundant ...
-	  (if (not (launch:setup-for-run force: #t))
+	  (if (not (launch:setup force: #t))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting") 
 		;; (sqlite3:finalize! db)
 		;; (sqlite3:finalize! tdb)
 		(exit 1)))
@@ -295,11 +295,11 @@
 	  (change-directory *toppath*) 
 
 	  ;; NOTE: Current order is to process runconfigs *before* setting the MT_ vars. This 
 	  ;;       seems non-ideal but could well break stuff
 	  ;;    BUG? BUG? BUG?
-
+	  
 	  (let ((rconfig (full-runconfigs-read))) ;; (read-config (conc  *toppath* "/runconfigs.config") #f #t sections: (list "default" target))))
 	    ;; (setup-env-defaults (conc *toppath* "/runconfigs.config") run-id (make-hash-table) keyvals target)
 	    ;; (set-run-config-vars run-id keyvals target) ;; (db:get-target db run-id))
 	    ;; Now have runconfigs data loaded, set environment vars
 	    (for-each (lambda (section)
@@ -431,12 +431,24 @@
 				 (if ezsteps
 				     (let* ((testconfig ;; (read-config (conc work-area "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) ;; FIXME??? is allow-system ok here?
 					     ;; NOTE: it is tempting to turn off force-create of testconfig but dynamic
 					     ;;       ezstep names need a full re-eval here.
 					     (tests:get-testconfig test-name tconfigreg #t force-create: #t)) ;; 'return-procs)))
-					    (ezstepslst (hash-table-ref/default testconfig "ezsteps" '())))
-				       (hash-table-set! *testconfigs* test-name testconfig) ;; cached for lazy reads later ...
+					    (ezstepslst (if (hash-table? testconfig)
+							    (hash-table-ref/default testconfig "ezsteps" '())
+							    #f)))
+				       (if testconfig
+					   (hash-table-set! *testconfigs* test-name testconfig) ;; cached for lazy reads later ...
+					   (begin
+					     (launch:setup)
+					     (debug:print 0 "WARNING: no testconfig found for " test-name " in search path:\n  "
+							  (string-intersperse (tests:get-tests-search-path *configdat*) "\n  "))))
+				       ;; after all that, still no testconfig? Time to abort
+				       (if (not testconfig)
+					   (begin
+					     (debug:print 0 "ERROR: Failed to resolve megatest.config, runconfigs.config and testconfig issues. Giving up now")
+					     (exit 1)))
 				       (if (not (file-exists? ".ezsteps"))(create-directory ".ezsteps"))
 				       ;; if ezsteps was defined then we are sure to have at least one step but check anyway
 				       (if (not (> (length ezstepslst) 0))
 					   (debug:print 0 "ERROR: ezsteps defined but ezstepslst is zero length")
 					   (let loop ((ezstep (car ezstepslst))
@@ -580,106 +592,132 @@
 	    (debug:print 2 "Output from running " fullrunscript ", pid " (launch:einf-pid exit-info) " in work area " 
 			 work-area ":\n====\n exit code " (launch:einf-exit-code exit-info) "\n" "====\n")
 	    (if (not (launch:einf-exit-status exit-info))
 		(exit 4)))))))
 
-;; set up the very basics needed for doing anything here.
-(define (launch:setup-for-run #!key (force #f))
-  ;; would set values for KEYS in the environment here for better support of env-override but 
-  ;; have chicken/egg scenario. need to read megatest.config then read it again. Going to 
-  ;; pass on that idea for now
-  ;; special case
-  (if (or force (not (hash-table? *configdat*)))  ;; no need to re-open on every call
-      (begin
-	(set! *configinfo* (or (if (get-environment-variable "MT_CMDINFO") ;; we are inside a test - do not reprocess configs
-				   (let ((alistconfig (conc (get-environment-variable "MT_LINKTREE") "/"
-							    (get-environment-variable "MT_TARGET")   "/"
-							    (get-environment-variable "MT_RUNNAME")  "/"
-							    ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
-				     (if (file-exists? alistconfig)
-					 (list (configf:read-alist alistconfig)
-					       (get-environment-variable "MT_RUN_AREA_HOME"))
-					 #f))
-				   #f) ;; no config cached - give up
-			       (let ((runname (or (args:get-arg "-runname")(args:get-arg ":runname"))))
-				 (if runname (setenv "MT_RUNNAME" runname))
-				 (find-and-read-config 
-				  (if (args:get-arg "-config")(args:get-arg "-config") "megatest.config")
-				  environ-patt: "env-override"
-				  given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
-				  pathenvvar: "MT_RUN_AREA_HOME"))))
-	(set! *configdat*  (if (car *configinfo*)(car *configinfo*) #f))
-	(set! *toppath*    (if (car *configinfo*)(cadr *configinfo*) #f))
-	(let* ((tmptransport (configf:lookup *configdat* "server" "transport"))
-	       (transport    (if tmptransport (string->symbol tmptransport) 'http)))
-	  (if (member transport '(http rpc nmsg))
-	      (set! *transport-type* transport)
-	      (begin
-		(debug:print 0 "ERROR: Unrecognised transport " transport)
-		(exit))))
-	(let ((linktree (configf:lookup *configdat* "setup" "linktree"))) ;; link tree is critical
-	  (if linktree
-	      (if (not (file-exists? linktree))
-		  (begin
-		    (handle-exceptions
-		     exn
-		     (begin
-		       (debug:print 0 "ERROR: Something went wrong when trying to create linktree dir at " linktree)
-		       (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
-		       (exit 1))
-		     (create-directory linktree #t))))
-	      (begin
-		(debug:print 0 "ERROR: linktree not defined in [setup] section of megatest.config")
-		(exit 1)))
-	  (if linktree
-	      (let ((dbdir (conc linktree "/.db")))
-		(handle-exceptions
-		 exn
-		 (begin
-		   (debug:print 0 "ERROR: failed to create the " dbdir " area for your database files")
-		   (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn)))
-		 (if (not (directory-exists? dbdir))(create-directory dbdir)))
-		(setenv "MT_LINKTREE" linktree))
-	      (begin
-		(debug:print 0 "ERROR: linktree is required in your megatest.config [setup] section")
-		(exit 1)))
-	  (if (and *toppath*
-		   (directory-exists? *toppath*))
-	      (setenv "MT_RUN_AREA_HOME" *toppath*)
-	      (begin
-		(debug:print 0 "ERROR: failed to find the top path to your Megatest area.")
-		(exit 1)))
-	  )))
-  *toppath*)
-
-(define (launch:cache-config)
-  ;; if we have a linktree and -runtests and -target and the directory exists dump the config
-  ;; to megatest-(current-seconds).cfg and symlink it to megatest.cfg
-  (if (and *configdat* 
-	   (or (args:get-arg "-run")
-	       (args:get-arg "-runtests")))
-      (let* ((linktree (get-environment-variable "MT_LINKTREE"))
-	     (target   (common:args-get-target))
-	     (runname  (or (args:get-arg "-runname")
-			   (args:get-arg ":runname")))
-	     (fulldir  (conc linktree "/"
-			     target "/"
-			     runname)))
-	(debug:print-info 0 "Have -runtests with target=" target ", runname=" runname ", fulldir=" fulldir ", testpatt=" (or (args:get-arg "-testpatt") "%"))
-	(if (file-exists? linktree) ;; can't proceed without linktree
-	    (begin
-	      (if (not (file-exists? fulldir))
-		  (create-directory fulldir #t)) ;; need to protect with exception handler 
-	      (if (and target
-		       runname
-		       (file-exists? fulldir))
-		  (let ((tmpfile  (conc fulldir "/.megatest.cfg." (current-seconds)))
-			(targfile (conc fulldir "/.megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
-		    (debug:print-info 0 "Caching megatest.config in " fulldir "/.megatest.cfg")
-		    (configf:write-alist *configdat* tmpfile)
-		    (system (conc "ln -sf " tmpfile " " targfile))
-		    )))))))
+;; gather available information, if legit read configs in this order:
+;;
+;;   if have cache;
+;;      read it a return it
+;;   else
+;;     megatest.config     (do not cache)
+;;     runconfigs.config   (cache if all vars avail)
+;;     megatest.config     (cache if all vars avail)
+;;   returns:
+;;     *toppath*
+;;   side effects:
+;;     sets; *configdat*    (megatest.config info)
+;;           *runconfigdat* (runconfigs.config info)
+;;           *configstatus* (status of the read data)
+;;
+(define (launch:setup #!key (force #f))
+  (let* ((toppath  (or *toppath* (getenv "MT_RUN_AREA_HOME"))) ;; preserve toppath
+	 (runname  (common:args-get-runname))
+	 (target   (common:args-get-target))
+	 (linktree (common:get-linktree))
+	 (sections (if target (list "default" target) #f)) ;; for runconfigs
+	 (mtconfig (or (args:get-arg "-config") "megatest.config")) ;; allow overriding megatest.config 
+	 (rundir   (if (and runname target linktree)(conc linktree "/" target "/" runname) #f))
+	 (mtcachef (and rundir (conc rundir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
+	 (rccachef (and rundir (conc rundir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
+	 (cancreate (and rundir (file-exists? rundir)(file-write-access? rundir))))
+    ;; (print "runname: " runname " target: " target " mtcachef: " mtcachef " rccachef: " rccachef)
+    (set! *toppath* toppath) ;; This is needed when we are running as a test using CMDINFO as a datasource
+    (cond
+     ;; data was read and cached and available in *configstatus*, toppath has already been set
+     ((eq? *configstatus* 'fulldata)
+      *toppath*)
+     ;; if mtcachef exists just read it, however we need to assume toppath is available in $MT_RUN_AREA_HOME
+     ((and mtcachef (file-exists? mtcachef) (get-environment-variable "MT_RUN_AREA_HOME"))
+      (set! *configdat*    (configf:read-alist mtcachef))
+      (set! *runconfigdat* (configf:read-alist rccachef))
+      (set! *configinfo*   (list *configdat*  (get-environment-variable "MT_RUN_AREA_HOME")))
+      (set! *configstatus* 'fulldata)
+      (set! *toppath*      (get-environment-variable "MT_RUN_AREA_HOME"))
+      *toppath*)
+     ;; we have all the info needed to fully process runconfigs and megatest.config
+     (mtcachef              
+      (let* ((first-pass (find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
+				  mtconfig
+				  environ-patt: "env-override"
+				  given-toppath: toppath
+				  pathenvvar: "MT_RUN_AREA_HOME"))
+	     (first-rundat  (read-config (conc toppath "/runconfigs.config") *runconfigdat* #t 
+					 sections: sections)))
+	(set! *runconfigdat* first-rundat)
+	(if first-pass  ;; 
+	    (begin
+	      (set! *configdat*  (car first-pass))
+	      (set! *configinfo* first-pass)
+	      (set! *toppath*    (or toppath (cadr first-pass))) ;; use the gathered data unless already have it
+	      (set! toppath      *toppath*)
+	      (setenv "MT_RUN_AREA_HOME" *toppath*)
+	      ;; the seed read is done, now read runconfigs, cache it then read megatest.config one more time and cache it
+	      (let* ((keys         (rmt:get-keys))
+		     (key-vals     (keys:target->keyval keys target))
+		     (linktree     (or (getenv "MT_LINKTREE")
+				       (if *configdat* (configf:lookup *configdat* "setup" "linktree") #f)))
+		     (second-pass  (find-and-read-config
+				    mtconfig
+				    environ-patt: "env-override"
+				    given-toppath: toppath
+				    pathenvvar: "MT_RUN_AREA_HOME"))
+		     (runconfigdat (begin     ;; this read of the runconfigs will see any adjustments made by re-reading megatest.config
+				     (for-each (lambda (kt)
+						 (setenv (car kt) (cadr kt)))
+					       key-vals)
+				     (read-config (conc toppath "/runconfigs.config") *runconfigdat* #t 
+						  sections: sections))))
+		(if cancreate (configf:write-alist runconfigdat rccachef))
+		(set! *runconfigdat* runconfigdat)
+		(if cancreate (configf:write-alist *configdat* mtcachef))
+		(if cancreate (set! *configstatus* 'fulldata))))
+	    ;; no configs found? should not happen but let's try to recover gracefully, return an empty hash-table
+	    (set! *configdat* (make-hash-table))
+	    )))
+     ;; else read what you can and set the flag accordingly
+     (else
+      (let* ((cfgdat   (find-and-read-config 
+			(or (args:get-arg "-config") "megatest.config")
+			environ-patt: "env-override"
+			given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
+			pathenvvar: "MT_RUN_AREA_HOME")))
+	(if cfgdat
+	    (let* ((toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
+		   (rdat     (read-config (conc toppath
+						"/runconfigs.config") *runconfigdat* #t sections: sections)))
+	      (set! *configinfo*   cfgdat)
+	      (set! *configdat*    (car cfgdat))
+	      (set! *runconfigdat* rdat)
+	      (set! *toppath*      toppath)
+	      (set! *configstatus* 'partial))
+	    (begin
+	      (debug:print 0 "ERROR: No " mtconfig " file found. Giving up.")
+	      (exit 2))))))
+    ;; additional house keeping
+    (let* ((linktree (or (getenv "MT_LINKTREE")
+			 (if *configdat* (configf:lookup *configdat* "setup" "linktree") #f))))
+      (if linktree
+	  (if (not (file-exists? linktree))
+	      (begin
+		(handle-exceptions
+		 exn
+		 (begin
+		   (debug:print 0 "ERROR: Something went wrong when trying to create linktree dir at " linktree)
+		   (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+		   (exit 1))
+		 (create-directory linktree #t))))
+	  (begin
+	    (debug:print 0 "ERROR: linktree not defined in [setup] section of megatest.config")
+	    ;; (exit 1)
+	    )))
+    (if (and *toppath*
+	     (directory-exists? *toppath*))
+	(setenv "MT_RUN_AREA_HOME" *toppath*)
+	(begin
+	  (debug:print 0 "ERROR: failed to find the top path to your Megatest area.")))
+    *toppath*))
 
 (define (get-best-disk confdat testconfig)
   (let* ((disks   (or (and testconfig (hash-table-ref/default testconfig "disks" #f))
 		      (hash-table-ref/default confdat "disks" #f)))
 	 (minspace (let ((m (configf:lookup confdat "setup" "minspace")))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -233,10 +233,11 @@
 			"-port"
 			"-extract-ods"
 			"-pathmod"
 			"-env2file"
 			"-envcap"
+			"-envdelta"
 			"-setvars"
 			"-set-state-status"
 			"-set-run-status"
 			"-debug" ;; for *verbosity* > 2
 			"-gen-megatest-test"
@@ -312,14 +313,18 @@
 			"-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))  " ")))
 
 ;; immediately set MT_TARGET if -reqtarg or -target are available
 ;;
@@ -463,11 +468,11 @@
     (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
@@ -662,10 +667,53 @@
 ;; 		(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 0 "ERROR: 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,51 +720,51 @@
 
 (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 0 "ERROR: 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)
-    ;;         (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")
-    ;;     	  (begin
-    ;;     	    ;; (if run-id 
-    ;;     	    ;;     (client:launch run-id) 
-    ;;     	    ;;     (client:launch 0)      ;; without run-id we'll start a server for "0"
-    ;;     	    #t
-    ;;     	    ))))))
+    (if (null? (lset-intersection 
+		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")
+		  (begin
+		    ;; (if run-id 
+		    ;;     (client:launch run-id) 
+		    ;;     (client:launch 0)      ;; without run-id we'll start a server for "0"
+		    #t
+		    ))))))
 
 ;; 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 '())
@@ -779,27 +827,50 @@
 	 (json-write targets))
 	(else
 	 (debug:print 0 "ERROR: dump output format " (args:get-arg "-dumpmode") " not supported for -list-targets")))
       (set! *didsomething* #t)))
 
+;; get the runconfigs
+;;
 (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))
-
+  (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")
@@ -817,11 +888,11 @@
 	  (debug:print 0 "ERROR: -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")
@@ -954,11 +1025,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") 
@@ -1285,11 +1356,11 @@
 	  (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)))
@@ -1443,11 +1514,11 @@
 	  (change-directory toppath)
 	  (if (not target)
 	      (begin
 		(debug:print 0 "ERROR: -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")
 		(exit 1)))
 	  (let* ((keys     (rmt:get-keys))
 		 ;; db:test-get-paths must not be run remote
@@ -1549,11 +1620,11 @@
 	     (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")
 	      (exit 1)))
 	(if (and state status)
 	    (rmt:teststep-set-status! run-id test-id step state status msg logfile)
@@ -1597,11 +1668,11 @@
 	       (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))
+	  (if (not (launch:setup))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 
 	  (if (args:get-arg "-runstep")(debug:print-info 1 "Running -runstep, first change to directory " work-area))
@@ -1702,11 +1773,11 @@
 
 (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")
 	    (exit 1)))
       (set! keys (rmt:get-keys)) ;;  db))
       (debug:print 1 "Keys: " (string-intersperse keys ", "))
@@ -1733,21 +1804,21 @@
 ;; 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") 
 	    (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") 
 	    (exit 1)))
       ;; keep this one local
       ;; (open-run-close db:clean-up #f)
@@ -1762,11 +1833,11 @@
        )
       (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
 	    (exit 1)))
       (open-run-close db:find-and-mark-incomplete #f)
       (set! *didsomething* #t)))
@@ -1775,11 +1846,11 @@
 ;; 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") 
 	    (exit 1)))
       ;; now can find our db
       ;; keep this one local
@@ -1792,11 +1863,11 @@
 
 ;; fakeout readline
 
 (if (or (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)
@@ -1823,11 +1894,11 @@
 
 (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") 
 	    (exit 1)))
       (operate-on 'run-wait)
       (set! *didsomething* #t)))
@@ -1879,28 +1950,10 @@
        #f ;; do all run-ids
        'new2old
        )
       (set! *didsomething* #t)))
 
-;;======================================================================
-;; Capture, save and manipulate environments
-;;======================================================================
-
-(let ((envcap (args:get-arg "-envcap")))
-  (if envcap
-      (if (substring-index "=" envcap)
-	  (let* ((parts   (string-split envcap "="))
-		 (fname   (car parts))
-		 (context (cadr parts))
-		 (db      (env:open-db fname)))
-	    (env:save-env-vars db context)
-	    (env:close-database db)
-	    (set! *didsomething* #t))
-	  (begin
-	    (debug:print 0 "ERROR: Parameter to -envcap should be <filename>=<context>. E.G. envdat=original, got: " envcap)
-	    (set! *didsomething* #t)))))
-
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================
 
 (if *runremote* (close-all-connections!))

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -67,11 +67,11 @@
 (if (args:get-arg "-h")
     (begin
       (print help)
       (exit)))
 
-(if (not (launch:setup-for-run))
+(if (not (launch:setup))
     (begin
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
 ;; (if (args:get-arg "-host")

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -40,11 +40,11 @@
 ;; NOT YET UTILIZED
 ;;
 (define (runs:create-run-record)
   (let* ((mconfig      (if *configdat*
 		           *configdat*
-		           (if (launch:setup-for-run)
+		           (if (launch:setup)
 		               *configdat*
 		               (begin
 		                 (debug:print 0 "ERROR: Called setup in a non-megatest area, exiting")
 		                 (exit 1)))))
 	  (runrec      (runs:runrec-make-record))
@@ -1780,12 +1780,11 @@
       (debug:print 0 "ERROR: Missing required parameter for " switchname ", you must specify the run name with -runname runname")
       (exit 3))
      (else
       (let (;; (db   #f)
 	    (keys #f))
-	(if (launch:setup-for-run)
-	    (launch:cache-config)
+	(if (not (launch:setup))
 	    (begin 
 	      (debug:print 0 "Failed to setup, exiting")
 	      (exit 1)))
 	(set! keys (keys:config-get-fields *configdat*))
 	;; have enough to process -target or -reqtarg here

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -207,11 +207,11 @@
   (let ((tdbdat (tasks:open-db)))
     (let* ((host-port (let ((slst (string-split   host:port ":")))
 			(if (eq? (length slst) 2)
 			    (list (car slst)(string->number (cadr slst)))
 			    #f)))
-	   (toppath       (launch:setup-for-run))
+	   (toppath       (launch:setup))
 	   (server-db-dat (if (not host-port)(tasks:get-server (db:delay-if-busy tdbdat) run-id) #f)))
       (if (not run-id)
 	  (begin
 	    (debug:print 0 "ERROR: must specify run-id when doing ping, -run-id n")
 	    (print "ERROR: No run-id")

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -93,10 +93,13 @@
 # -runtests automatically deletes the records for tests with the listed states on starting up a run allowing them to re-run
 #     (nb// this is in addition to NOT_STARTED which is automatically re-run)
 #
 allow-auto-rerun INCOMPLETE ZERO_ITEMS
 # could add: STUCK STUCK/DEAD UNKNOWN KILLED KILLREQ PREQ_DISCARD
+
+# Try this
+reruns 0
 
 [validvalues]
 state start end 0 1 - 2
 status pass fail n/a 0 1 running - 2