@@ -45,15 +45,16 @@
   -showkeys               : show the keys used in this megatest setup
 
 Misc 
   -force                  : override some checks
   -xterm                  : start an xterm instead of launching the test
-  -remove-runs            : remove the data for a run, requires fields, :runname 
+  -remove-runs            : remove the data for a run, requires all fields be specified
+                            and :runname ,-testpatt and -itempatt
                             and -testpatt
-  -testpatt patt          : remove tests matching patt (requires -remove-runs)
   -keepgoing              : continue running until no jobs are \"LAUNCHED\" or
                             \"NOT_STARTED\"
+  -rerun FAIL,WARN...     : re-run if called on a test that previously ran
 
 Helpers
   -runstep stepname  ...  : take remaining params as comand and execute as stepname
                             log will be in stepname.log. Best to put command in quotes
   -logpro file            : with -exec apply logpro file to stepname.log, creates
@@ -83,10 +84,11 @@
 			"-setlog"
 			"-set-toplog"
 			"-runstep"
 			"-logpro"
 			"-m"
+			"-rerun"
 			) 
 		 (list  "-h"
 		        "-force"
 		        "-xterm"
 		        "-showkeys"
@@ -117,10 +119,12 @@
 
 ;;======================================================================
 ;; Remove old run(s)
 ;;======================================================================
 
+;; since several actions can be specified on the command line the removal
+;; is done first
 (define (remove-runs)
   (cond
    ((not (args:get-arg ":runname"))
     (print "ERROR: Missing required parameter for -remove-runs, you must specify the run name pattern with :runname patt")
     (exit 2))
@@ -482,11 +486,12 @@
 		    (begin
 		      (print "Test NOT logged as COMPLETED, (state=" (db:test-get-state testinfo) "), updating result")
 		      (test-set-status! db run-id test-name
 					(if kill-job? "KILLED" "COMPLETED")
 					(if (vector-ref exit-info 1) ;; look at the exit-status
-					    (if (eq? (vector-ref exit-info 2) 0)
+					    (if (and (not kill-job?) 
+						     (eq? (vector-ref exit-info 2) 0))
 						"PASS"
 						"FAIL")
 					    "FAIL") itemdat (args:get-arg "-m")))))
 	      (mutex-unlock! m)
 	      ;; (exec-results (cmd-run->list fullrunscript)) ;;  (list ">" (conc test-name "-run.log"))))