@@ -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))