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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  ba7d0d886ac4ace8fee2ea6b67a11c0295bd05b9 (commit)
      from  7d6a923aa4ed63d33530c82bbb2427022d5a5393 (commit)

Summary of changes:
 bamboo/bin/tests.py |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit ba7d0d886ac4ace8fee2ea6b67a11c0295bd05b9
Author: Darren Sessions <dsessions at digium.com>
Date:   Thu Mar 31 15:53:09 2011 -0500

    Minor logging tweak to the subprocess.Popen wrapper function specifically for Windows.

diff --git a/bamboo/bin/tests.py b/bamboo/bin/tests.py
index cb4900c..41a38ef 100755
--- a/bamboo/bin/tests.py
+++ b/bamboo/bin/tests.py
@@ -145,19 +145,14 @@ class test_asterisk_scf:
             system_call(["%s" % self.msbuild_path, "pjsip_core.vcxproj"])
             system_call(["%s" % self.msbuild_path, "pjsua_lib.vcxproj"])
             os.chdir("../../../build")
-            system_call(["%s" % make,"%s" % mkcmd])
+            system_call(["%s" % make,"%s" % mkcmd[0], "%s" % mkcmd[1]])
             os.chdir("..")
         else:
             system_call(["/bin/bash","./cmake/init-cmake.sh"])
             system_call(["/usr/bin/cmake","--build ./builds"])
 
 def system_call(cmd):
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    try:
-        for l in p.stdout.readlines():
-            print l,
-    except IOError:
-        pass
+    p = subprocess.Popen(cmd)
     p.wait()
     if p.returncode != 0:
         errorout("Error detected during system call! '%s' returned with exit code: %d" % (cmd[0], p.returncode))
@@ -166,8 +161,8 @@ def test_ice():
     print "\n\nBuilding Ice\n"
     os.chdir("./cpp")
     if plat == "Windows":
-        system_call(["%s" % make,"%s" % mkcmd])
-        system_call(["%s" % make,"%s install" % mkcmd])
+        system_call(["%s" % make,"%s" % mkcmd[0], "%s" % mkcmd[1]])
+        system_call(["%s" % make,"%s" % mkcmd[0], "%s" % mkcmd[1], "install"])
     elif plat == "SunOS":
         system_call(["%s" % make,"MCPP_HOME=/usr/local EXPAT_HOME=/usr/sfw OPENSSL_HOME=/usr/sfw DB_HOME=/usr/local/BerkeleyDB.4.8"])
         system_call(["%s" % make,"install"])
@@ -180,8 +175,8 @@ def test_slice_plugins():
     print "\n\nBuilding Slice Plugins\n"
     os.system("cmake .")
     if plat == "Windows":
-        system_call(["%s" % make,"%s" % mkcmd])
-        system_call(["%s" % make,"%s install" % mkcmd])
+        system_call(["%s" % make,"%s" % mkcmd[0], "%s" % mkcmd[1]])
+        system_call(["%s" % make,"%s" % mkcmd[0], "%s" % mkcmd[1], "install"])
     elif plat == "SunOS":
         system_call(["%s" % make,"MCPP_HOME=/usr/local EXPAT_HOME=/usr/sfw OPENSSL_HOME=/usr/sfw DB_HOME=/usr/local/BerkeleyDB.4.8"])
         system_call(["%s" % make,"install"])
@@ -240,7 +235,7 @@ def main(argv=None):
 
     if plat == "Windows":
         make = '/PROGRA~1/MICROS~1.0/VC/bin/nmake.exe'
-        mkcmd = "-F Makefile.mak "
+        mkcmd = ['-F','Makefile.mak']
         rmdircmd = "rmdir /S /Q"
     elif plat == "SunOS":
         make = "/usr/bin/gmake"

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


-- 
asterisk-scf/release/testsuite.git