@@ -226,11 +226,11 @@
 ;; Remove old run(s)
 ;;======================================================================
 
 ;; since several actions can be specified on the command line the removal
 ;; is done first
-(define (operate-on db action)
+(define (operate-on action)
   (cond
    ((not (args:get-arg ":runname"))
     (debug:print 0 "ERROR: Missing required parameter for " action ", you must specify the run name pattern with :runname patt")
     (exit 2))
    ((not (args:get-arg "-testpatt"))
@@ -243,34 +243,32 @@
     (if (not (car *configinfo*))
 	(begin
 	  (debug:print 0 "ERROR: Attempted " action "on test(s) but run area config file not found")
 	  (exit 1))
 	;; put test parameters into convenient variables
-	(runs:operate-on  db
-			  action
+	(runs:operate-on  action
 			  (args:get-arg ":runname")
 			  (args:get-arg "-testpatt")
 			  (args:get-arg "-itempatt")
 			  state: (args:get-arg ":state") 
 			  status: (args:get-arg ":status")
 			  new-state-status: (args:get-arg "-set-state-status")))
-    (sqlite3:finalize! db)
     (set! *didsomething* #t))))
 	  
 (if (args:get-arg "-remove-runs")
     (general-run-call 
      "-remove-runs"
      "remove runs"
-     (lambda (db target runname keys keynames keyvallst)
-       (operate-on db 'remove-runs))))
+     (lambda (target runname keys keynames keyvallst)
+       (operate-on 'remove-runs))))
 
 (if (args:get-arg "-set-state-status")
     (general-run-call 
      "-set-state-status"
      "set state and status"
-     (lambda (db target runname keys keynames keyvallst)
-       (operate-on db 'set-state-status))))
+     (lambda (target runname keys keynames keyvallst)
+       (operate-on 'set-state-status))))
 
 ;;======================================================================
 ;; Query runs
 ;;======================================================================
 
@@ -286,10 +284,12 @@
 	   (header   (db:get-header runsdat))
 	   (keys     (db:get-keys db))
 	   (keynames (map key:get-fieldname keys)))
       (if (not (args:get-arg "-server"))
 	  (server:client-setup db))
+      (sqlite3:finalize! db)
+      (set! db #f)
       ;; Each run
       (for-each 
        (lambda (run)
 	 (debug:print 1 "Run: "
 		(string-intersperse (map (lambda (x)
@@ -296,12 +296,12 @@
 					   (db:get-value-by-header run header x))
 					 keynames) "/")
 		"/"
 		(db:get-value-by-header run header "runname")
 		" status: " (db:get-value-by-header run header "state"))
-	 (let ((run-id (db:get-value-by-header run header "id")))
-	   (let ((tests (db:get-tests-for-run db run-id testpatt itempatt '() '())))
+	 (let ((run-id (open-run-close db:get-value-by-header run header "id")))
+	   (let ((tests (open-run-close db:get-tests-for-run db run-id testpatt itempatt '() '())))
 	     ;; Each test
 	     (for-each 
 	      (lambda (test)
 		(format #t
 			"  Test: ~25a State: ~15a Status: ~15a Runtime: ~5@as Time: ~22a Host: ~10a\n"
@@ -322,11 +322,11 @@
 			     "\n         diskfree: " (db:test-get-diskfree test)
 			     "\n         uname:    " (db:test-get-uname test)
 			     "\n         rundir:   " (db:test-get-rundir test)
 			     )
 		      ;; Each test
-		      (let ((steps (db:get-steps-for-test db (db:test-get-id test))))
+		      (let ((steps (open-run-close db:get-steps-for-test db (db:test-get-id test))))
 			(for-each 
 			 (lambda (step)
 			   (format #t 
 				   "    Step: ~20a State: ~10a Status: ~10a Time ~22a\n"
 				   (db:step-get-stepname step)
@@ -378,17 +378,16 @@
 ;; run all tests are are Not COMPLETED and PASS or CHECK
 (if (args:get-arg "-runall")
     (general-run-call 
      "-runall"
      "run all tests"
-     (lambda (db target runname keys keynames keyvallst)
+     (lambda (target runname keys keynames keyvallst)
 ;;       (let ((flags (make-hash-table)))
 ;;	 (for-each (lambda (parm)
 ;;		     (hash-table-set! flags parm (args:get-arg parm)))
 ;;		   (list "-rerun" "-force" "-itempatt"))
-	 (runs:run-tests db
-			 target
+	 (runs:run-tests target
 			 runname
 			 (args:get-arg "-runtests")
 			 user
 			 args:arg-hash)))) ;; )
 
@@ -411,13 +410,12 @@
 
 (if (args:get-arg "-runtests")
   (general-run-call 
    "-runtests" 
    "run a test" 
-   (lambda (db target runname keys keynames keyvallst)
-     (runs:run-tests db
-		     target
+   (lambda (target runname keys keynames keyvallst)
+     (runs:run-tests target
 		     runname
 		     (args:get-arg "-runtests")
 		     user
 		     args:arg-hash))))
 
@@ -427,13 +425,12 @@
 
 (if (args:get-arg "-rollup")
     (general-run-call 
      "-rollup" 
      "rollup tests" 
-     (lambda (db target runname keys keynames keyvallst)
-       (runs:rollup-run db
-			keys
+     (lambda (target runname keys keynames keyvallst)
+       (runs:rollup-run keys
 			(keys->alist keys "na")
 			(args:get-arg ":runname") 
 			user))))
 
 ;;======================================================================
@@ -442,12 +439,12 @@
 
 (if (or (args:get-arg "-lock")(args:get-arg "-unlock"))
     (general-run-call 
      (if (args:get-arg "-lock") "-lock" "-unlock")
      "lock/unlock tests" 
-     (lambda (db target runname keys keynames keyvallst)
-       (runs:handle-locking db
+     (lambda (target runname keys keynames keyvallst)
+       (runs:handle-locking 
 		  target
 		  keys
 		  (args:get-arg ":runname") 
 		  (args:get-arg "-lock")
 		  (args:get-arg "-unlock")
@@ -482,26 +479,30 @@
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -test-paths or -test-files, exiting")
 		(exit 1)))
 	  (set! db (open-db))    
 	  (if (not (args:get-arg "-server"))
-	      (server:client-setup db))
+	      (server:client-setup db)
+	      (begin
+		(sqlite3:finalize! db)
+		(set! db #f)))
 	  (let* ((itempatt (args:get-arg "-itempatt"))
-		 (keys     (db:get-keys db))
+		 (keys     (open-run-close db:get-keys db))
 		 (keynames (map key:get-fieldname keys))
-		 (paths    (db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
+		 (paths    (open-run-close db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
 			(print path))
 		      paths)))
 	;; else do a general-run-call
 	(general-run-call 
 	 "-test-files"
 	 "Get paths to test"
-	 (lambda (db target runname keys keynames keyvallst)
-	   (let* ((itempatt (args:get-arg "-itempatt"))
-		  (paths    (db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
+	 (lambda (target runname keys keynames keyvallst)
+	   (let* ((db       #f)
+		  (itempatt (args:get-arg "-itempatt"))
+		  (paths    (open-run-close db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
 	     (for-each (lambda (path)
 			 (print path))
 		       paths))))))
 
 ;;======================================================================
@@ -530,28 +531,26 @@
 		(exit 1)))
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -archive, exiting")
 		(exit 1)))
-	  (set! db (open-db))   
-	  (if (not (args:get-arg "-server"))
-	      (server:client-setup db))
 	  (let* ((itempatt (args:get-arg "-itempatt"))
-		 (keys     (db:get-keys db))
+		 (keys     (open-run-close db:get-keys db))
 		 (keynames (map key:get-fieldname keys))
-		 (paths    (db:test-get-paths-matching db keynames target)))
+		 (paths    (open-run-close db:test-get-paths-matching db keynames target)))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
 			(print path))
 		      paths)))
 	;; else do a general-run-call
 	(general-run-call 
 	 "-test-paths"
 	 "Get paths to tests"
-	 (lambda (db target runname keys keynames keyvallst)
-	   (let* ((itempatt (args:get-arg "-itempatt"))
-		  (paths    (db:test-get-paths-matching db keynames target)))
+	 (lambda (target runname keys keynames keyvallst)
+	   (let* ((db       #f)
+		  (itempatt (args:get-arg "-itempatt"))
+		  (paths    (open-run-close db:test-get-paths-matching db keynames target)))
 	     (for-each (lambda (path)
 			 (print path))
 		       paths))))))
 
 ;;======================================================================
@@ -560,17 +559,18 @@
 
 (if (args:get-arg "-extract-ods")
     (general-run-call
      "-extract-ods"
      "Make ods spreadsheet"
-     (lambda (db target runname keys keynames keyvallst)
-       (let ((outputfile (args:get-arg "-extract-ods"))
+     (lambda (target runname keys keynames keyvallst)
+       (let ((db         #f)
+	     (outputfile (args:get-arg "-extract-ods"))
 	     (runspatt   (args:get-arg ":runname"))
 	     (pathmod    (args:get-arg "-pathmod"))
 	     (keyvalalist (keys->alist keys "%")))
 	 (debug:print 2 "Extract ods, outputfile: " outputfile " runspatt: " runspatt " keyvalalist: " keyvalalist)
-	 (db:extract-ods-file db outputfile keyvalalist (if runspatt runspatt "%") pathmod)))))
+	 (open-run-close db:extract-ods-file db outputfile keyvalalist (if runspatt runspatt "%") pathmod)))))
 
 ;;======================================================================
 ;; execute the test
 ;;    - gets called on remote host
 ;;    - receives info from the -execute param
@@ -610,17 +610,20 @@
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 	  (set! db (open-db))
 	  (if (not (args:get-arg "-server"))
-	      (server:client-setup db))
+	      (server:client-setup db)
+	      (begin
+		(sqlite3:finalize! db)
+		(set! db #f)))
 	  (if (and state status)
-	      (db:teststep-set-status! db test-id step state status itemdat (args:get-arg "-m") logfile)
+	      (open-run-close db:teststep-set-status! db test-id step state status itemdat (args:get-arg "-m") logfile)
 	      (begin
 		(debug:print 0 "ERROR: You must specify :state and :status with every call to -step")
 		(exit 6)))
-	  (sqlite3:finalize! db)
+	  (if db (sqlite3:finalize! db))
 	  (set! *didsomething* #t))))
 
 (if (or (args:get-arg "-setlog")       ;; since setting up is so costly lets piggyback on -test-status
 	(args:get-arg "-set-toplog")
 	(args:get-arg "-test-status")
@@ -649,26 +652,29 @@
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 	  (set! db (open-db))
 	  (if (not (args:get-arg "-server"))
-	      (server:client-setup db))
+	      (server:client-setup db)
+	      (begin
+		(sqlite3:finalize! db)
+		(set! db #f)))
 	  (if (args:get-arg "-load-test-data")
 	      ;; has sub commands that are rdb:
-	      (db:load-test-data db test-id))
+	      (open-run-close db:load-test-data db test-id))
 	  (if (args:get-arg "-setlog")
 	      (let ((logfname (args:get-arg "-setlog")))
-		(db:test-set-log! db test-id logfname)))
+		(open-run-close db:test-set-log! db test-id logfname)))
 	  (if (args:get-arg "-set-toplog")
-	      (rtests:test-set-toplog! db run-id test-name (args:get-arg "-set-toplog")))
+	      (open-run-close tests:test-set-toplog! db run-id test-name (args:get-arg "-set-toplog")))
 	  (if (args:get-arg "-summarize-items")
-	      (tests:summarize-items db run-id test-name #t)) ;; do force here
+	      (open-run-close tests:summarize-items db run-id test-name #t)) ;; do force here
 	  (if (args:get-arg "-runstep")
 	      (if (null? remargs)
 		  (begin
 		    (debug:print 0 "ERROR: nothing specified to run!")
-		    (sqlite3:finalize! db)
+		    (if db (sqlite3:finalize! db))
 		    (exit 6))
 		  (let* ((stepname   (args:get-arg "-runstep"))
 			 (logprofile (args:get-arg "-logpro"))
 			 (logfile    (conc stepname ".log"))
 			 (cmd        (if (null? remargs) #f (car remargs)))
@@ -681,23 +687,17 @@
 				       (else ">&")))
 			 (fullcmd    (conc "(" (string-intersperse 
 						(cons cmd params) " ")
 					   ") " redir " " logfile)))
 		    ;; mark the start of the test
-		    (db:teststep-set-status! db test-id stepname "start" "n/a" itemdat (args:get-arg "-m") logfile)
-		    ;; close the db
-		    ;; (sqlite3:finalize! db)
+		    (open-run-close db:teststep-set-status! db test-id stepname "start" "n/a" itemdat (args:get-arg "-m") logfile)
 		    ;; run the test step
 		    (debug:print 2 "INFO: Running \"" fullcmd "\"")
 		    (change-directory startingdir)
 		    (set! exitstat (system fullcmd)) ;; cmd params))
 		    (set! *globalexitstatus* exitstat)
 		    (change-directory testpath)
-		    ;; re-open the db
-		    ;; (set! db (open-db))
-		    ;; (if (not (args:get-arg "-server"))
-		    ;;     (server:client-setup db))
 		    ;; run logpro if applicable ;; (process-run "ls" (list "/foo" "2>&1" "blah.log"))
 		    (if logprofile
 			(let* ((htmllogfile (conc stepname ".html"))
 			       (oldexitstat exitstat)
 			       (cmd         (string-intersperse (list "logpro" logprofile htmllogfile "<" logfile ">" (conc stepname "_logpro.log")) " ")))
@@ -704,19 +704,14 @@
 			  (debug:print 2 "INFO: running \"" cmd "\"")
 			  (change-directory startingdir)
 			  (set! exitstat (system cmd))
 			  (set! *globalexitstatus* exitstat) ;; no necessary
 			  (change-directory testpath)
-			  (db:test-set-log! db test-id htmllogfile)))
+			  (open-run-close db:test-set-log! db test-id htmllogfile)))
 		    (let ((msg (args:get-arg "-m")))
-		      (db:teststep-set-status! db test-id stepname "end" exitstat itemdat msg logfile))
-		    ;; (sqlite3:finalize! db)
-		    ;;(if (not (eq? exitstat 0))
-		    ;;	(exit 254)) ;; (exit exitstat) doesn't work?!?
-		  ;; open the db
-		  ;; mark the end of the test
-		  )))
+		      (open-run-close db:teststep-set-status! db test-id stepname "end" exitstat itemdat msg logfile))
+		    )))
 	  (if (or (args:get-arg "-test-status")
 		  (args:get-arg "-set-values"))
 	      (let ((newstatus (cond
 				((number? status)       (if (equal? status 0) "PASS" "FAIL"))
 				((and (string? status)
@@ -733,15 +728,15 @@
 		(if (and (args:get-arg "-test-status")
 			 (or (not state)
 			     (not status)))
 		    (begin
 		      (debug:print 0 "ERROR: You must specify :state and :status with every call to -test-status\n" help)
-		      (sqlite3:finalize! db)
+		      ;; (sqlite3:finalize! db)
 		      (exit 6)))
 		(let ((msg (args:get-arg "-m")))
-		  (rtests:test-set-status! db test-id state newstatus msg otherdata))))
-	  (sqlite3:finalize! db)
+		  (open-run-close tests:test-set-status! db test-id state newstatus msg otherdata))))
+	  (if db (sqlite3:finalize! db))
 	  (set! *didsomething* #t))))
 
 ;;======================================================================
 ;; Various helper commands can go below here
 ;;======================================================================
@@ -753,14 +748,17 @@
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting")
 	    (exit 1)))
       (set! db (open-db))
       (if (not (args:get-arg "-server"))
-	  (server:client-setup db))
-      (set! keys (db:get-keys db))
+	  (server:client-setup db)
+	  (begin
+	    (sqlite3:finalize! db)
+	    (set! db #f)))
+      (set! keys (open-run-close db:get-keys db))
       (debug:print 1 "Keys: " (string-intersperse (map key:get-fieldname keys) ", "))
-      (sqlite3:finalize! db)
+      (if db (sqlite3:finalize! db))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-gui")
     (begin
       (debug:print 0 "Look at the dashboard for now")
@@ -785,14 +783,11 @@
     (begin
       (if (not (setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
-      ;; now can find our db
-      (set! db (open-db))
-      (patch-db db)
-      (sqlite3:finalize! db)
+      (open-run-close patch-db #f)
       (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Update the tests meta data from the testconfig files
 ;;======================================================================
@@ -804,13 +799,16 @@
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; now can find our db
       (set! db (open-db))
       (if (not (args:get-arg "-server"))
-	  (server:client-setup db))
-      (runs:update-all-test_meta db)
-      (sqlite3:finalize! db)
+	  (server:client-setup db)
+	  (begin
+	    (sqlite3:finalize! db)
+	    (set! db #f)))
+      (open-run-close runs:update-all-test_meta db)
+      (if db (sqlite3:finalize! db))
       (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Start a repl
 ;;======================================================================