Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -662,17 +662,20 @@
 		 (monitorjob   (lambda ()
 				 (launch:monitor-job  run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m work-area runtlim misc-flags)))
 		 (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 tconfig   "requirements" "propagate-exit-code")))
+                 (propagate-exit-code (configf:lookup *configdat* "setup" "propagate-exit-code"))
+                 (propagate-status-list '("FAIL" "KILLED" "ABORT" "DEAD" "CHECK" "SKIP" "WAIVED"))
+                 (test-status "not set")
+                 )
 	    (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 ...")
-            (debug:print-info 0 *default-log-port* "exit-info = " exit-info)
+            (debug:print-info 2 *default-log-port* "exit-info = " exit-info)
 	    (hash-table-set! misc-flags 'keep-going #f)
 	    (thread-join! th1)
 	    (thread-sleep! 1)       ;; givbe thread th1 a chance to be done TODO: Verify this is needed. At 0.1 I was getting fail to stop, increased to total of 1.1 sec.
 	    (mutex-lock! m)
 	    (let* ((item-path (item-list->path itemdat))
@@ -723,13 +726,21 @@
 	    (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")
 
-            ;; If the propagate-exit-code option has been set in the testconfig, and the test status matches the list, set the exit code to 1.
-            (if (and propagate-exit-code (member (db:test-get-status (rmt:get-testinfo-state-status run-id test-id)) (string-split propagate-exit-code ",")))
-                (set! *globalexitstatus* 1))
+
+            (set! test-status (db:test-get-status (rmt:get-testinfo-state-status run-id test-id)))
+
+            ;; 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 (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 (not (launch:einf-exit-status exit-info))
 		(exit 4))))
         )))