Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -152,19 +152,46 @@
 
 (define (common:version-changed?)
   (not (equal? (common:get-last-run-version)
 	       (common:version-signature))))
 
+;; Move me elsewhere ...
+;;
+(define (common:cleanup-db)
+  (db:multi-db-sync 
+   #f ;; do all run-ids
+   ;; 'new2old
+   'killservers
+   'dejunk
+   ;; 'adj-testids
+   ;; 'old2new
+   'new2old)
+  (if (common:version-changed?)
+      (common:set-last-run-version)))
+
 (define (common:exit-on-version-changed)
   (if (common:version-changed?)
-      (begin
-	(debug:print 0
+      (let ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config")))
+	(debug:print 0 
 		     "ERROR: Version mismatch!\n"
 		     "   expected: " (common:version-signature) "\n"
-		     "   got:      " (common:get-last-run-version) "\n"
-		     " to switch versions you can run: \"megatest -cleanup-db\"")
-	(exit 1))))
+		     "   got:      " (common:get-last-run-version))
+	(if (and (file-exists? mtconf)
+		 (eq? (current-user-id)(file-owner mtconf))) ;; safe to run -cleanup-db
+	    (begin
+	      (debug:print 0 "   I see you are the owner of megatest.config, attempting to cleanup and reset to new version")
+	      (handle-exceptions
+	       exn
+	       (begin
+		 (debug:print 0 "Failed to switch versions.")
+		 (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+		 (print-call-chain (current-error-port))
+		 (exit 1))
+	       (common:cleanup-db)))
+	    (begin
+	      (debug:print 0 " to switch versions you can run: \"megatest -cleanup-db\"")
+	      (exit 1))))))
 
 ;;======================================================================
 ;; S P A R S E   A R R A Y S
 ;;======================================================================
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1826,23 +1826,11 @@
     (begin
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
-      ;; keep this one local
-      ;; (open-run-close db:clean-up #f)
-      (db:multi-db-sync 
-       #f ;; do all run-ids
-       ;; 'new2old
-       'killservers
-       'dejunk
-       ;; 'adj-testids
-       ;; 'old2new
-       'new2old
-       )
-      (if (common:version-changed?)
-	  (common:set-last-run-version))
+      (common:cleanup-db)
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
       (if (not (launch:setup))

Index: tests/unittests/basicserver.scm
==================================================================
--- tests/unittests/basicserver.scm
+++ tests/unittests/basicserver.scm
@@ -7,11 +7,11 @@
 ;;  ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 
 (delete-file* "logs/1.log")
 (define run-id 1)
 
-(test "setup for run" #t (begin (launch:setup-for-run)
+(test "setup for run" #t (begin (launch:setup)
  				(string? (getenv "MT_RUN_AREA_HOME"))))
 
 ;; NON Server tests go here
 
 (test #f #f (db:dbdat-get-path *db*))

Index: tests/unittests/tests.scm
==================================================================
--- tests/unittests/tests.scm
+++ tests/unittests/tests.scm
@@ -1,13 +1,47 @@
-;;======================================================================
-;; itemwait, itemmatch
-
-(db:compare-itempaths ref-item-path item-path itemmap)
-
-;; prereqs-not-met
-
-(rmt:get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
-
-	 (fails           (runs:calc-fails prereqs-not-met))
-	 (prereq-fails    (runs:calc-prereq-fail prereqs-not-met))
-	 (non-completed   (runs:calc-not-completed prereqs-not-met))
-	 (runnables       (runs:calc-runnable prereqs-not-met)))
+;; ;;======================================================================
+;; ;; itemwait, itemmatch
+;; 
+;; (db:compare-itempaths ref-item-path item-path itemmap)
+;; 
+;; ;; prereqs-not-met
+;; 
+;; (rmt:get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
+;; 
+;; 	 (fails           (runs:calc-fails prereqs-not-met))
+;; 	 (prereq-fails    (runs:calc-prereq-fail prereqs-not-met))
+;; 	 (non-completed   (runs:calc-not-completed prereqs-not-met))
+;; 	 (runnables       (runs:calc-runnable prereqs-not-met)))
+;; 
+;; 
+;; 
+
+(define user    (current-user-name))
+(define runname "mytestrun")
+(define keys    (rmt:get-keys))
+(define runinfo #f)
+(define keyvals '(("SYSTEM" "abc")("RELEASE" "def")))
+(define header  (list "SYSTEM" "RELEASE" "id" "runname" "state" "status" "owner" "event_time"))
+(define run-id  1)
+
+;; Create a run
+(test #f 1 (rmt:register-run keyvals runname "new" "n/a" user))
+(test #f #t (rmt:general-call 'register-test run-id run-id "test-one" ""))
+(test #f #t (rmt:general-call 'register-test run-id run-id "test-two" ""))
+
+(rmt:test-set-state-status-by-id 
+ run-id
+ (rmt:get-test-id run-id "test-one" "") "COMPLETED" "FAIL" "")
+(rmt:test-set-state-status-by-id 
+ run-id
+ (rmt:get-test-id run-id "test-two" "") "COMPLETED" "PASS" "")
+
+(test #f '("FAIL")
+      (map 
+       (lambda (x)(vector-ref x 4))
+       (rmt:get-tests-for-run run-id "%/%" '() '("FAIL") #f #f #t 'event_time "DESC" 'shortlist 0 'dashboard)))
+(test #f '()
+      (map 
+       (lambda (x)(vector-ref x 4))
+       (rmt:get-tests-for-run run-id "%/%" '() '("FAIL") #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
+
+(exit)