Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -47,10 +47,11 @@
   (let* ((cmdinfo   (read (open-input-string (base64:base64-decode encoded-cmd)))))
     (setenv "MT_CMDINFO" encoded-cmd)
     (if (list? cmdinfo) ;; ((testpath /tmp/mrwellan/jazzmind/src/example_run/tests/sqlitespeed)
                         ;; (test-name sqlitespeed) (runscript runscript.rb) (db-host localhost) (run-id 1))
 	(let* ((testpath  (assoc/default 'testpath  cmdinfo))
+	       (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))
@@ -66,11 +67,10 @@
 	       (fullrunscript (if runscript (conc testpath "/" runscript) #f))
 	       (db        #f)
 	       (rollup-status 0))
 	  
 	  (debug:print 2 "Exectuing " test-name " (id: " test-id ") on " (get-host-name))
-	  (change-directory testpath)
 	  ;; 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)
@@ -87,15 +87,16 @@
 	  (setenv "MT_ITEM_INFO" (conc itemdat))
 	  (setenv "MT_RUNNAME"   runname)
 	  (setenv "MT_MEGATEST"  megatest)
 	  (setenv "MT_TARGET"    target)
 	  (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path)))
-	  
+	  (change-directory top-path)
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting") 
 		(exit 1)))
+	  (change-directory *toppath*)
 	  ;; now can find our db
 	  (set! db (open-db))
 	  (if (not (args:get-arg "-server"))
 	      (server:client-setup db))
 	  ;; (set! *cache-on* #t)
@@ -566,10 +567,11 @@
 	  (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  )