Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -60,21 +60,24 @@
 
 ;; return (conc status ": " comment) from the final section so that
 ;;   the comment can be set in the step record in launch.scm
 ;;
 (define (launch:load-logpro-dat run-id test-id stepname)
-  (let* ((dat  (read-config (conc stepname ".dat") #f #f))
-	 (csvr (db:logpro-dat->csv dat stepname))
-	 (csvt (let-values (( (fmt-cell fmt-record fmt-csv) (make-format ",")))
-			   (fmt-csv (map list->csv-record csvr))))
-	 (status (configf:lookup dat "final" "exit-status"))
-	 (msg     (configf:lookup dat "final" "message")))
-    (rmt:csv->test-data run-id test-id csvt)
-    (cond
-     ((equal? status "PASS") "PASS") ;; skip the message part if status is pass
-     (status (conc (configf:lookup dat "final" "exit-status") ": " (configf:lookup dat "final" "message")))
-     (else #f))))
+  (let ((cname (conc stepname ".dat")))
+    (if (file-exists? cname)
+	(let* ((dat  (read-config cname #f #f))
+	       (csvr (db:logpro-dat->csv dat stepname))
+	       (csvt (let-values (( (fmt-cell fmt-record fmt-csv) (make-format ",")))
+				 (fmt-csv (map list->csv-record csvr))))
+	       (status (configf:lookup dat "final" "exit-status"))
+	       (msg     (configf:lookup dat "final" "message")))
+	  (rmt:csv->test-data run-id test-id csvt)
+	  (cond
+	   ((equal? status "PASS") "PASS") ;; skip the message part if status is pass
+	   (status (conc (configf:lookup dat "final" "exit-status") ": " (configf:lookup dat "final" "message")))
+	   (else #f)))
+	#f)))
 
 (define (launch:runstep ezstep run-id test-id exit-info m tal testconfig)
   (let* ((stepname       (car ezstep))  ;; do stuff to run the step
 	 (stepinfo       (cadr ezstep))
 	 (stepparts      (string-match (regexp "^(\\{([^\\}]*)\\}\\s*|)(.*)$") stepinfo))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1629,11 +1629,13 @@
 	(if (not (launch:setup))
 	    (begin
 	      (debug:print 0 "Failed to setup, exiting")
 	      (exit 1)))
 	(if (and state status)
-	    (rmt:teststep-set-status! run-id test-id step state status msg logfile)
+	    (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
 	      (debug:print 0 "ERROR: You must specify :state and :status with every call to -step")
 	      (exit 6))))))
 
 (if (args:get-arg "-step")
@@ -1671,11 +1673,12 @@
 	       (test-id   (assoc/default 'test-id   cmdinfo))
 	       (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")))
+	       (status    (args:get-arg ":status"))
+	       (stepname  (args:get-arg "-step")))
 	  (if (not (launch:setup))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -634,11 +634,10 @@
 		      ((<   (tdb:step-get-event_time a)(tdb:step-get-event_time b)) #t)
 		      ((eq? (tdb:step-get-event_time a)(tdb:step-get-event_time b)) 
 		       (<   (tdb:step-get-id a)        (tdb:step-get-id b)))
 		      (else #f)))))
       res))
-
 
 ;; 
 ;;
 (define (tests:get-compressed-steps run-id test-id)
   (let* ((steps-data  (rmt:get-steps-for-test run-id test-id))