Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -109,13 +109,14 @@
 
 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)
+                            the run data. Use -kill-wait to override the 10 second
+                            per test wait after kill delay. 
+  -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
@@ -129,11 +130,11 @@
   -no-cache               : do not use the cached config files. 
   -one-pass               : launch as many tests as you can but do not wait for more to be ready
   -remove-keep N          : remove all but N most recent runs per target; use '-actions, -age, -precmd'
   -age <age>              : 120d,3h,20m to apply only to runs older than the 
                                  specified age. NB// M=month, m=minute
-  -actions <action>       : print,remove-runs,archive to specify action to take
+  -actions <action>[,...] : actions to take; print,remove-runs,archive,kill-runs
   -precmd                 : insert a wrapper command in front of the commands run
 
 Selectors (e.g. use for -runtests, -remove-runs, -set-state-status, -list-runs etc.)
   -target key1/key2/...   : run for key1, key2, etc.
   -reqtarg key1/key2/...  : run for key1, key2, etc. but key1/key2 must be in runconfigs
@@ -357,10 +358,11 @@
                         "-src-target"
                         "-src-runname"
                         "-diff-email"
 			"-sync-to"			
 			"-pgsync"
+			"-kill-wait"    ;; wait this long before removing test (default is 10 sec)
                         "-diff-html"
 			)
  		 (list  "-h" "-help" "--help"
 			"-manual"
 			"-version"
@@ -380,23 +382,25 @@
 			"-clean-cache"
 			"-no-cache"
 			"-cache-db"
                         "-use-db-cache"
                         "-prepend-contour"
+
 			;; misc
 			"-repl"
 			"-lock"
 			"-unlock"
 			"-list-servers"
 			"-kill-servers"
                         "-run-wait"      ;; wait on a run to complete (i.e. no RUNNING)
-			"-one-pass"       ;;
+			"-one-pass"      ;;
 			"-local"         ;; run some commands using local db access
-      "-generate-html"
-      "-generate-html-structure" 
+			"-generate-html"
+			"-generate-html-structure" 
 			"-list-run-time"
                         "-list-test-time"
+			
 			;; misc queries
 			"-list-disks"
 			"-list-targets"
 			"-list-db-targets"
 			"-show-runconfig"

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -2007,11 +2007,14 @@
 		       ((print)
 			(print " " (simple-run-runname run)
 			       " " (time->string (seconds->local-time (simple-run-event_time run)) "WW%V.%u %H:%M:%S")
 			       " " (if remove "REMOVE" "")))
 		       ((remove-runs)
-			(if remove (system (conc precmd " megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
+			(if remove (system (conc precmd " megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"
+						 (if (member 'kill-runs actions) ;; if kill-runs is specified then set -kill-wait to 0
+						     " -kill-wait 0"
+						     "")))))
 		       ((archive)
 			(if remove (system (conc precmd " megatest -archive save-remove -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
 		       ((kill-runs)
 			(if remove (system (conc precmd " megatest -kill-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
 			))
@@ -2144,11 +2147,11 @@
 		       (toplevel-retries (make-hash-table)) ;; try three times to loop through and remove top level tests
 		       (test-retry-time  (make-hash-table))
                        (backgrounded-remove-status     (make-hash-table))
                        (backgrounded-remove-last-visit (make-hash-table))
                        (backgrounded-remove-result     (make-hash-table))
-		       (allow-run-time   10)) ;; seconds to allow for killing tests before just brutally killing 'em
+		       (allow-run-time   (string->number (or (args:get-arg "-kill-wait") "10")))) ;; seconds to allow for killing tests before just brutally killing 'em
 		   (let loop ((test (car sorted-tests))
 			      (tal  (cdr sorted-tests)))
 		     (let* ((test-id       (db:test-get-id test))
 			    (new-test-dat  (rmt:get-test-info-by-id run-id test-id)))
 		       (if (not new-test-dat)