Merge pull request #400 from philippe56/fix_capi_error_reporting

Fix error reporting of capi/opencapi test cases

Author: stewartsmith

common/OpTestHost.py

@@ -833,21 +833,16 @@ def host_clone_cxl_tests(self, i_dir, console=0):
         self.host_run_command("git config --global http.sslverify false", console=console)
         self.host_run_command("rm -rf %s" % i_dir, console=console)
         self.host_run_command("mkdir %s" % i_dir, console=console)
-        try:
-            l_res = self.host_run_command(l_cmd, console=console)
-            return True
-        except:
-            l_msg = "Cloning cxl-tests git repository is failed"
-            return False
+        l_res = self.host_run_command(l_cmd, console=console)
 
     def host_build_cxl_tests(self, i_dir, console=0):
-        l_cmd = "cd %s; make" % i_dir
+        l_cmd = "make -C %s" % i_dir
         self.host_run_command(l_cmd, console=console)
         l_cmd = "test -x %s/libcxl/libcxl.so" % i_dir
         self.host_run_command(l_cmd, console=console)
-        l_cmd = "test -x %s/libcxl_tests; echo $?" % i_dir
+        l_cmd = "test -x %s/libcxl_tests" % i_dir
         self.host_run_command(l_cmd, console=console)
-        l_cmd = "test -x %s/memcpy_afu_ctx; echo $?" % i_dir
+        l_cmd = "test -x %s/memcpy_afu_ctx" % i_dir
         self.host_run_command(l_cmd, console=console)
 
     def host_clone_libocxl(self, i_dir, console=0):
@@ -861,17 +856,13 @@ def host_clone_libocxl(self, i_dir, console=0):
         l_cmd = "git clone %s %s" % (l_msg, i_dir)
         self.host_run_command("rm -rf %s" % i_dir, console=console)
         self.host_run_command("mkdir %s" % i_dir, console=console)
-        try:
-            l_res = self.host_run_command(l_cmd, console=console)
-            return True
-        except:
-            l_msg = "Cloning libocxl git repository is failed"
-            return False
+        l_res = self.host_run_command(l_cmd, console=console)
 
     def host_build_libocxl(self, i_dir, console=0):
-        l_cmd = "cd %s; make" % i_dir
+        l_cmd = "make -C %s" % i_dir
+        self.host_run_command(l_cmd, console=console)
+        l_cmd = "test -x %s/afuobj/ocxl_memcpy" % i_dir
         self.host_run_command(l_cmd, console=console)
-        l_cmd = "test -x %s/afuobj/ocxl_memcpy; echo $?" % i_dir
 
     def host_check_binary(self, i_dir, i_file, console=0):
         l_cmd = "test -x %s/%s;" % (i_dir, i_file)

testcases/OpTestCAPI.py

@@ -97,7 +97,7 @@ def setUp(self):
     def runTest(self):
         self.set_up()
         # Check device files /dev/cxl/afu0.0{m,s} existence
-        l_cmd = "ls -l /dev/cxl/afu0.0{m,s}; echo $?"
+        l_cmd = "ls -l /dev/cxl/afu0.0{m,s}"
         try:
             self.cv_HOST.host_run_command(l_cmd)
         except CommandFailed:
@@ -156,7 +156,7 @@ def runTest(self):
 
         # Run memcpy afu tests
         l_exec = "memcpy_afu_ctx -p100 -l100 >/tmp/memcpy_afu_ctx.log"
-        cmd = "cd %s && LD_LIBRARY_PATH=libcxl ./%s; echo $?" % (l_dir, l_exec)
+        cmd = "cd %s && LD_LIBRARY_PATH=libcxl ./%s" % (l_dir, l_exec)
         log.debug(cmd)
         try:
             self.cv_HOST.host_run_command(cmd)
@@ -196,7 +196,7 @@ def runTest(self):
 
         # Run timebase sync tests
         l_exec = "memcpy_afu_ctx -t -p1 -l1 >/tmp/memcpy_afu_ctx-t.log"
-        cmd = "cd %s && LD_LIBRARY_PATH=libcxl ./%s; echo $?" % (l_dir, l_exec)
+        cmd = "cd %s && LD_LIBRARY_PATH=libcxl ./%s" % (l_dir, l_exec)
         log.debug(cmd)
         try:
             self.cv_HOST.host_run_command(cmd)

testcases/OpTestOpenCAPI.py

@@ -93,7 +93,7 @@ def setUp(self):
     def runTest(self):
         self.set_up()
         # Check device files /dev/ocxl/IBM,MEMCPY3.* existence
-        l_cmd = "ls -l /dev/ocxl/IBM,MEMCPY3.*; echo $?"
+        l_cmd = "ls -l /dev/ocxl/IBM,MEMCPY3.*"
         try:
             self.cv_HOST.host_run_command(l_cmd)
         except CommandFailed:
@@ -120,7 +120,7 @@ def runTest(self):
 
         # Run memcpy3 afu tests
         l_exec = "afuobj/ocxl_memcpy -p100 -l100 >/tmp/ocxl_memcpy.log"
-        cmd = "cd %s; ./%s; echo $?" % (l_dir, l_exec)
+        cmd = "cd %s; ./%s" % (l_dir, l_exec)
         log.debug(cmd)
         try:
             self.cv_HOST.host_run_command(cmd)