1 files changed, 19 insertions, 8 deletions
diff --git a/src/test/testcases/testCntlInstruction.py b/src/test/testcases/testCntlInstruction.py
index c6bacede..1ac0cf4b 100644
--- a/src/test/testcases/testCntlInstruction.py
+++ b/src/test/testcases/testCntlInstruction.py
@@ -5,7 +5,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -24,6 +24,7 @@
 # IBM_PROLOG_END_TAG
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
+sys.path.append("targets/p9_axone/sbeTest" )
 import testUtil
 err = False
 #from testWrite import *
@@ -499,12 +500,22 @@ def main( ):
 #-------------------------------------------------
 # Calling all test code
 #-------------------------------------------------
-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);