1 files changed, 19 insertions, 13 deletions
diff --git a/sbe/test/testIstepAuto.py b/sbe/test/testIstepAuto.py
index 25b9d206..a13c532d 100755
--- a/sbe/test/testIstepAuto.py
+++ b/sbe/test/testIstepAuto.py
@@ -1,6 +1,7 @@
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
+from sim_commands import *
 err = False
 
 EXPDATA = [0xc0,0xde,0xa1,0x01,
@@ -10,18 +11,23 @@ EXPDATA = [0xc0,0xde,0xa1,0x01,
 # MAIN Test Run Starts Here...
 #-------------------------------------------------
 def sbe_istep_func( major, minor ):
-    TESTDATA = [0,0,0,3,
-                0,0,0xA1,0x01,
-                0,major,0,minor ]
-    testUtil.runCycles( 10000000 )
-    testUtil.writeUsFifo( TESTDATA )
-    testUtil.writeEot( )
-    testUtil.readDsFifo( EXPDATA )
-    testUtil.readEot( )
-    if err:
-        print ("\nTest completed with error(s)")
-        #sys.exit(1)
-    else:
-        print ("\nTest completed with no errors")
+    try:
+        TESTDATA = [0,0,0,3,
+                     0,0,0xA1,0x01,
+                    0,major,0,minor ]
+        testUtil.runCycles( 10000000 )
+        testUtil.writeUsFifo( TESTDATA )
+        testUtil.writeEot( )
+        testUtil.readDsFifo( EXPDATA )
+        testUtil.readEot( )
+    except:
+        print ("\nTest completed with error(s). Raise error")
+        # TODO via RTC 142706
+        # Currently simics commands created using hooks always return
+        # success. Need to check from simics command a way to return
+        # Calling non existant command to return failure
+        run_command("Command Failed");
+        raise
+    print ("\nTest completed with no errors")
         #sys.exit(0);