Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -73,11 +73,11 @@
 					   136000)))) ;; 136000))) ;; 136000 = 2.2 minutes
     (debug:print-info 11 "open-db, dbpath=" dbpath " argv=" (argv))
     (sqlite3:set-busy-handler! db handler)
     (if (not dbexists)
 	(db:initialize db))
-    (db:set-sync db)
+    ;; (db:set-sync db)
     db))
 
 ;; keeping it around for debugging purposes only
 (define (open-run-close-no-exception-handling  proc idb . params)
   (debug:print-info 11 "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params)
@@ -113,11 +113,11 @@
 (define (open-run-close-measure  proc idb . params)
   (debug:print-info 11 "open-run-close-measure START, idb=" idb ", params=" params)
   (let* ((start-ms (current-milliseconds))
 	 (db       (if idb idb (open-db)))
          (throttle (string->number (config-lookup *configdat* "setup" "throttle"))))
-    (db:set-sync db)
+    ;; (db:set-sync db)
     (set! res      (apply proc db params))
     (if (not idb)(sqlite3:finalize! db))
     ;; scale by 10, average with current value.
     (set! *global-delta* (/ (+ *global-delta* (* (- (current-milliseconds) start-ms)
 						 (if throttle throttle 0.01)))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -59,11 +59,11 @@
 	       (top-path  (assoc/default 'toppath   cmdinfo))
 	       (work-area (assoc/default 'work-area cmdinfo))
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (ezsteps   (assoc/default 'ezsteps   cmdinfo))
-	       (db-host   (assoc/default 'db-host   cmdinfo))
+	       (runremote (assoc/default 'runremote cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
 	       (test-id   (assoc/default 'test-id   cmdinfo))
 	       (target    (assoc/default 'target    cmdinfo))
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (env-ovrd  (assoc/default 'env-ovrd  cmdinfo))
@@ -79,12 +79,14 @@
 	                                  (if (and (file-exists? fulln)
                                                    (file-execute-access? fulln))
                                               fulln
                                               runscript))))) ;; assume it is on the path
 	       (rollup-status 0))
-	  
 	  (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)
 	  ;; 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)
 	      (let ((varpairs (string-split set-vars ",")))
 		(debug:print 4 "varpairs: " varpairs)
@@ -568,27 +570,29 @@
 	  (debug:print-info 2 "Using work area " work-area))
 	(begin
 	  (set! work-area (conc test-path "/tmp_run"))
 	  (create-directory work-area #t)
 	  (debug:print 0 "WARNING: No disk work area specified - running in the test directory under tmp_run")))
-    (set! cmdparms (base64:base64-encode (with-output-to-string
-					   (lambda () ;; (list 'hosts     hosts)
-					     (write (list (list 'testpath  test-path)
-							  (list 'toppath   *toppath*)
-							  (list 'work-area work-area)
-							  (list 'test-name test-name) 
-							  (list 'runscript runscript) 
-							  (list 'run-id    run-id   )
-							  (list 'test-id   test-id  )
-							  (list 'itemdat   itemdat  )
-							  (list 'megatest  remote-megatest)
-							  (list 'ezsteps   ezsteps) 
-							  (list 'target    mt_target)
-							  (list 'env-ovrd  (hash-table-ref/default *configdat* "env-override" '())) 
-							  (list 'set-vars  (if params (hash-table-ref/default params "-setvars" #f)))
-							  (list 'runname   runname)
-							  (list 'mt-bindir-path mt-bindir-path))))))) ;; (string-intersperse keyvallst " "))))
+    (set! cmdparms (base64:base64-encode 
+		    (with-output-to-string
+		      (lambda () ;; (list 'hosts     hosts)
+			(write (list (list 'testpath  test-path)
+				     (list 'runremote *runremote*)
+				     (list 'toppath   *toppath*)
+				     (list 'work-area work-area)
+				     (list 'test-name test-name) 
+				     (list 'runscript runscript) 
+				     (list 'run-id    run-id   )
+				     (list 'test-id   test-id  )
+				     (list 'itemdat   itemdat  )
+				     (list 'megatest  remote-megatest)
+				     (list 'ezsteps   ezsteps) 
+				     (list 'target    mt_target)
+				     (list 'env-ovrd  (hash-table-ref/default *configdat* "env-override" '())) 
+				     (list 'set-vars  (if params (hash-table-ref/default params "-setvars" #f)))
+				     (list 'runname   runname)
+				     (list 'mt-bindir-path mt-bindir-path))))))) ;; (string-intersperse keyvallst " "))))
     ;; clean out step records from previous run if they exist
     ;; (debug:print-info 4 "FIXMEEEEE!!!! This can be removed some day, perhaps move all test records to the test db?")
     ;; (open-run-close db:delete-test-step-records db test-id)
     (change-directory work-area) ;; so that log files from the launch process don't clutter the test dir
     (tests:test-set-status! test-id "LAUNCHED" "n/a" #f #f) ;; (if launch-results launch-results "FAILED"))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -580,10 +580,11 @@
 (if (or (args:get-arg "-test-files")(args:get-arg "-test-paths"))
     ;; if we are in a test use the MT_CMDINFO data
     (if (getenv "MT_CMDINFO")
 	(let* ((startingdir (current-directory))
 	       (cmdinfo   (read (open-input-string (base64:base64-decode (getenv "MT_CMDINFO")))))
+	       (runremote (assoc/default 'runremote cmdinfo))
 	       (testpath  (assoc/default 'testpath  cmdinfo))
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (db-host   (assoc/default 'db-host   cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
@@ -592,10 +593,11 @@
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status"))
 	       (target    (args:get-arg "-target"))
 	       (toppath   (assoc/default 'toppath   cmdinfo)))
 	  (change-directory toppath)
+	  (set! *runremote* runremote)
 	  (if (not target)
 	      (begin
 		(debug:print 0 "ERROR: -target is required.")
 		(exit 1)))
 	  (if (not (setup-for-run))
@@ -628,10 +630,11 @@
 (if (args:get-arg "-archive")
     ;; if we are in a test use the MT_CMDINFO data
     (if (getenv "MT_CMDINFO")
 	(let* ((startingdir (current-directory))
 	       (cmdinfo   (read (open-input-string (base64:base64-decode (getenv "MT_CMDINFO")))))
+	       (runremote (assoc/default 'runremote cmdinfo))
 	       (testpath  (assoc/default 'testpath  cmdinfo))
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (db-host   (assoc/default 'db-host   cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
@@ -639,10 +642,11 @@
 	       (db        #f)
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status"))
 	       (target    (args:get-arg "-target")))
 	  (change-directory testpath)
+	  (set! *runremote* runremote)
 	  (if (not target)
 	      (begin
 		(debug:print 0 "ERROR: -target is required.")
 		(exit 1)))
 	  (if (not (setup-for-run))
@@ -708,10 +712,11 @@
 	(begin
 	  (debug:print 0 "ERROR: MT_CMDINFO env var not set, -step must be called *inside* a megatest invoked environment!")
 	  (exit 5))
 	(let* ((step      (args:get-arg "-step"))
 	       (cmdinfo   (read (open-input-string (base64:base64-decode (getenv "MT_CMDINFO")))))
+	       (runremote (assoc/default 'runremote cmdinfo))
 	       (testpath  (assoc/default 'testpath  cmdinfo))
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (db-host   (assoc/default 'db-host   cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
@@ -720,10 +725,11 @@
 	       (db        #f)
 	       (state    (args:get-arg ":state"))
 	       (status   (args:get-arg ":status"))
 	       (logfile  (args:get-arg "-setlog")))
 	  (change-directory testpath)
+	  (set! *runremote* runremote)
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 	  (if (and state status)
@@ -745,10 +751,11 @@
 	(begin
 	  (debug:print 0 "ERROR: MT_CMDINFO env var not set, commands -test-status, -runstep and -setlog must be called *inside* a megatest environment!")
 	  (exit 5))
 	(let* ((startingdir (current-directory))
 	       (cmdinfo   (read (open-input-string (base64:base64-decode (getenv "MT_CMDINFO")))))
+	       (runremote (assoc/default 'runremote cmdinfo))
 	       (testpath  (assoc/default 'testpath  cmdinfo))
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (db-host   (assoc/default 'db-host   cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
@@ -756,10 +763,11 @@
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (db        #f)
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status")))
 	  (change-directory testpath)
+	  (set! *runremote* runremote)
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 

Index: utils/installall.sh
==================================================================
--- utils/installall.sh
+++ utils/installall.sh
@@ -1,8 +1,8 @@
 #! /usr/bin/env bash
 
-set -x
+# set -x
 
 # Copyright 2007-2010, Matthew Welland.
 # 
 #  This program is made available under the GNU GPL version 2.0 or
 #  greater. See the accompanying file COPYING for details.
@@ -20,11 +20,11 @@
 echo You are using PREFIX=$PREFIX
 echo You are using proxy="$proxy"
 echo 
 echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :"
 echo ADDITIONAL_LIBPATH=$ADDITIONAL_LIBPATH
-echo
+echo  
 echo To use previous IUP libraries set USEOLDIUP to yes
 echo USEOLDIUP=$USEOLDIUP
 echo 
 echo Hit ^C now to do that
 
@@ -74,11 +74,11 @@
 echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 
 if ! [[ -e $PREFIX/bin/csi ]]; then
     tar xfvz chicken-${CHICKEN_VERSION}.tar.gz
     cd chicken-${CHICKEN_VERSION}
-    make PLATFORM=linux PREFIX=$PREFIX clean
+    # make PLATFORM=linux PREFIX=$PREFIX spotless
     make PLATFORM=linux PREFIX=$PREFIX
     make PLATFORM=linux PREFIX=$PREFIX install
     cd $BUILDHOME
 fi
 
@@ -171,13 +171,17 @@
 #======================================================================
 
 # http://download.zeromq.org/zeromq-3.2.1-rc2.tar.gz
 # zpatchlev=-rc2
 # http://download.zeromq.org/zeromq-2.2.0.tar.gz
-# ZEROMQ=zeromq-2.2.0
 
-ZEROMQ=zeromq-3.2.2
+if [[ -e /usr/lib/libzmq.so ]]; then
+  echo "Using system installed zmq library"
+  $CHICKEN_INSTALL zmq
+else
+ZEROMQ=zeromq-2.2.0
+# ZEROMQ=zeromq-3.2.2
 
 # wget http://www.kernel.org/pub/linux/utils/util-linux/v2.22/util-linux-2.22.tar.gz
 UTIL_LINUX=2.21
 # UTIL_LINUX=2.20.1
 if ! [[ -e util-linux-${UTIL_LINUX}.tar.gz ]] ; then
@@ -285,10 +289,11 @@
     make
     make install
     CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX zmq
     # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -deploy -prefix $DEPLOYTARG zmq
 fi
+fi # if zmq is in /usr/lib
 
 cd $BUILDHOME  
 
 ## WEBKIT=WebKit-r131972
 ## if  ! [[ -e ${WEBKIT}.tar.bz2 ]] ; then