Adding rc status for test output failures.

textmate · Nov 10, 2013 · 874ca1c · 874ca1c
1 parent 7513d47
commit 874ca1c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/test/test_cxxtest.py b/test/test_cxxtest.py
@@ -261,7 +261,7 @@ def check_root(self, prefix='', output=None):
             cmd = join_commands("cd %s" % currdir,
                             "%s %s../bin/cxxtestgen %s -o %s %s > %s 2>&1" % (sys.executable, currdir, self.fog, self.py_cpp, args, self.py_out))
             status = subprocess.call(cmd, shell=True)
-            self.assertEqual(status, 0, 'Error executing cxxtestgen')
+            self.assertEqual(status, 0, 'Bad return code: %d   Error executing cxxtestgen: %s' % (status,cmd))
         #
         files = [self.py_cpp]
         for i in [1,2]:
@@ -275,15 +275,15 @@ def check_root(self, prefix='', output=None):
                 cmd = join_commands("cd %s" % currdir,
                                 "%s %s../bin/cxxtestgen %s -o %s %s > %s 2>&1" % (sys.executable, currdir, self.fog, file, args, self.py_out))
                 status = subprocess.call(cmd, shell=True)
-                self.assertEqual(status, 0, 'Error executing cxxtestgen')
+                self.assertEqual(status, 0, 'Bad return code: %d   Error executing cxxtestgen: %s' % (status,cmd))
         #
         cmd = join_commands("cd %s" % currdir,
                             "%s %s %s %s. %s%s../ %s > %s 2>&1" % (self.compiler, self.exe_option, self.build_target, self.include_option, self.include_option, currdir, ' '.join(files), self.build_log))
         status = subprocess.call(cmd, shell=True)
         for file in files:
             if os.path.exists(file):
                 os.remove(file)
-        self.assertEqual(status, 0, 'Error executing command: '+cmd)
+        self.assertEqual(status, 0, 'Bad return code: %d   Error executing command: %s' % (status,cmd))
         #
         cmd = join_commands("cd %s" % currdir,
                             "%s %s -v > %s 2>&1" % (self.valgrind, self.build_target, self.px_pre))
@@ -321,7 +321,7 @@ def compile(self, prefix='', args=None, compile='', output=None, main=None, fail
                 self.passed=True
                 return
         if not self.cxxtest_import:
-            self.assertEqual(status, 0, 'Error executing command: '+cmd)
+            self.assertEqual(status, 0, 'Bad return code: %d   Error executing command: %s' % (status,cmd))
         #
         if not main is None:
             # Compile with main
@@ -339,7 +339,7 @@ def compile(self, prefix='', args=None, compile='', output=None, main=None, fail
                 self.passed=True
                 return
         else:
-            self.assertEqual(status, 0, 'Error executing command: '+cmd)
+            self.assertEqual(status, 0, 'Bad return code: %d   Error executing command: %s' % (status,cmd))
         #
         if compile == '' and not output is None:
             if run is None: