@@ -108,10 +108,11 @@
   -dumpmode json          : dump in json format instead of sexpr
   -show-cmdinfo           : dump the command info for a test (run in test environment)
 
 Misc 
   -rebuild-db             : bring the database schema up to date
+  -cleanup-db             : remove any orphan records, vacuum the db
   -update-meta            : update the tests metadata for all tests
   -env2file fname         : write the environment to fname.csh and fname.sh
   -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are
                                  overwritten by values set in config files.
   -server -|hostname      : start the server (reduces contention on megatest.db), use
@@ -228,10 +229,11 @@
 			"-test-paths" ;; get path(s) to a test, ordered by youngest first
 
 			"-runall"    ;; run all tests
 			"-remove-runs"
 			"-rebuild-db"
+			"-cleanup-db"
 			"-rollup"
 			"-update-meta"
 			"-gen-megatest-area"
 
 			"-logging"
@@ -1007,11 +1009,11 @@
     (let ((testname (args:get-arg "-gen-megatest-test")))
       (genexample:mk-megatest-test testname)
       (set! *didsomething* #t)))
 
 ;;======================================================================
-;; Update the database schema on request
+;; Update the database schema, clean up the db
 ;;======================================================================
 
 (if (args:get-arg "-rebuild-db")
     (begin
       (if (not (setup-for-run))
@@ -1019,10 +1021,20 @@
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       (open-run-close patch-db #f)
       (set! *didsomething* #t)))
+
+(if (args:get-arg "-cleanup-db")
+    (begin
+      (if (not (setup-for-run))
+	  (begin
+	    (debug:print 0 "Failed to setup, exiting") 
+	    (exit 1)))
+      ;; keep this one local
+      (open-run-close db:clean-up #f)
+      (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Wait on a run to complete
 ;;======================================================================