Author: rhuijben
Date: Thu Nov 21 11:40:43 2013
New Revision: 1544134
URL: http://svn.apache.org/r1544134
Log:
Tweak buildbot scripts after build rescheduling.
* svntest-bindings.cmd
Don't test JavaHL.
* svntest-build-bindings.cmd
Don't build JavaHL.
* svntest-build.cmd
Allow adding targets via the config.
* svntests-javahl.cmd
New javahl test script, based on the binding code.
Added:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd
- copied, changed from r1544111,
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
Modified:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
Modified:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd?rev=1544134&r1=1544133&r2=1544134&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
Thu Nov 21 11:40:43 2013
@@ -31,12 +31,6 @@ IF "%SVN_BRANCH%" LEQ "1.6.x" (
PATH %PATH%;%TESTDIR%\bin
SET result=0
-python win-tests.py -d -f fsfs --javahl "%TESTDIR%\tests"
-IF ERRORLEVEL 1 (
- echo [Test runner reported error !ERRORLEVEL!]
- SET result=1
-)
-
if "%SVN_BRANCH%" GTR "1.9." (
python win-tests.py -r -f fsfs --swig=python "%TESTDIR%\tests"
Modified:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd?rev=1544134&r1=1544133&r2=1544134&view=diff
==============================================================================
---
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
(original)
+++
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
Thu Nov 21 11:40:43 2013
@@ -32,17 +32,17 @@ SET DEBUG_TARGETS=/t:__ALL_TESTS__ /t:__
SET RELEASE_TARGETS=/t:__SWIG_PYTHON__
if "%SVN_BRANCH%" GTR "1.8." (
- REM SET DEBUG_TARGETS=%DEBUG_TARGETS% /t:__SWIG_PERL__
+ SET DEBUG_TARGETS=%DEBUG_TARGETS% /t:__SWIG_PERL__
)
if "%SVN_BRANCH%" GTR "1.9." (
SET DEBUG_TARGETS=%DEBUG_TARGETS% /t:__SWIG_RUBY__
)
-msbuild subversion_vcnet.sln /m /v:m /p:Configuration=Debug /p:Platform=win32
%DEBUG_TARGETS%
+msbuild subversion_vcnet.sln /m /v:m /p:Configuration=Debug /p:Platform=Win32
%DEBUG_TARGETS%
IF ERRORLEVEL 1 EXIT /B 1
-msbuild subversion_vcnet.sln /m /v:m /p:Configuration=Release
/p:Platform=win32 %RELEASE_TARGETS%
+msbuild subversion_vcnet.sln /m /v:m /p:Configuration=Release
/p:Platform=Win32 %RELEASE_TARGETS%
IF ERRORLEVEL 1 EXIT /B 1
EXIT /B 0
Modified:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd?rev=1544134&r1=1544133&r2=1544134&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd Thu
Nov 21 11:40:43 2013
@@ -25,12 +25,12 @@ IF ERRORLEVEL 1 EXIT /B 1
PUSHD ..\deps
-nant gen-dev -D:wc=..\build -D:impBase=../deps/build/win32 -D:botBuild=true
%NANTARGS%
+nant gen-dev -D:wc=..\build -D:impBase=../deps/build/win32 -D:botBuild=true
%SVN_NANT_ARGS%
IF ERRORLEVEL 1 EXIT /B 1
POPD
-msbuild subversion_vcnet.sln /m /v:m /p:Configuration=Debug /p:Platform=Win32
/t:__ALL_TESTS__
+msbuild subversion_vcnet.sln /m /v:m /p:Configuration=Debug /p:Platform=Win32
/t:__ALL_TESTS__ %SVN_MSBUILD_ARGS%
IF ERRORLEVEL 1 EXIT /B 1
EXIT /B 0
Copied:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd (from
r1544111,
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd)
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd?p2=subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd&p1=subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd&r1=1544111&r2=1544134&rev=1544134&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd
Thu Nov 21 11:40:43 2013
@@ -37,76 +37,4 @@ IF ERRORLEVEL 1 (
SET result=1
)
-if "%SVN_BRANCH%" GTR "1.9." (
-
- python win-tests.py -r -f fsfs --swig=python "%TESTDIR%\tests"
-
- IF ERRORLEVEL 1 (
- echo [Test runner reported error !ERRORLEVEL!]
- SET result=1
- )
-
-) ELSE (
- IF EXIST "%TESTDIR%\swig" rmdir /s /q "%TESTDIR%\swig"
- mkdir "%TESTDIR%\swig\py-release\libsvn"
- mkdir "%TESTDIR%\swig\py-release\svn"
-
- xcopy "release\subversion\bindings\swig\python\*.pyd"
"%TESTDIR%\swig\py-release\libsvn\*.pyd" > nul:
- xcopy "release\subversion\bindings\swig\python\libsvn_swig_py\*.dll"
"%TESTDIR%\swig\py-release\libsvn\*.dll" > nul:
- xcopy "subversion\bindings\swig\python\*.py"
"%TESTDIR%\swig\py-release\libsvn\*.py" > nul:
- xcopy "subversion\bindings\swig\python\svn\*.py"
"%TESTDIR%\swig\py-release\svn\*.py" > nul:
-
- SET PYTHONPATH=%TESTDIR%\swig\py-release
-
- python subversion\bindings\swig\python\tests\run_all.py
- IF ERRORLEVEL 1 (
- echo [Test runner reported error !ERRORLEVEL!]
- SET result=1
- )
-)
-
-if "%SVN_BRANCH%" GTR "1.9." (
-
-REM python win-tests.py -d -f fsfs --swig=perl "%TESTDIR%\tests"
-
- IF ERRORLEVEL 1 (
- echo [Test runner reported error !ERRORLEVEL!]
- SET result=1
- )
-
-) ELSE IF "%SVN_BRANCH%" GTR "1.8." (
-
- mkdir "%TESTDIR%\swig\pl-debug\SVN"
- mkdir "%TESTDIR%\swig\pl-debug\auto\SVN"
- xcopy subversion\bindings\swig\perl\native\*.pm
"%TESTDIR%\swig\pl-debug\SVN" > nul:
- pushd debug\subversion\bindings\swig\perl\native
- for %%i in (*.dll) do (
- set name=%%i
- mkdir "%TESTDIR%\swig\pl-debug\auto\SVN\!name:~0,-4!"
- xcopy "!name:~0,-4!.*" "%TESTDIR%\swig\pl-debug\auto\SVN\!name:~0,-4!"
> nul:
- xcopy /y "_Core.dll" "%TESTDIR%\swig\pl-debug\auto\SVN\!name:~0,-4!" >
nul:
- )
- popd
-
-
- SET PERL5LIB=%PERL5LIB%;%TESTDIR%\swig\pl-debug;
- pushd subversion\bindings\swig\perl\native
- perl -MExtUtils::Command::MM -e "test_harness()" t\*.t
- IF ERRORLEVEL 1 (
- echo [Test runner reported error !ERRORLEVEL!]
- SET result=1
- )
- popd
-)
-
-if "%SVN_BRANCH%" GTR "1.9." (
- python win-tests.py -d -f fsfs --swig=ruby "%TESTDIR%\tests"
-
- IF ERRORLEVEL 1 (
- echo [Test runner reported error !ERRORLEVEL!]
- REM SET result=1
- )
- taskkill /im svnserve.exe /f
-)
-
exit /b %result%
