@@ -51,11 +51,11 @@
   waitons testmode  newtal itemmaps prereqs-not-met)
 
 ;; set up needed environment variables given a run-id and optionally a target, itempath etc.
 ;;
 (define (runs:set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f)(intarget #f)(testname #f)(itempath #f))
-  ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
+  (bb-check-path msg: "runs:set-megatest-env-vars entry")
   (let* ((target    (or intarget 
 			(common:args-get-target)
 			(get-environment-variable "MT_TARGET")))
 	 (keys      (if inkeys    inkeys    (rmt:get-keys)))
 	 (keyvals   (if inkeyvals inkeyvals (keys:target->keyval keys target)))
@@ -85,10 +85,11 @@
        (safe-setenv key val)))
     ;;(bb-check-path msg: "runs:set-megatest-env-vars block 1")
     ;;(BB> "*env-vars-by-run-id*/runid("run-id" vals="(hash-table->alist vals))
 
     (if (not (get-environment-variable "MT_TARGET"))(setenv "MT_TARGET" target))
+    (bb-check-path msg: "runs:set-megatest-env-vars block 1")
     ;; we had a case where there was an exception generated by the hash-table-ref
     ;; due to *configdat* being #f Adding a handle and exit
     (let fatal-loop ((count 0)) 
       (handle-exceptions
 	  exn
@@ -103,23 +104,24 @@
 		  (debug:print 0 *default-log-port* "FATAL: *configdat* was inaccessible! This should never happen. Retried " count " times. Message: " msg)
 		  (debug:print 0 *default-log-port* "Call chain:")
 		  (with-output-to-port *default-log-port*
 		    (lambda ()(pp call-chain)))
 		  (exit 1))))
-          ;;(bb-check-path msg: "runs:set-megatest-env-vars block 1.5")
+          (bb-check-path msg: "runs:set-megatest-env-vars block 1.5")
           (alist->env-vars (hash-table-ref/default *configdat* "env-override" '())))) ;;;; environment is tainted HERE in this let block.
-    ;;(bb-check-path msg: "runs:set-megatest-env-vars block 2")
+    (bb-check-path msg: "runs:set-megatest-env-vars block 2")
+    
     ;; Lets use this as an opportunity to put MT_RUNNAME in the environment
     (let ((runname  (if inrunname inrunname (rmt:get-run-name-from-id run-id))))
       (if runname
 	  (setenv "MT_RUNNAME" runname)
 	  (debug:print-error 0 *default-log-port* "no value for runname for id " run-id)))
     (setenv "MT_RUN_AREA_HOME" *toppath*)
     ;; if a testname and itempath are available set the remaining appropriate variables
     (if testname (setenv "MT_TEST_NAME" testname))
     (if itempath (setenv "MT_ITEMPATH"  itempath))
-    ;;(bb-check-path msg: "runs:set-megatest-env-vars block 3")
+    (bb-check-path msg: "runs:set-megatest-env-vars block 3")
     (if (and testname link-tree)
 	(setenv "MT_TEST_RUN_DIR" (conc (getenv "MT_LINKTREE")  "/"
 					(getenv "MT_TARGET")    "/"
 					(getenv "MT_RUNNAME")   "/"
 					(getenv "MT_TEST_NAME")