@@ -161,10 +161,11 @@
 			"-extract-ods"
 			"-pathmod"
 			"-env2file"
 			"-setvars"
 			"-debug" ;; for *verbosity* > 2
+			"-override-timeout"
 			) 
 		 (list  "-h"
 		        "-force"
 		        "-xterm"
 		        "-showkeys"
@@ -339,12 +340,16 @@
 		  (args:get-arg "-runtests"))))
     (let* ((toppath (setup-for-run))
 	   (db      (if toppath (open-db) #f)))
       (debug:print 0 "INFO: Starting the standalone server")
       (if db 
-	  (let ((th2 (server:start db (args:get-arg "-server"))))
-	    (thread-join! th2))
+	  (let* ((host:port (db:get-var "SERVER")) ;; this doen't support multiple servers BUG!!!!
+		 (th2 (server:start db (args:get-arg "-server")))
+		 (th3 (lambda ()
+			(server:keep-going db))))
+	    (thread-start! th3)
+	    (thread-join! th3))
 	  (debug:print 0 "ERROR: Failed to setup for megatest"))))
 
 ;;======================================================================
 ;; full run
 ;;======================================================================
@@ -619,13 +624,13 @@
 	  (set! db (open-db))
 	  (if (not (args:get-arg "-server"))
 	      (server:client-setup db))
 	  (if (args:get-arg "-load-test-data")
 	      ;; has sub commands that are rdb:
-	      (db:load-test-data db run-id test-name itemdat))
+	      (db:load-test-data db test-id))
 	  (if (args:get-arg "-setlog")
-	      (rdb:test-set-log! db run-id test-name itemdat (args:get-arg "-setlog")))
+	      (rdb:test-set-log! db test-id (args:get-arg "-setlog")))
 	  (if (args:get-arg "-set-toplog")
 	      (rdb:test-set-toplog! db run-id test-name (args:get-arg "-set-toplog")))
 	  (if (args:get-arg "-summarize-items")
 	      (rdb:tests:summarize-items db run-id test-name #t)) ;; do force here
 	  (if (args:get-arg "-runstep")
@@ -669,11 +674,11 @@
 			  (debug:print 2 "INFO: running \"" cmd "\"")
 			  (change-directory startingdir)
 			  (set! exitstat (system cmd))
 			  (set! *globalexitstatus* exitstat) ;; no necessary
 			  (change-directory testpath)
-			  (rdb:test-set-log! db run-id test-name itemdat htmllogfile)))
+			  (rdb:test-set-log! db test-id htmllogfile)))
 		    (rdb:teststep-set-status! db test-id stepname "end" exitstat itemdat (args:get-arg "-m") logfile)
 		    (sqlite3:finalize! db)
 		    (if (not (eq? exitstat 0))
 			(exit 254)) ;; (exit exitstat) doesn't work?!?
 		  ;; open the db