[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  0b3677aacf30d7f1c217094e136d6de3a05f6e5e (commit)
      from  69dcd45b14110adba5c3f181a43358a3462ff6c8 (commit)

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


- Log -----------------------------------------------------------------
commit 0b3677aacf30d7f1c217094e136d6de3a05f6e5e
Author: Darren Sessions <dsessions at digium.com>
Date:   Fri Apr 1 08:57:22 2011 -0500

    Fixed the cmake init Windows system call in the tests script.

diff --git a/bamboo/bin/tests.py b/bamboo/bin/tests.py
index d1ce7c3..0778341 100755
--- a/bamboo/bin/tests.py
+++ b/bamboo/bin/tests.py
@@ -127,7 +127,7 @@ class test_asterisk_scf:
             os.chdir("..")
 
         if plat == "Windows":
-            system_call(["/cygwin/bin/bash.exe","./cmake/init-cmake.sh --nmake"])
+            system_call(["/cygwin/bin/bash.exe","./cmake/init-cmake.sh","--nmake"])
             os.chdir("./pjproject/pjlib/build")
             system_call(["%s" % self.msbuild_path, "pjlib.vcxproj"])
             os.chdir("../../pjlib-util/build")
@@ -149,7 +149,7 @@ class test_asterisk_scf:
             os.chdir("..")
         else:
             system_call(["/bin/bash","./cmake/init-cmake.sh"])
-            system_call(["/usr/bin/cmake","--build ./builds"])
+            system_call(["/usr/bin/cmake","--build","./build"])
 
 def system_call(cmd):
     p = subprocess.Popen(cmd)
@@ -161,8 +161,8 @@ def test_ice():
     print "\n\nBuilding Ice\n"
     os.chdir("./cpp")
     if plat == "Windows":
-        system_call(["%s" % make,"%s" % mkcmd[0], "%s" % mkcmd[1]])
-        system_call(["%s" % make,"%s" % mkcmd[0], "%s" % mkcmd[1], "install"])
+        system_call(["%s" % make,"%s" % mkcmd[0], "%s.mak" % mkcmd[1]])
+        system_call(["%s" % make,"%s" % mkcmd[0], "%s.mak" % 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"])
@@ -235,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']
         rmdircmd = "rmdir /S /Q"
     elif plat == "SunOS":
         make = "/usr/bin/gmake"

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


-- 
asterisk-scf/release/testsuite.git