@@ -70,10 +70,11 @@
   -lock                   : lock run specified by target and runname
   -unlock                 : unlock run specified by target and runname
   -set-run-status status  : sets status for run to status, requires -target and -runname
   -get-run-status         : gets status for run specified by target and runname
   -run-wait               : wait on run specified by target and runname
+  -preclean               : remove the existing test directory before running the test
 
 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 runconfig
   -testpatt patt1/patt2,patt3/...  : % is wildcard
@@ -232,10 +233,11 @@
 			"-set-values"
 			"-load-test-data"
 			"-summarize-items"
 		        "-gui"
 			"-daemonize"
+			"-preclean"
 			;; misc
 			"-archive"
 			"-repl"
 			"-lock"
 			"-unlock"
@@ -1193,23 +1195,10 @@
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       (open-run-close db:find-and-mark-incomplete #f)
       (set! *didsomething* #t)))
 
-;;======================================================================
-;; Wait on a run to complete
-;;======================================================================
-
-(if (args:get-arg "-run-wait")
-    (begin
-      (if (not (setup-for-run))
-	  (begin
-	    (debug:print 0 "Failed to setup, exiting") 
-	    (exit 1)))
-      (operate-on 'run-wait)
-      (set! *didsomething* #t)))
-
 ;;======================================================================
 ;; Update the tests meta data from the testconfig files
 ;;======================================================================
 
 (if (args:get-arg "-update-meta")
@@ -1246,10 +1235,23 @@
 		(repl)
 		(load (args:get-arg "-load")))
 	    (db:close-all dbstruct))
 	  (exit))
       (set! *didsomething* #t)))
+
+;;======================================================================
+;; Wait on a run to complete
+;;======================================================================
+
+(if (args:get-arg "-run-wait")
+    (begin
+      (if (not (setup-for-run))
+	  (begin
+	    (debug:print 0 "Failed to setup, exiting") 
+	    (exit 1)))
+      (operate-on 'run-wait)
+      (set! *didsomething* #t)))
 
 ;; Not converted to use dbstruct yet
 ;;
 (if (args:get-arg "-convert-to-norm")
     (let* ((toppath (setup-for-run))