Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -257,12 +257,22 @@
 
 ;;======================================================================
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
 ;;======================================================================
+
 (if (args:get-arg "-server")
-    (server:launch)
+    (server:launch))
+
+(if (or (let ((res #f))
+	  (for-each
+	   (lambda (key)
+	     (if (args:get-arg key)(set! res #t)))
+	   (list "-h" "-version" "-gen-megatest-area" "-gen-megatest-test"))
+	  res)
+	(eq? (length (hash-table-keys args:arg-hash)) 0))
+    (debug:print-info 1 "No server needed")
     (server:client-launch))
 
 ;;======================================================================
 ;; Remove old run(s)
 ;;======================================================================

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -23,27 +23,28 @@
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 (define (server:make-server-url hostport)
-  (if (null? hostport)
+  (if (not hostport)
       #f
-      (conc "tcp://" hostname ":" port)))
+      (conc "tcp://" (car hostport) ":" (cadr hostport))))
 
 (define (server:run hostn)
   (debug:print 0 "Attempting to start the server ...")
+  (if (not *toppath*)(setup-for-run))
   (let* ((hostport      (open-run-close tasks:get-best-server tasks:open-db)) ;; do whe already have a server running?
 	 (host:port (server:make-server-url hostport)))
     (if host:port 
 	(begin
 	  (debug:print 0 "NOTE: server already running.")
 	  (if (server:client-setup)
 	      (begin 
 		(debug:print-info 0 "Server is alive, not starting another"))
 	      (begin
-		(debug:print-info 0 "Server is dead, removing, deregistering it and trying again")
-		(open-run-close tasks:deregister tasks:open-db (car hostport) port: (cadr port))
+		(debug:print-info 0 "Server is dead, deregistering it, please try again")
+		(open-run-close tasks:server-deregister tasks:open-db (car hostport) port: (cadr port))
 		;; (server:run hostn)
 		(debug:print 0 "WOULD NORMALLY START ANOTHER SERVER HERE")
 		)
 	      )
 	  )
@@ -53,11 +54,11 @@
 				   hostn))
 	       (ipaddrstr      (let ((ipstr (if (string=? "-" hostn)
 						(string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
 						#f)))
 				 (if ipstr ipstr hostname))))
-	  (set! zmq-socket (server:find-free-port-and-open ipaddrstr zmq-socket 5555))
+	  (set! zmq-socket (server:find-free-port-and-open ipaddrstr zmq-socket 5555 0))
 	  (set! *cache-on* #t)
 	  
 	  ;; what to do when we quit
 	  ;;
 	  (on-exit (lambda ()
@@ -110,29 +111,33 @@
 		(debug:print-info 0 "Max cached queries was " *max-cache-size*)
 		(debug:print-info 0 "Server shutdown complete. Exiting")
 		;; (exit)))
 		))))))
 
-(define (server:find-free-port-and-open host s port)
+(define (server:find-free-port-and-open host s port trynum)
   (let ((s (if s s (make-socket 'rep)))
 	(p (if (number? port) port 5555)))
     (handle-exceptions
      exn
      (begin
        (debug:print 0 "Failed to bind to port " p ", trying next port")
        (debug:print 0 "   EXCEPTION: " ((condition-property-accessor 'exn 'message) exn))
-       (server:find-free-port-and-open host s (+ p 1)))
+       (if (< trynum 100)
+	   (server:find-free-port-and-open host s (+ p 1) (+ trynum 1))
+	   (debug:print-info 0 "Tried ports from " (- p trynum) " to " p 
+			     " but all were in use. Please try a different port range by starting the server with parameter \" -port N\" where N is the starting port number to use")))
      (let ((zmq-url (conc "tcp://" host ":" p)))
        (print "Trying to start server on " zmq-url)
        (bind-socket s zmq-url)
        (set! *runremote* #f)
        (debug:print 0 "Server started on " zmq-url)
        (open-run-close tasks:server-register tasks:open-db (current-process-id) host p 0 'live)
        s))))
 
 (define (server:client-setup)
-  (let* ((hostinfo   (open-run-close db:get-var #f "SERVER"))
+  (if (not *toppath*)(setup-for-run))
+  (let* ((hostinfo   (open-run-close tasks:get-best-server tasks:open-db))
 	 (zmq-socket (make-socket 'req)))
     (if hostinfo
 	(begin
 	  (debug:print-info 2 "Setting up to connect to " hostinfo)
 	  (handle-exceptions
@@ -139,23 +144,24 @@
 	   exn
 	   (begin
 	     (debug:print 0 "ERROR: Failed to open a connection to the server at: " hostinfo)
 	     (debug:print 0 "   EXCEPTION: " ((condition-property-accessor 'exn 'message) exn))
 	     (debug:print 0 "   perhaps jobs killed with -9? Removing server records")
-	     (open-run-close db:del-var #f "SERVER")
-	     (exit)
+	     (open-run-close tasks:server-deregister tasks:open-db (car hostinfo) port: (cadr hostinfo))
+	     ;; (exit) ;; why forced exit?
 	     #f)
-	   (let ((connect-ok #f))
-	     (connect-socket zmq-socket hostinfo)
+	   (let ((connect-ok #f)
+		 (conurl     (server:make-server-url hostinfo)))
+	     (connect-socket zmq-socket conurl)
 	     (set! connect-ok (cdb:client-call zmq-socket 'login #t *toppath*))
 	     (if connect-ok
 		 (begin
-		   (debug:print-info 2 "Logged in and connected to " hostinfo)
+		   (debug:print-info 2 "Logged in and connected to " conurl)
 		   (set! *runremote* zmq-socket)
 		   #t)
 		 (begin
-		   (debug:print-info 2 "Failed to login or connect to " hostinfo)
+		   (debug:print-info 2 "Failed to login or connect to " conurl)
 		   (set! *runremote* #f)
 		   #f)))))
 	(begin
 	  (debug:print-info 0 "NO SERVER RUNNING! PLEASE START ONE! E.g. \"megatest -server - &\"")
 	;;   (debug:print-info 2 "No server available, attempting to start one...")

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -76,11 +76,11 @@
 ;; state: 'live, 'shutting-down, 'dead
 (define (tasks:server-register mdb pid hostname port priority state)
   (sqlite3:execute 
    mdb 
    "INSERT OR REPLACE INTO servers (pid,hostname,port,start_time,priority,state) VALUES(?,?,?,strftime('%s','now'),?,?);"
-   pid hostname port priority state))
+   pid hostname port priority (conc state)))
 
 (define (tasks:server-deregister mdb hostname #!key (port #f)(pid #f))
   (if pid
       (sqlite3:execute mdb "DELETE FROM servers WHERE  hostname=? AND pid=?;" hostname pid)
       (if port
@@ -118,11 +118,11 @@
 
 (define (tasks:have-clients? mdb server-id)
   (null? (tasks:get-logged-in-clients mdb server-id)))
 
 (define (tasks:get-best-server mdb)
-  (let ((res '()))
+  (let ((res #f))
     (sqlite3:for-each-row
      (lambda (id hostname port)
        (set! res (list hostname port)))
      mdb
      "SELECT id,hostname,port FROM servers WHERE state='live' ORDER BY start_time DESC LIMIT 1;")

Index: tests/tests.scm
==================================================================
--- tests/tests.scm
+++ tests/tests.scm
@@ -1,7 +1,22 @@
+;; Copyright 2006-2012, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
+
 (require-extension test)
 (require-extension regex)
+(require-extension srfi-18)
+(import srfi-18)
+(require-extension zmq)
+(import zmq)
 
 (define test-work-dir (current-directory))
 
 ;; read in all the _record files
 (let ((files (glob "*_records.scm")))
@@ -8,10 +23,12 @@
   (for-each
    (lambda (file)
      (print "Loading " file)
      (load file))
    files))
+
+(define *runremote* #f)
 
 ;;======================================================================
 ;; P R O C E S S E S
 ;;======================================================================
 
@@ -53,13 +70,38 @@
 ;; test:match->sqlqry
 (test #f "(testname GLOB 'a' AND item_path GLOB 'b') OR (testname LIKE 'a%' AND item_path LIKE '%') OR (testname GLOB '' AND item_path LIKE 'b%')"
       (tests:match->sqlqry "a/b,a%,/b%"))
 (test #f "(testname GLOB 'a' AND item_path GLOB 'b') OR (testname LIKE 'a%' AND item_path LIKE '%') OR (testname LIKE '%' AND item_path LIKE 'b%')"
       (tests:match->sqlqry "a/b,a%,%/b%"))
+
+;;======================================================================
+;; S E R V E R
+;;======================================================================
+
+(test "setup for run" #t (begin (setup-for-run)
+				(string? (getenv "MT_RUN_AREA_HOME"))))
+
+(test "server-register, get-best-server" '("bob" 1234) (let ((res #f))
+							 (open-run-close tasks:server-register tasks:open-db 1 "bob" 1234 100 'live)
+							 (set! res (open-run-close tasks:get-best-server tasks:open-db))
+							 res))
+(test "de-register server" #f (let ((res #f))
+				(open-run-close tasks:server-deregister tasks:open-db "bob" port: 1234)
+				(open-run-close tasks:get-best-server tasks:open-db)))
+
 
 ;; (exit)
 
+(set! *verbosity* 10)
+(define server-pid (process-run "../../bin/megatest" (list "-server" "-" "-debug" (conc *verbosity*))))
+(sleep 3)
+
+(define th1 (make-thread (lambda ()(server:client-setup))))
+(thread-start! th1)
+
+(test #f #t (socket? *runremote*))
+
 ;;======================================================================
 ;; C O N F I G   F I L E S 
 ;;======================================================================
 
 (define conffile #f)
@@ -78,12 +120,10 @@
 (define header (list "col1" "col2" "col3" "col4"))
 (test "Get row by header" "blah" (db:get-value-by-header row header "col4"))
 
 ;; (define *toppath* "tests")
 (define *db* #f)
-(test "setup for run" #t (begin (setup-for-run)
-				(string? (getenv "MT_RUN_AREA_HOME"))))
 (test "open-db" #t (begin
 		     (set! *db* (open-db))
 		     (if *db* #t #f)))
 
 ;; quit wasting time, I'm changing *db* to db
@@ -112,11 +152,11 @@
 
 (test "get all legal tests" (list "test1" "test2") (sort (get-all-legal-tests) string<=?))
 
 (test "register-test, test info" "NOT_STARTED"
       (begin
-	(cdb:tests-register-test *remoterun* 1 "nada" "")
+	(cdb:tests-register-test *runremote* 1 "nada" "")
 	;; (rdb:flush-queue)
 	(vector-ref (db:get-test-info *db* 1 "nada" "") 3)))
 
 (test #f "NOT_STARTED"    
       (begin
@@ -253,24 +293,16 @@
 
 ;;======================================================================
 ;; R E M O T E   C A L L S 
 ;;======================================================================
 
-;; start a server process
-(set! *verbosity* 10)
-;; (define server-pid (process-run "../../bin/megatest" (list "-server" "-" "-debug" (conc *verbosity*))))
-;; (sleep 2)
-
-(define th1 (make-thread server:launch))
-(thread-start! th1)
-
 (define start-wait (current-seconds))
 (server:client-setup)
 (print "Starting intensive cache and rpc test")
 (for-each (lambda (params)
 	    ;;; (rdb:tests-register-test #f 1 (conc "test" (random 20)) "")
-	    (apply cdb:test-set-status-state *remoterun* test-id params)
+	    (apply cdb:test-set-status-state *runremote* test-id params)
 	    (rdb:pass-fail-counts test-id (random 100) (random 100))
 	    (rdb:test-rollup-test_data-pass-fail test-id)
 	    (thread-sleep! 0.01)) ;; cache ordering granularity is at the second level. Should really be at the ms level
 	  '(("COMPLETED"    "PASS" #f)
 	    ("NOT_STARTED"  "FAIL" "Just testing")
@@ -332,8 +364,10 @@
 			       #t))
 
 (hash-table-set! args:arg-hash ":runname" "%")
 
 (test "Remove the rollup run" #t (begin (operate-on 'remove-runs)))
+
+(thread-join! th1 th2 th3)
 
 ;; ADD ME!!!! (db:get-prereqs-not-met *db* 1 '("runfirst") "" mode: 'normal)
 ;; ADD ME!!!! (rdb:get-tests-for-run *db* 1 "runfirst" #f '() '())