Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -55,10 +55,18 @@
 	(common:read-encoded-string enccmd)
 	'())))
 
 ;;                       0           1              2              3
 (defstruct launch:einf (pid #t)(exit-status #t)(exit-code #t)(rollup-status 0))
+
+(define (launch:load-logpro-dat 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)))
+
 
 (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))
@@ -65,10 +73,11 @@
 	 (stepparms      (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each 
 	 (stepcmd        (list-ref stepparts 3))
 	 (script         "") ; "#!/bin/bash\n") ;; yep, we depend on bin/bash FIXME!!!\
 	 (logpro-file    (conc stepname ".logpro"))
 	 (html-file      (conc stepname ".html"))
+	 (dat-file       (conc stepname ".dat"))
 	 (tconfig-logpro (configf:lookup testconfig "logpro" stepname))
 	 (logpro-used    (file-exists? logpro-file)))
 
     (if (and tconfig-logpro
 	     (not logpro-used)) ;; no logpro file found but have a defn in the testconfig
@@ -134,11 +143,15 @@
     
     (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
-	(rmt:test-set-log! run-id test-id (conc stepname ".html")))
+	(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"))))
     ;; 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
@@ -274,14 +287,12 @@
 			     (thread-start! th2)
 			     (thread-start! th1)
 			     (thread-join! th2)))))
 	    (set-signal-handler! signal/int sighand)
 	    (set-signal-handler! signal/term sighand)
-	    (set-signal-handler! signal/stop sighand))
+	    ) ;; (set-signal-handler! signal/stop sighand)
 	  
-	  ;; (set-signal-handler! signal/int (lambda ()
-					    
 	  ;; Do not run the test if it is REMOVING, RUNNING, KILLREQ or REMOTEHOSTSTART,
 	  ;; Mark the test as REMOTEHOSTSTART *IMMEDIATELY*
 	  ;;
 	  (let* ((test-info (rmt:get-test-info-by-id run-id test-id))
 		 (test-host (db:test-get-host        test-info))
@@ -390,11 +401,11 @@
 	  ;; open-run-close not needed for test-set-meta-info
 	  ;; (tests:set-full-meta-info #f test-id run-id 0 work-area)
 	  ;; (tests:set-full-meta-info test-id run-id 0 work-area)
 	  (tests:set-full-meta-info #f test-id run-id 0 work-area 10)
 
-	  (thread-sleep! 0.3) ;; NFS slowness has caused grief here
+	  ;; (thread-sleep! 0.3) ;; NFS slowness has caused grief here
 
 	  (if (args:get-arg "-xterm")
 	      (set! fullrunscript "xterm")
 	      (if (and fullrunscript 
 		       (file-exists? fullrunscript)
@@ -403,11 +414,11 @@
 
 	  ;; We are about to actually kick off the test
 	  ;; so this is a good place to remove the records for 
 	  ;; any previous runs
 	  ;; (db:test-remove-steps db run-id testname itemdat)
-	  
+	  ;; 
 	  (let* ((m            (make-mutex))
 		 (kill-job?    #f)
 		 (exit-info    (make-launch:einf pid: #t exit-status: #t exit-code: #t rollup-status: 0)) ;; pid exit-status exit-code (i.e. process was successfully run) rollup-status
 		 (job-thread   #f)
 		 (keep-going   #t)
@@ -476,15 +487,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")))
-						       (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)))
+						       (launch:load-logpro-dat 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))))))))

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two or four digit decimal
-;; 1.01, 1.02...1.10,1.11,1,1101 ... 1.99,2.00..
+;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.6101)
+(define megatest-version 1.6102)