[asterisk-scf-commits] asterisk-scf/release/testsuite.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Fri Apr 1 14:45:45 CDT 2011


branch "master" has been updated
       via  4ebc59eda922b6e20d2704e6c16dc27bcd827ae4 (commit)
      from  3233576d739f9d67b8bb7a156ba1a1da514cf51b (commit)

Summary of changes:
 bamboo/bin/tests.py |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 4ebc59eda922b6e20d2704e6c16dc27bcd827ae4
Author: Darren Sessions <dsessions at digium.com>
Date:   Fri Apr 1 14:45:42 2011 -0500

    xml code refactor for proper results

diff --git a/bamboo/bin/tests.py b/bamboo/bin/tests.py
index 7077de2..6b3ccb6 100755
--- a/bamboo/bin/tests.py
+++ b/bamboo/bin/tests.py
@@ -27,7 +27,7 @@ class test_asterisk_scf:
         self.total_failures = 0
         self.total_time = 0
         self.tests = 0
-        self.passed = False
+        self.passed = 1
         self.did_run = True
 
         if not os.path.exists("./build/%s/test" % self.component):
@@ -42,7 +42,7 @@ class test_asterisk_scf:
 
         self.total_time = time.time() - start_time
 
-        if self.passed == False:
+        if self.passed != 0:
             self.total_failures = 1
         self.tests = 1
 
@@ -61,7 +61,7 @@ class test_asterisk_scf:
                 'name="Asterisk SCF Test-Suite">\n' %
                 (self.tests, self.total_time, self.total_failures))
         f.write('\t<testcase time="%.2f" name="%s unit tests"' % (self.total_time, self.component))
-        if self.passed is True:
+        if self.passed == 0:
             f.write('/>\n')
         else:
             f.write(">\n\t\t<failure />")
@@ -157,19 +157,20 @@ def uni_make(makefile=None,makeargs=None,makesubtype=None):
             sc = ["%s" % make,"-F","Makefile.mak"]
         else:
             sc = ["%s" % make]
-        system_call(sc)
+        rc = system_call(sc)
     elif plat == "SunOS":
         if makeargs:
             sc = ["%s" % make,"MCPP_HOME=/usr/local EXPAT_HOME=/usr/sfw OPENSSL_HOME=/usr/sfw DB_HOME=/usr/local/BerkeleyDB.4.8"]
         else:
             sc = ["%s" % make]
-        system_call(sc)
+        rc = system_call(sc)
     else:
         sc = ["%s" % make] 
-        system_call(sc)
-    if makesubtype:
+        rc = system_call(sc)
+    if makesubtype and rc == 0:
         sc.append(makesubtype)
-        system_call(sc)
+        rc = system_call(sc)
+    return rc
 
 def readinfile(file):
     try:

-----------------------------------------------------------------------


-- 
asterisk-scf/release/testsuite.git



More information about the asterisk-scf-commits mailing list