Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -724,16 +724,19 @@
 		 (th1          (make-thread monitorjob "monitor job"))
 		 (th2          (make-thread runit "run job"))
                  (tconfig         (tests:get-testconfig test-name item-path tconfigreg #t))
                  (propagate-exit-code (configf:lookup *configdat* "setup" "propagate-exit-code"))
                  (propagate-status-list '("FAIL" "KILLED" "ABORT" "DEAD" "CHECK" "SKIP" "WAIVED"))
-                 (test-status "not set")
+                 (test-status     "not set")
+		 (test-state      "not set")
 		 (precmd          (configf:lookup tconfig "setup" "precmd"))
 		 (postcmd         (configf:lookup tconfig "setup" "postcmd")))
 	    ;; first, if set, run the precmd
 	    (if precmd ;; (file-exists? precmd)(file-execute-access? precmd))
-		(system precmd)) ;; up to test author to put nbfake if desired.
+		(begin
+		  ;; (save-environment-as-files "precmd-envt")
+		  (system precmd))) ;; up to test author to put nbfake if desired.
 	    (set! job-thread th2)
 	    (thread-start! th1)
 	    (thread-start! th2)
 	    (thread-join! th2)
 	    (debug:print-info 0 *default-log-port* "Megatest execute of test " test-name ", item path " item-path " complete. Notifying the db ...")
@@ -790,25 +793,30 @@
 	    (mutex-unlock! m)
             (launch:end-of-run-check run-id )
 	    (debug:print 2 *default-log-port* "Output from running " fullrunscript ", pid " (launch:einf-pid exit-info) " in work area " 
 			 work-area ":\n====\n exit code " (launch:einf-exit-code exit-info) "\n" "====\n")
 
-
-            (set! test-status (db:test-get-status (rmt:get-testinfo-state-status run-id test-id)))
+	    (let* ((testrec  (rmt:get-testinfo-state-status run-id test-id)))
+              (set! test-status (db:test-get-status testrec))
+	      (set! test-state  (db:test-get-state  testrec)))
 
             ;; If the propagate-exit-code option has been set in the megatest config, and the test status matches the list, set the exit code to 1.
 
-	    (if postcmd
-		(system postcmd))
 
             (if (and propagate-exit-code (string=? propagate-exit-code "yes") (member test-status propagate-status-list))
                (begin
                 (debug:print 1 *default-log-port* "Setting exit status to 1 because of test status of " test-status) 
                 (set! *globalexitstatus* 1)
                )
             )
 
+	    (if postcmd
+		(begin
+		  (setenv "MT_TEST_STATE" test-state)
+		  (setenv "MT_TEST_STATUS" test-status)
+		  ;; (save-environment-as-files "postcmd-envt")
+		  (system postcmd)))
 	    (if (not (launch:einf-exit-status exit-info))
 		(exit 4))))
         )))
 
 ;; Spec for End of test