@@ -72,11 +72,11 @@
   -h                      : this help
   -manual                 : show the Megatest user manual
   -version                : print megatest version (currently " megatest-version ")
 
 Launching and managing runs
-  -runall                 : run all tests or as specified by -testpatt
+  -run                    : run all tests or as specified by -testpatt
   -remove-runs            : remove the data for a run, requires -runname and -testpatt
                             Optionally use :state and :status
   -set-state-status X,Y   : set state to X and status to Y, requires controls per -remove-runs
   -rerun FAIL,WARN...     : force re-run for tests with specificed status(s)
   -rerun-clean            : set all tests not COMPLETED+PASS,WARN,WAIVED to NOT_STARTED,n/a
@@ -462,11 +462,12 @@
 	;; (args:get-arg "-remove-runs")
 	;; (args:get-arg "-runstep"))
     (let ((original-exit (exit-handler)))
       (exit-handler (lambda (#!optional (exit-code 0))
 		      (printf "Preparing to exit with exit code ~A ...\n" exit-code)
-		      (for-each 
+		      (for-each
+		       
 		       (lambda (pid)
 			 (handle-exceptions
 			  exn
 			  #t
 			  (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
@@ -476,10 +477,15 @@
 					    (printf "Sending signal/term to ~A\n" pid)
 					    (process-signal pid signal/term))))))
 		       (process:children #f))
 		      (original-exit exit-code)))))
 
+;; for some switches alway print the command to stderr
+;;
+(if (args:any? "-run" "-runall" "-list-runs" "-remove-runs" "-set-state-status")
+    (debug:print 0 *default-log-port* (string-intersperse (argv) " ")))
+
 ;;======================================================================
 ;; Misc setup stuff
 ;;======================================================================
 
 (debug:setup)