@@ -56,17 +56,25 @@
 	'())))
 
 ;;                       0           1              2              3
 (defstruct launch:einf (pid #t)(exit-status #t)(exit-code #t)(rollup-status 0))
 
-(define (launch:load-logpro-dat stepname)
+;; 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)))))
-    (rmt:csv->test-data run-id test-id csvt)))
-
+			   (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))))
 
 (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))
@@ -140,18 +148,19 @@
 			      (thread-sleep! 2)
 			      (processloop (+ i 1)))))
 	    (debug:print-info 0 "logpro for step " stepname " exited with code " (launch:einf-exit-code exit-info))))) ;; (vector-ref exit-info 2)))))
     
     (let ((exinfo (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
-	  (logfna (if logpro-used (conc stepname ".html") "")))
-      (rmt:teststep-set-status! run-id test-id stepname "end" exinfo #f logfna))
-    (if logpro-used
-	(let ((datfile (conc stepname ".dat")))
-	  ;; load the .dat file into the test_data table if it exists
-	  (if (file-exists? datfile)
-	      (launch:load-logpro-dat stepname))
-	(rmt:test-set-log! run-id test-id (conc stepname ".html"))))
+	  (logfna (if logpro-used (conc stepname ".html") ""))
+	  (comment #f))
+      (if logpro-used
+	  (let ((datfile (conc stepname ".dat")))
+	    ;; load the .dat file into the test_data table if it exists
+	    (if (file-exists? datfile)
+		(set! comment (launch:load-logpro-dat run-id test-id stepname)))
+	    (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
+      (rmt:teststep-set-status! run-id test-id stepname "end" exinfo comment logfna))
     ;; set the test final status
     (let* ((process-exit-status (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
 	   (this-step-status (cond
 			      ((and (eq? process-exit-status 2) logpro-used) 'warn)   ;; logpro 2 = warnings
 			      ((and (eq? process-exit-status 3) logpro-used) 'check)  ;; logpro 3 = check
@@ -281,11 +290,11 @@
 	      (if (launch:einf-exit-status exit-info) ;; (vector-ref exit-info 1)
 		  (let ((logpro-used (launch:runstep ezstep run-id test-id exit-info m tal testconfig))
 			(stepname    (car ezstep)))
 		    ;; if logpro-used read in the stepname.dat file
 		    (if (and logpro-used (file-exists? (conc stepname ".dat")))
-			(launch:load-logpro-dat stepname))
+			(launch:load-logpro-dat run-id test-id stepname))
 		    (if (steprun-good? logpro-used (launch:einf-exit-code exit-info))
 			(if (not (null? tal))
 			    (loop (car tal) (cdr tal) stepname))
 			(debug:print 4 "WARNING: step " (car ezstep) " failed. Stopping")))
 		  (debug:print 4 "WARNING: a prior step failed, stopping at " ezstep)))))))