Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -365,17 +365,21 @@
 (if (args:get-arg "-runall")
     (general-run-call 
      "-runall"
      "run all tests"
      (lambda (db target runname keys keynames keyvallst)
-       (runs:run-tests db
-		       target
-		       runname
-		       (args:get-arg "-testpatt")
-		       (args:get-arg "-itempatt")
-		       user
-		       (make-hash-table)))))
+       (let ((flags (make-hash-table)))
+	 (for-each (lambda (parm)
+		     (hash-table-set! flags parm (args:get-arg parm)))
+		   (list "-rerun" "-force"))
+	 (runs:run-tests db
+			 target
+			 runname
+			 (args:get-arg "-testpatt")
+			 (args:get-arg "-itempatt")
+			 user
+			 flags)))))
 
 ;;======================================================================
 ;; run one test
 ;;======================================================================
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -427,15 +427,19 @@
 	    ((and (or (not rerun)
 		      keepgoing)
 		  ;; Require to force re-run for COMPLETED or *anything* + PASS,WARN or CHECK
 		  (or (member (test:get-status testdat) '("PASS" "WARN" "CHECK"))
 		      (member (test:get-state  testdat) '("COMPLETED")))) 
+	     (debug:print 2 "INFO: running test " test-name "/" item-path " suppressed as it is COMPLETED and " (test:get-state testdat))
 	     (set! runflag #f))
 	    ;; -rerun and status is one of the specifed, run it
 	    ((and rerun
-		  (let ((rerunlst (string-split rerun ","))) ;; FAIL,
-		    (member (test:get-status testdat) rerunlst)))
+		  (let* ((rerunlst   (string-split rerun ","))
+			 (must-rerun (member (test:get-status testdat) rerunlst)))
+		    (debug:print 3 "INFO: -rerun list: " rerun ", test-status: " (test:get-status testdat)", must-rerun: " must-rerun)
+		    must-rerun))
+	     (debug:print 2 "INFO: Rerun forced for test " test-name "/" item-path)
 	     (set! runflag #t))
 	    ;; -keepgoing, do not rerun FAIL
 	    ((and keepgoing
 		  (member (test:get-status testdat) '("FAIL")))
 	     (set! runflag #f))
@@ -445,11 +449,11 @@
 	    (else (set! runflag #f)))
 	   (debug:print 6 "RUNNING => runflag: " runflag " STATE: " (test:get-state testdat) " STATUS: " (test:get-status testdat))
 	   (if (not runflag)
 	       (if (not parent-test)
 		   (debug:print 1 "NOTE: Not starting test " new-test-name " as it is state \"" (test:get-state testdat) 
-				"\" and status \"" (test:get-status testdat) "\", use -rerun \"" (test:get-state testdat) "\" or -force to override"))
+				"\" and status \"" (test:get-status testdat) "\", use -rerun \"" (test:get-status testdat) "\" or -force to override"))
 	       ;; NOTE: No longer be checking prerequisites here! Will never get here unless prereqs are
 	       ;;       already met.
 	       (if (not (launch-test db run-id runname test-conf keyvallst test-name test-path itemdat flags))
 		   (begin
 		     (print "ERROR: Failed to launch the test. Exiting as soon as possible")