@@ -112,10 +112,12 @@
 Launching and managing runs
   -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, use -keep-records to remove only
                             the run data.
+  -kill-runs               : kill existing run(s) (all incomplete tests killed)
+  -kill-rerun              : kill an existing run (all incomplete tests killed and run is rerun)
   -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
                             and then run the specified testpatt with -preclean
   -rerun-all              : set all tests to NOT_STARTED,n/a and run with -preclean
@@ -293,10 +295,11 @@
 			"-set-toplog"
 			"-runstep"
 			"-logpro"
 			"-m"
 			"-rerun"
+
 			"-days"
 			"-rename-run"
 			"-to"
 			;; values and messages
 			":category"
@@ -405,10 +408,12 @@
 			"-test-paths" ;; get path(s) to a test, ordered by youngest first
 
 			"-runall"    ;; run all tests, respects -testpatt, defaults to %
 			"-run"       ;; alias for -runall
 			"-remove-runs"
+                        "-kill-runs"
+                        "-kill-rerun"
                         "-keep-records" ;; use with -remove-runs to remove only the run data
 			"-rebuild-db"
 			"-cleanup-db"
 			"-rollup"
 			"-update-meta"
@@ -573,11 +578,11 @@
 		       (process:children #f))
 		      (original-exit exit-code)))))
 
 ;; for some switches always print the command to stderr
 ;;
-(if (args:any? "-run" "-runall" "-remove-runs" "-set-state-status")
+(if (args:any? "-run" "-runall" "-remove-runs" "-set-state-status" "-kill-runs" "-kill-rerun")
     (debug:print 0 *default-log-port* (string-intersperse (argv) " ")))
 
 ;; some switches imply homehost. Exit here if not on homehost
 ;;
 (let ((homehost-required  (list "-cleanup-db" "-server")))
@@ -1040,11 +1045,11 @@
       (exit 1))
      ((not (or (args:get-arg ":runname")
 	       (args:get-arg "-runname")))
       (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify the run name pattern with -runname patt")
       (exit 2))
-     ((not (args:get-arg "-testpatt"))
+     ((not (or (args:get-arg "-testpatt") (eq? action 'kill-runs)))
       (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify the test pattern with -testpatt")
       (exit 3))
      (else
       (if (not (car *configinfo*))
 	  (begin
@@ -1061,10 +1066,46 @@
 			      state: (common:args-get-state)
 			      status: (common:args-get-status)
 			      new-state-status: (args:get-arg "-set-state-status")
                               mode: mode)))
       (set! *didsomething* #t)))))
+
+(if (args:get-arg "-kill-runs")
+    (general-run-call 
+     "-kill-runs"
+     "kill runs"
+     (lambda (target runname keys keyvals)
+       (operate-on 'kill-runs mode: #f)
+       )))
+
+(if (args:get-arg "-kill-rerun")
+    (let* ((target-patt (args:get-arg "-target"))
+           (runname-patt (args:get-arg "-runname")))
+      (cond ((not target-patt)
+             (debug:print-error 0 *default-log-port* "Missing target, must specify target for -kill-rerun with -target <target name>")
+             (exit 1))
+            ((not runname-patt)
+             (debug:print-error 0 *default-log-port* "Missing runname, must specify runname for -kill-rerun with -runname <run name>")
+             (exit 1))
+            ((string-search "[ ,%]" target-patt)
+             (debug:print-error 0 *default-log-port* "Invalid target ["target-patt"], must specify exact target (no wildcards) for -kill-rerun with -target <target name>")
+             (exit 1))
+            ((string-search "[ ,%]" runname-patt)
+             (debug:print-error 0 *default-log-port* "Invalid runname ["runname-patt"], must specify exact runname (no wildcards) for -kill-rerun with -runname <runname name>")
+             (exit 1))
+            (else
+             (general-run-call 
+              "-kill-runs"
+              "kill runs"
+              (lambda (target runname keys keyvals)
+                (operate-on 'kill-runs mode: #f)
+                ))
+      
+             (thread-sleep! 15))
+            ;; fall thru and let "-run" loop fire
+            )))
+
 
 (if (args:get-arg "-remove-runs")
     (general-run-call 
      "-remove-runs"
      "remove runs"
@@ -1624,18 +1665,19 @@
 ;; run all tests are are Not COMPLETED and PASS or CHECK
 (if (or (args:get-arg "-runall")
 	(args:get-arg "-run")
 	(args:get-arg "-rerun-clean")
 	(args:get-arg "-rerun-all")
-	(args:get-arg "-runtests"))
+	(args:get-arg "-runtests")
+        (args:get-arg "-kill-rerun"))
     (let ((need-clean (or (args:get-arg "-rerun-clean")
                           (args:get-arg "-rerun-all"))))
       (general-run-call 
        "-runall"
        "run all tests"
        (lambda (target runname keys keyvals)
-         (if (args:get-arg "-rerun-clean") ;; first set states/statuses correct
+         (if (or (args:get-arg "-kill-rerun") (args:get-arg "-rerun-clean")) ;; first set states/statuses correct
 	     ;; For rerun-clean do we or do we not support the testpatt?
              (let ((states   (or (configf:lookup *configdat* "validvalues" "cleanrerun-states")
                                  "KILLREQ,KILLED,UNKNOWN,INCOMPLETE,STUCK,NOT_STARTED"))
                    (statuses (or (configf:lookup *configdat* "validvalues" "cleanrerun-statuses")
                                  "FAIL,INCOMPLETE,ABORT,CHECK,DEAD,PREQ_FAIL,PREQ_DISCARDED")))