Index: launch.scm ================================================================== --- launch.scm +++ launch.scm @@ -555,11 +555,12 @@ (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* - (args:get-arg "-runtests")) + (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 "/" Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -1171,11 +1171,11 @@ ;; - step completed, exit status, timestamp ;; 6. test phone home ;; - if test run time > allowed run time then kill job ;; - if cannot access db > allowed disconnect time then kill job -(if (args:get-arg "-runtests") +(if (or (args:get-arg "-run")(args:get-arg "-runtests")) (general-run-call "-runtests" "run a test" (lambda (target runname keys keyvals) ;; @@ -1608,11 +1608,12 @@ ;;====================================================================== ;; Wait on a run to complete ;;====================================================================== (if (and (args:get-arg "-run-wait") - (not (args:get-arg "-runtests"))) ;; run-wait is built into runtests now + (not (or (args:get-arg "-run") + (args:get-arg "-runtests")))) ;; run-wait is built into runtests now (begin (if (not (launch:setup-for-run)) (begin (debug:print 0 "Failed to setup, exiting") (exit 1))) @@ -1679,14 +1680,14 @@ (set! *time-to-exit* #t) (thread-join! *watchdog*) (if (not (eq? *globalexitstatus* 0)) - (if (or (args:get-arg "-runtests")(args:get-arg "-runall")) + (if (or (args:get-arg "-run")(args:get-arg "-runtests")(args:get-arg "-runall")) (begin (debug:print 0 "NOTE: Subprocesses with non-zero exit code detected: " *globalexitstatus*) (exit 0)) (case *globalexitstatus* ((0)(exit 0)) ((1)(exit 1)) ((2)(exit 2)) (else (exit 3)))))