Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -104,11 +104,11 @@
 	      (pid #f))
 	 (let ((proc (lambda ()
 		       (set! pid (process-run "/bin/bash" (list "-c" cmd))))))
 	   (if subrun
                (begin
-                 (debug:print-info 0 *default-log-port* "Running without MT_.* environment variables.")
+                 (debug:print-info 0 *default-log-port* "Running "cmd" without MT_.* environment variables.")
                  (common:without-vars proc "^MT_.*"))
 	       (proc)))
 	 
          (with-output-to-file "Makefile.ezsteps"
            (lambda ()

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -159,11 +159,11 @@
 	;; 5. fix testpatt or calculate it from contour
 	;; 6. launch the run
 	;; 7. roll up the run result and or roll up the logpro processed result
 	(when (configf:lookup testconfig "subrun" "runwait") ;; we use runwait as the flag that a subrun is requested
             (subrun:initialize-toprun-test testconfig test-run-dir)
-	    (let* ((mt-cmd (subrun:launch-cmd test-run-dir)))
+	    (let* ((mt-cmd (subrun:launch-cmd test-run-dir (configf:lookup testconfig "subrun" "runwait"))))
               (debug:print-info 0 *default-log-port* "Subrun command is \"" mt-cmd "\"")
               (set! ezsteps #t) ;; set the needed flag
 	      (set! ezstepslst
                     (append (or ezstepslst '())
                             (list (list "subrun" (conc "{subrun=true} " mt-cmd)))))))

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -128,17 +128,17 @@
              (kill-result
               (subrun:exec-sub-megatest test-run-dir action-switches-str "kill")))
         kill-result)
       #t))
 
-(define (subrun:launch-cmd test-run-dir #!optional (sub-cmd "-run")) ;; BUG: "-run" should be changed to "-rerun-clean" but current doesn't work
+(define (subrun:launch-cmd test-run-dir run-mode #!optional (sub-cmd "-run")) ;; BUG: "-run" should be changed to "-rerun-clean" but current doesn't work
   (if (subrun:subrun-removed? test-run-dir)
       (subrun:unset-subrun-removed test-run-dir))      
 
   (let* ((log-prefix "run")
          (switches (subrun:selector+log-switches test-run-dir log-prefix))
-         (run-wait #t)
+         (run-wait (equal? run-mode "yes"))
          (cmd      (conc "megatest " sub-cmd " " switches" "
                          (if run-wait "-run-wait " ""))))
     cmd))