@@ -54,46 +54,46 @@
 (include "db_records.scm")
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
 
 (define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
-(define *usage-use-seconds* #f) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
+(define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
 
 ;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file
 ;;
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
   (if (common:file-exists? debugcontrolf)
       (load debugcontrolf)))
 
 ;; usage logging, careful with this, it is not designed to deal with all real world challenges!
 ;;
-(if (and (common:file-exists? *usage-log-file*)
-	   (file-write-access? *usage-log-file*))
-      (with-output-to-file
-	  *usage-log-file*
-	(lambda ()
-	  (print
-           (if *usage-use-seconds*
-               (current-seconds)
-               (time->string
-                (seconds->local-time (current-seconds))
-                "%Yww%V.%w %H:%M:%S"))
-           " "
-           (current-user-name) " "
-           (current-directory) " "
-	    "\"" (string-intersperse (argv) " ") "\""))
-	#:append))
+(if (and *usage-log-file*
+         (file-write-access? *usage-log-file*))
+    (with-output-to-file
+        *usage-log-file*
+      (lambda ()
+        (print
+         (if *usage-use-seconds*
+             (current-seconds)
+             (time->string
+              (seconds->local-time (current-seconds))
+              "%Yww%V.%w %H:%M:%S"))
+         " "
+         (current-user-name) " "
+         (current-directory) " "
+         "\"" (string-intersperse (argv) " ") "\""))
+      #:append))
 
 ;; Disabled help items
 ;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
 ;;                            from prior runs with same keys
 ;;  -daemonize              : fork into background and disconnect from stdin/out
 
 (define help (conc "
 Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
-  license GPL, Copyright Matt Welland 2006-2015
+  license GPL, Copyright Matt Welland 2006-2017
 
 Usage: megatest [options]
   -h                      : this help
   -manual                 : show the Megatest user manual
   -version                : print megatest version (currently " megatest-version ")
@@ -1705,11 +1705,11 @@
     ;; if we are in a test use the MT_CMDINFO data
     (if (getenv "MT_CMDINFO")
 	(let* ((startingdir (current-directory))
 	       (cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
 	       (transport (assoc/default 'transport cmdinfo))
-	       (testpath  (assoc/default 'testpath  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))
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
@@ -1817,24 +1817,26 @@
       (begin
 	(debug:print-error 0 *default-log-port* "MT_CMDINFO env var not set, -step must be called *inside* a megatest invoked environment!")
 	(exit 5))
       (let* ((cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
 	     (transport (assoc/default 'transport cmdinfo))
-	     (testpath  (assoc/default 'testpath  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))
 	     (test-id   (assoc/default 'test-id   cmdinfo))
 	     (itemdat   (assoc/default 'itemdat   cmdinfo))
 	     (work-area (assoc/default 'work-area cmdinfo))
-	     (db        #f))
-	(change-directory testpath)
+	     (db        #f)
+	     (testpath  #f))
 	(if (not (launch:setup))
 	    (begin
 	      (debug:print 0 *default-log-port* "Failed to setup, exiting")
 	      (exit 1)))
+	(set! testpath (db:test-get-rundir testdat))
+	(change-directory testpath)
 	(if (and state status)
 	    (let ((comment (launch:load-logpro-dat run-id test-id step)))
 	      ;; (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
 	      (rmt:teststep-set-status! run-id test-id step state status (or comment msg) logfile))
 	    (begin
@@ -1866,11 +1868,11 @@
 	  (debug:print-error 0 *default-log-port* "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   (common:read-encoded-string (getenv "MT_CMDINFO")))
 	       (transport (assoc/default 'transport cmdinfo))
-	       (testpath  (assoc/default 'testpath  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))
 	       (test-id   (assoc/default 'test-id   cmdinfo))
@@ -1877,16 +1879,18 @@
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (work-area (assoc/default 'work-area cmdinfo))
 	       (db        #f) ;; (open-db))
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status"))
-	       (stepname  (args:get-arg "-step")))
+	       (stepname  (args:get-arg "-step"))
+	       (testdat   (rmt:get-test-info-by-id run-id test-id))
+	       (testpath  #f)) ;; fill in missing data below
 	  (if (not (launch:setup))
 	      (begin
 		(debug:print 0 *default-log-port* "Failed to setup, exiting")
 		(exit 1)))
-
+	  (set! testpath (db:test-get-rundir testdat))
 	  (if (args:get-arg "-runstep")(debug:print-info 1 *default-log-port* "Running -runstep, first change to directory " work-area))
 	  (change-directory work-area)
 	  ;; can setup as client for server mode now
 	  ;; (client:setup)