[asterisk-commits] dsessions: testsuite/bamboo/trunk r1450 - /bamboo/trunk/bin/

[SVN commits to the Asterisk project]

Author: dsessions
Date: Mon Mar 28 12:49:03 2011
New Revision: 1450

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1450
Log:
Windows support refactoring in build scripts and unit test python script.

Modified:
    bamboo/trunk/bin/build-asterisk-scf-wrapper.bat
    bamboo/trunk/bin/build-asterisk-scf.sh

Modified: bamboo/trunk/bin/build-asterisk-scf-wrapper.bat
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk-scf-wrapper.bat?view=diff&rev=1450&r1=1449&r2=1450
==============================================================================
--- bamboo/trunk/bin/build-asterisk-scf-wrapper.bat (original)
+++ bamboo/trunk/bin/build-asterisk-scf-wrapper.bat Mon Mar 28 12:49:03 2011
@@ -2,14 +2,10 @@
 
 if "%1" == "" goto usage
 if "%2" == "" goto usage
-if "%3" == "" goto usage
-if "%4" == "" goto usage
-if not "%5" == "" goto usage
+if not "%3" == "" goto usage
 
 echo 1 = %1
 echo 2 = %2
-echo 3 = %3
-echo 4 = %4
 echo B = %BINDIR%
 
 @call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %1
@@ -28,7 +24,7 @@
 rmdir /S /Q bamboo
 
 bash -c "set -e"
-bash -c "%BINDIR%build-asterisk-scf.sh %2 %BINDIR% %3 %4"
+bash -c "%BINDIR%build-asterisk-scf.sh %2 %BINDIR%"
 
 goto :eof
 

Modified: bamboo/trunk/bin/build-asterisk-scf.sh
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk-scf.sh?view=diff&rev=1450&r1=1449&r2=1450
==============================================================================
--- bamboo/trunk/bin/build-asterisk-scf.sh (original)
+++ bamboo/trunk/bin/build-asterisk-scf.sh Mon Mar 28 12:49:03 2011
@@ -175,9 +175,10 @@
 	$MSBUILD_PATH pjsua_lib.vcxproj
 	cd ../../../build
 	nmake -F Makefile
+	$2asterisk_scf_unit_tests.py $1 "\Program Files\Microsoft Visual Studio 10.0\VC\bin\nmake.exe" test
 else
 	./cmake/init-cmake.sh
 	cmake --build ./build
+	$2asterisk_scf_unit_tests.py $1 $3 $4
 fi
  
-$2asterisk_scf_unit_tests.py $1 $3