1 files changed, 17 insertions, 7 deletions
diff --git a/src/test/testcases/testExecutorStopTimer.py b/src/test/testcases/testExecutorStopTimer.py
index 9d0b1384..1cc62053 100644
--- a/src/test/testcases/testExecutorStopTimer.py
+++ b/src/test/testcases/testExecutorStopTimer.py
@@ -6,7 +6,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2018
+# Contributors Listed Below - COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -136,12 +136,22 @@ def main():
         raise Exception('Timer Not cancelled ');
 
 if __name__ == "__main__":
-    main()
-    if err:
-    	print ( "\nTest Suite completed with error(s)" )
-    	#sys.exit(1)
+    if testUtil.getMachineName() == "axone":
+        try:
+            main()
+        except:
+            print ( "\nTest Suite completed with error(s)" )
+            testUtil.collectFFDC()
+            raise()
+
+        print ( "\nTest Suite completed with no errors" )
     else:
-    	print ( "\nTest Suite completed with no errors" )
-	#sys.exit(0);
+        main()
+        if err:
+            print ( "\nTest Suite completed with error(s)" )
+            #sys.exit(1)
+        else:
+            print ( "\nTest Suite completed with no errors" )
+        #sys.exit(0);