1 files changed, 17 insertions, 7 deletions
diff --git a/src/test/testcases/testSystemFabricMap.py b/src/test/testcases/testSystemFabricMap.py
index 56163c02..d97105fe 100644
--- a/src/test/testcases/testSystemFabricMap.py
+++ b/src/test/testcases/testSystemFabricMap.py
@@ -5,7 +5,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
+# Contributors Listed Below - COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -94,12 +94,22 @@ def main():
 
 
 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);