@@ -551,11 +551,11 @@
 	 (runconfigf   (conc  *toppath* "/runconfigs.config")))
     ;; on the first pass or call to run-tests set FAILS to NOT_STARTED if
     ;; -keepgoing is specified
 
     (if (file-exists? runconfigf)
-	(setup-env-defaults db runconfigf run-id *already-seen-runconfig-info*)
+	(setup-env-defaults db runconfigf run-id *already-seen-runconfig-info* environ-patt: ".*")
 	(debug:print 0 "WARNING: You do not have a run config file: " runconfigf))
 
     (if (and (eq? *passnum* 0)
 	     (args:get-arg "-keepgoing"))
 	(begin
@@ -832,11 +832,11 @@
 	 (test-names  '())
 	 (runconfigf   (conc  *toppath* "/runconfigs.config"))
 	 (required-tests '()))
 
     (if (file-exists? runconfigf)
-	(setup-env-defaults db runconfigf run-id *already-seen-runconfig-info*)
+	(setup-env-defaults db runconfigf run-id *already-seen-runconfig-info* "pre-launch-env-vars")
 	(debug:print 0 "WARNING: You do not have a run config file: " runconfigf))
     
     ;; look up all tests matching the comma separated list of globs in
     ;; test-patts (using % as wildcard)
     (for-each 
@@ -1195,12 +1195,12 @@
 	      (exit 1)))
 	(set! db   (open-db))
 	(set! keys (db-get-keys db))
 	;; have enough to process -target or -reqtarg here
 	(if (args:get-arg "-reqtarg")
-	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; evaluate all 
-		   (runconfig  (read-config runconfigf #f #f environ-patt: ".*"))) 
+	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
+		   (runconfig  (read-config runconfigf #f #f environ-patt: #f))) 
 	      (if (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f)
 		  (keys:target-set-args keys (args:get-arg "-reqtarg") args:arg-hash)
 		  (begin
 		    (debug:print 0 "ERROR: [" (args:get-arg "-reqtarg") "] not found in " runconfigf)
 		    (sqlite3:finalize! db)