Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -50,11 +50,11 @@
 ;; Do all the connection work, look up the transport type and set up the
 ;; connection if required.
 ;;
 ;; There are two scenarios. 
 ;;   1. We are a test manager and we received *transport-type* and *runremote* via cmdline
-;;   2. We are a run tests, list runs or other interactive process and we mush figure out
+;;   2. We are a run tests, list runs or other interactive process and we must figure out
 ;;      *transport-type* and *runremote* from the monitor.db
 ;;
 ;; client:setup
 (define (client:setup #!key (numtries 3))
   (if (not *toppath*)
@@ -62,36 +62,18 @@
 	  (begin
 	    (debug:print 0 "ERROR: failed to find megatest.config, exiting")
 	    (exit))))
   (push-directory *toppath*) ;; This is probably NOT needed 
   (debug:print-info 11 "*transport-type* is " *transport-type* ", *runremote* is " *runremote*)
-  (let* ((hostinfo  (if (not *transport-type*) ;; If we dont' already have transport type set then figure it out
-			(open-run-close tasks:get-best-server tasks:open-db)
-			#f)))
-    ;; if have hostinfo then extract the transport type 
-    ;; else fall back to fs
+  (let* ((hostinfo  (open-run-close tasks:get-best-server tasks:open-db)))
     (debug:print-info 11 "CLIENT SETUP, hostinfo=" hostinfo)
     (set! *transport-type* (if hostinfo 
     			       (string->symbol (tasks:hostinfo-get-transport hostinfo))
 			       'fs))
-    ;; ;; DEBUG STUFF
-    ;; (if (eq? *transport-type* 'fs)(begin (print "ERROR!!!!!!! refusing to run with transport " *transport-type*)(exit 99)))
-    
     (debug:print-info 11 "Using transport type of " *transport-type* (if hostinfo (conc " to connect to " hostinfo) ""))
     (case *transport-type* 
       ((fs)(if (not *megatest-db*)(set! *megatest-db* (open-db))))
-      ;; NB// Going back to enabling fs and possibly even make it the default.
-       ;; ;; we are not doing fs any longer. let's cheat and start up a server
-       ;; ;; if we are falling back on fs (not 100% supported) do an about face and start a server
-       ;; (if (not (equal? (args:get-arg "-transport") "fs"))
-       ;;     (begin
-       ;;       (set! *transport-type* #f)
-       ;;       (system ;; (conc "megatest -list-servers | grep " (common:version-signature) " | grep alive || megatest -server - -daemonize && sleep 3"))
-       ;;        "megatest -server - -daemonize")
-       ;;       (thread-sleep! 1)
-       ;;       (if (> numtries 0)
-       ;;  	 (client:setup numtries: (- numtries 1))))))
       ((http)
        (http-transport:client-connect (tasks:hostinfo-get-interface hostinfo)
 				      (tasks:hostinfo-get-port hostinfo)))
       ((zmq)
        (zmq-transport:client-connect (tasks:hostinfo-get-interface hostinfo)

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -1361,14 +1361,15 @@
 	(begin
 	  (print "ERROR: runid is not a number " (args:get-arg "-run"))
 	  (exit 1)))))
  ((args:get-arg "-test")
   (let ((testid (string->number (args:get-arg "-test"))))
-    (if testid
+    (if (and (number? testid)
+	     (>= testid 0))
 	(examine-test testid)
 	(begin
-	  (print "ERROR: testid is not a number " (args:get-arg "-test"))
+	  (debug:print 3 "INFO: tried to open test with invalid test-id. " (args:get-arg "-test"))
 	  (exit 1)))))
  ((args:get-arg "-guimonitor")
   (gui-monitor *db*))
  (else
   (set! uidat (make-dashboard-buttons *num-runs* *num-tests* *dbkeys*))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -90,11 +90,11 @@
 	  (change-directory top-path)
 	  (debug:print 2 "Exectuing " test-name " (id: " test-id ") on " (get-host-name))
 	  ;; Setup the *runremote* global var
 	  (if *runremote* (debug:print 2 "ERROR: I'm not expecting *runremote* to be set at this time"))
 	  ;; (set! *runremote* runremote)
-	  (set! *transport-type* (string->symbol transport))
+	  ;; (set! *transport-type* (string->symbol transport))
 	  (set! keys       (cdb:remote-run db:get-keys #f))
 	  (set! keyvals    (keys:target->keyval keys target))
 	  ;; apply pre-overrides before other variables. The pre-override vars must not
 	  ;; clobbers things from the official sources such as megatest.config and runconfigs.config
 	  (if (string? set-vars)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -254,14 +254,14 @@
       (exit)))
 
 (define *didsomething* #f)
 
 ;; Force default transport to fs
-(if ;; (and (or (args:get-arg "-list-targets")
-    ;;          (args:get-arg "-list-db-targets"))
- (not (args:get-arg "-transport"))
- (hash-table-set! args:arg-hash "-transport" "fs"))
+;; (if ;; (and (or (args:get-arg "-list-targets")
+;;     ;;          (args:get-arg "-list-db-targets"))
+;;  (not (args:get-arg "-transport"))
+;;  (hash-table-set! args:arg-hash "-transport" "fs"))
 
 ;;======================================================================
 ;; Misc setup stuff
 ;;======================================================================
 
@@ -314,56 +314,72 @@
       (debug:print 2 "Launching server using transport " transport)
       (server:launch (string->symbol transport)))
 
     ;; Not a server? This section will decide how to communicate
     ;;
-    (if (not (null? (lset-intersection 
+    ;;  Setup client for all expect listed here
+    (if (null? (lset-intersection 
 		     equal?
 		     (hash-table-keys args:arg-hash)
-		     '("-runtests"    "-list-runs"   "-rollup"
-		       "-remove-runs" "-lock"        "-unlock"
-		       "-update-meta" "-extract-ods" "-list-servers"
-		       "-stop-server" "-show-cmdinfo"))))
+		     '("-list-servers"
+		       "-stop-server"
+		       "-show-cmdinfo")))
 	(if (setup-for-run)
 	    (begin
 
 	      ;; if not list or kill then start a client (if appropriate)
 	      (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
 		      (eq? (length (hash-table-keys args:arg-hash)) 0))
 		  (debug:print-info 1 "Server connection not needed")
 		  ;; ok, so lets connect to the server
-		  (let ((transport-from-config   (configf:lookup *configdat* "setup" "transport"))
-			(transport-from-cmdln    (args:get-arg "-transport"))
-			(transport-from-cmdinfo  (if (getenv "MT_CMDINFO")
-						     (assoc 'transport 
-							    (read (open-input-string (base64:base64-decode
-										      (getenv "MT_CMDINFO")))))
-						     #f)))
-		    (cond
-		     ;; command line overrides other mechanisms
-		     (transport-from-cmdln
-		      (if (equal? transport-from-cmdln "fs")
-			  (set! *transport-type* 'fs)
-			  (begin
-			    (server:ensure-running)
-			    (client:launch))))
-		     ;; cmdinfo is second priority
-		     (transport-from-cmdinfo
-		      (if (equal? transport-from-cmdinfo "fs")
-			  (set! *transport-type* 'fs)
-			  (begin
-			    (server:ensure-running)
-			    (client:launch))))
-		     ;; config file is next highest priority for determinining transport
-		     (transport-from-config
-		      (if (equal? transport-from-config "fs")
-			  (set! *transport-type* 'fs)
-			  (begin
-			    (server:ensure-running)
-			    (client:launch))))
-		     (else
-		      (set! *transport-type* 'fs)))))))))
+		  (let* ((transport-from-config   (configf:lookup *configdat* "setup" "transport"))
+			 (transport-from-cmdln    (args:get-arg "-transport"))
+			 (transport-from-cmdinfo  (if (getenv "MT_CMDINFO")
+						      (let ((res (assoc 'transport 
+									(read
+									 (open-input-string 
+									  (base64:base64-decode
+									   (getenv "MT_CMDINFO")))))))
+							(if res (cadr res) #f))
+						      #f))
+			 (chosen-transport        (string->symbol (or transport-from-cmdln
+								      transport-from-cmdinfo
+								      transport-from-config
+								      "fs"))))
+		    (debug:print 0 "chosen-transport: " chosen-transport " have; config=" transport-from-config ", cmdln=" transport-from-cmdln ", cmdinfo=" transport-from-cmdinfo)
+		    (case chosen-transport
+		      ((http)
+		       (set! *transport-type 'http)
+		       (server:ensure-running)
+		       (client:launch))
+		      (else ;; (fs)
+		       (set! *transport-type* 'fs)
+		       (set! *megatest-db* (open-db))))))))))
+;; 		    (cond
+;; 		     ;; command line overrides other mechanisms
+;; 		     (transport-from-cmdln
+;; 		      (if (equal? transport-from-cmdln "fs")
+;; 			  (set! *transport-type* 'fs)
+;; 			  (begin
+;; 			    (server:ensure-running)
+;; 			    (client:launch))))
+;; 		     ;; cmdinfo is second priority
+;; 		     (transport-from-cmdinfo
+;; 		      (if (equal? transport-from-cmdinfo "fs")
+;; 			  (set! *transport-type* 'fs)
+;; 			  (begin
+;; 			    (server:ensure-running)
+;; 			    (client:launch))))
+;; 		     ;; config file is next highest priority for determinining transport
+;; 		     (transport-from-config
+;; 		      (if (equal? transport-from-config "fs")
+;; 			  (set! *transport-type* 'fs)
+;; 			  (begin
+;; 			    (server:ensure-running)
+;; 			    (client:launch))))
+;; 		     (else
+;; 		      (set! *transport-type* 'fs)))))))))
 
 (if (or (args:get-arg "-list-servers")
 	(args:get-arg "-stop-server"))
     (let ((tl (setup-for-run)))
       (if tl 
@@ -712,11 +728,11 @@
 	       (status    (args:get-arg ":status"))
 	       (target    (args:get-arg "-target"))
 	       (toppath   (assoc/default 'toppath   cmdinfo)))
 	  (change-directory toppath)
 	  ;; (set! *runremote* runremote)
-	  (set! *transport-type* (string->symbol transport))
+	  ;; (set! *transport-type* (string->symbol transport))
 	  (if (not target)
 	      (begin
 		(debug:print 0 "ERROR: -target is required.")
 		(exit 1)))
 	  (if (not (setup-for-run))
@@ -763,11 +779,11 @@
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status"))
 	       (target    (args:get-arg "-target")))
 	  (change-directory testpath)
 	  ;; (set! *runremote* runremote)
-	  (set! *transport-type* (string->symbol transport))
+	  ;; (set! *transport-type* (string->symbol transport))
 	  (if (not target)
 	      (begin
 		(debug:print 0 "ERROR: -target is required.")
 		(exit 1)))
 	  (if (not (setup-for-run))
@@ -844,11 +860,12 @@
 	     (itemdat   (assoc/default 'itemdat   cmdinfo))
 	     (work-area (assoc/default 'work-area cmdinfo))
 	     (db        #f))
 	(change-directory testpath)
 	;; (set! *runremote* runremote)
-	(set! *transport-type* (string->symbol transport))
+	;; The transport is handled earlier in the loading process of megatest.
+	;; (set! *transport-type* (string->symbol transport))
 	(if (not (setup-for-run))
 	    (begin
 	      (debug:print 0 "Failed to setup, exiting")
 	      (exit 1)))
 	(if (and state status)
@@ -896,11 +913,11 @@
 	       (work-area (assoc/default 'work-area cmdinfo))
 	       (db        #f) ;; (open-db))
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status")))
 	  ;; (set! *runremote* runremote)
-	  (set! *transport-type* (string->symbol transport))
+	  ;; (set! *transport-type* (string->symbol transport))
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -129,11 +129,12 @@
 	      (begin
 		(debug:print 0 "INFO: Starting server as none running ...")
 		;; (server:launch (string->symbol (args:get-arg "-transport" "http"))))
 		;; no need to use fork, no need to do the list-servers trick. Just start the damn server, it will exit on it's own
 		;; if there is an existing server
-		(system "megatest -server - -daemonize")
+		(system (conc (if (getenv "MT_MEGATEST") (getenv "MT_MEGATEST") "megatest")
+			      " -server - -daemonize"))
 		(thread-sleep! 3)
 		;; (process-run (car (argv)) (list "-server" "-" "-daemonize" "-transport" (args:get-arg "-transport" "http")))
 		;; (system (conc "megatest -list-servers | egrep '" megatest-version ".*alive' || megatest -server - -daemonize && sleep 3"))
 		;; (process-fork (lambda ()
 		;;       	  (daemon:ize)

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -199,21 +199,26 @@
 
 ;; ping each server in the db and return first found that responds. 
 ;; remove any others. will not necessarily remove all!
 (define (tasks:get-best-server mdb)
   (let ((res '())
-	(best #f))
+	(best #f)
+	(transport (if (and *transport-type*
+			    (not (eq? *transport-type* 'fs)))
+		       (conc *transport-type*)
+		       "%")))
     (sqlite3:for-each-row
      (lambda (id interface port pubport transport pid hostname)
        (set! res (cons (vector id interface port pubport transport pid hostname) res))
        ;;(debug:print-info 2 "Found existing server " hostname ":" port " registered in db"))
        )
      mdb
      
      "SELECT id,interface,port,pubport,transport,pid,hostname FROM servers
           WHERE strftime('%s','now')-heartbeat < 10 
-          AND mt_version=? ORDER BY start_time DESC LIMIT 1;" (common:version-signature))
+          AND mt_version=? AND transport LIKE ? 
+          ORDER BY start_time DESC LIMIT 1;" (common:version-signature) transport)
     ;; for now we are keeping only one server registered in the db, return #f or first server found
     (if (null? res) #f (car res))))
 
 ;; BUG: This logic is probably needed unless methodology changes completely...
 ;;

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -147,11 +147,14 @@
 fullprep : cleanprep
 	cd fullrun;$(MEGATEST) -remove-runs :runname $(RUNNAME)% -target %/%/% -testpatt %/%
 	cd fullrun;$(BINPATH)/dashboard -rows 15 &
 
 dashboard : cleanprep
-	cd fullrun && $(BINPATH)/dashboard -rows 25 &
+	cd fullrun && $(BINPATH)/dashboard -transport fs -rows 20 &
+
+dashboard-http : cleanprep
+	cd fullrun && $(BINPATH)/dashboard -transport http -rows 20 &
 
 remove :
 	cd fullrun;$(MEGATEST) -remove-runs :runname $(RUN)  -testpatt % -itempatt % :sysname % :fsname % :datapath %
 
 clean  :