You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/11/23 13:44:00 UTC
svn commit: r1544778 - in
/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn:
svntest-bindings.cmd svntest-build-bindings.cmd svntest-cleanup.cmd
svntest-javahl.cmd svntests-javahl.cmd
Author: rhuijben
Date: Sat Nov 23 12:44:00 2013
New Revision: 1544778
URL: http://svn.apache.org/r1544778
Log:
* tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
* tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
Add the common dependencies in %PATH% for <= 1.8.
* tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
Agressively clear the entire test directory.
* tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd
* tools/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd
Fix name. Add the common dependencies in %PATH% for <= 1.8.
Added:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd
- copied, changed from r1544136, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd
Removed:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.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-cleanup.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=1544778&r1=1544777&r2=1544778&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd Sat Nov 23 12:44:00 2013
@@ -24,11 +24,17 @@ CALL ..\svn-config.cmd
IF ERRORLEVEL 1 EXIT /B 1
IF "%SVN_BRANCH%" LEQ "1.6.x" (
- ECHO --- Building 1.6.x or older: Skipping bindings ---
- EXIT /B 0
+ ECHO --- Building 1.6.x or older: Skipping bindings ---
+ EXIT /B 0
+)
+
+IF "%SVN_BRANCH%" LSS "1.9." (
+ IF NOT EXIST "%TESTDIR%\bin" MKDIR "%TESTDIR%\bin"
+ xcopy /y /i ..\deps\release\bin\*.dll "%TESTDIR%\bin"
+
+ PATH %TESTDIR%\bin;!PATH!
)
-PATH %PATH%;%TESTDIR%\bin
SET result=0
if "%SVN_BRANCH%" GTR "1.9." (
@@ -36,8 +42,10 @@ 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!]
+ echo [Python tests reported error !ERRORLEVEL!] 1>&2
SET result=1
+ ) ELSE (
+ echo Done.
)
) ELSE (
@@ -54,18 +62,22 @@ if "%SVN_BRANCH%" GTR "1.9." (
python subversion\bindings\swig\python\tests\run_all.py
IF ERRORLEVEL 1 (
- echo [Test runner reported error !ERRORLEVEL!]
+ echo [Python tests reported error !ERRORLEVEL!] 1>&2
SET result=1
+ ) ELSE (
+ echo Done.
)
)
if "%SVN_BRANCH%" GTR "1.9." (
-REM python win-tests.py -d -f fsfs --swig=perl "%TESTDIR%\tests"
+ python win-tests.py -d -f fsfs --swig=perl "%TESTDIR%\tests"
IF ERRORLEVEL 1 (
- echo [Test runner reported error !ERRORLEVEL!]
- SET result=1
+ echo [Perl tests reported error !ERRORLEVEL!] 1>&2
+ REM SET result=1
+ ) ELSE (
+ echo Done.
)
) ELSE IF "%SVN_BRANCH%" GTR "1.8." (
@@ -94,12 +106,15 @@ REM python win-tests.py -d -f fsfs --swi
)
if "%SVN_BRANCH%" GTR "1.9." (
- python win-tests.py -d -f fsfs --swig=ruby "%TESTDIR%\tests"
+ python win-tests.py -d -f fsfs --swig=ruby "%TESTDIR%\tests"
+
+ IF ERRORLEVEL 1 (
+ echo [Ruby tests reported error !ERRORLEVEL!] 1>&2
+ REM SET result=1
+ ) ELSE (
+ echo Done.
+ )
- IF ERRORLEVEL 1 (
- echo [Test runner reported error !ERRORLEVEL!]
- REM SET result=1
- )
taskkill /im svnserve.exe /f
)
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=1544778&r1=1544777&r2=1544778&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 Sat Nov 23 12:44:00 2013
@@ -28,7 +28,7 @@ IF "%SVN_BRANCH%" LEQ "1.6.x" (
EXIT /B 0
)
-SET DEBUG_TARGETS=/t:__ALL_TESTS__ /t:__JAVAHL__ /t:__JAVAHL_TESTS__
+SET DEBUG_TARGETS=/t:__ALL_TESTS__
SET RELEASE_TARGETS=/t:__SWIG_PYTHON__
if "%SVN_BRANCH%" GTR "1.8." (
Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd?rev=1544778&r1=1544777&r2=1544778&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd Sat Nov 23 12:44:00 2013
@@ -28,17 +28,17 @@ PUSHD ..\deps
ECHO Checking dependencies in %CD%
IF NOT EXIST "imports\" (
- svn co --username guest --password "" http://sharpsvn.open.collab.net/svn/sharpsvn/trunk/imports imports
+ svn co --username guest --password "" http://sharpsvn.open.collab.net/svn/sharpsvn/trunk/imports imports
)
IF NOT EXIST build\imports.done (
- svn up imports
- copy /y imports\dev-default.build default.build
- nant prep-dev %NANTARGS%
- IF ERRORLEVEL 1 (
- exit /B 1
- )
- del release\bin\*svn* release\bin\_*.* 2>nul:
- echo. > build\imports.done
+ svn up imports
+ copy /y imports\dev-default.build default.build
+ nant prep-dev %NANTARGS%
+ IF ERRORLEVEL 1 (
+ EXIT /B 1
+ )
+ del release\bin\*svn* release\bin\_*.* 2>nul:
+ ECHO. > build\imports.done
)
POPD
@@ -64,16 +64,17 @@ taskkill /im op-depth-test.exe /f 2> nul
taskkill /im atomic-ra-revprop-change.exe /f 2> nul:
taskkill /im java.exe /f 2> nul:
taskkill /im perl.exe /f 2> nul:
+taskkill /im ruby.exe /f 2> nul:
taskkill /im mspdbsrv.exe /f 2> nul:
-IF EXIST "%TESTDIR%\tests\subversion\tests\cmdline\httpd\" (
- rmdir /s /q "%TESTDIR%\tests\subversion\tests\cmdline\httpd"
-)
IF EXIST "%TESTDIR%\swig\" (
- rmdir /s /q "%TESTDIR%\swig"
+ rmdir /s /q "%TESTDIR%\swig"
)
-del "%TESTDIR%\tests\*.log" 2> nul:
-
+IF EXISTS "%TESTDIR%\tests\" (
+ PUSHD "%TESTDIR%\tests\"
+ rmdir /s /q "%TESTDIR%\tests\" 2> nul:
+ POPD
+)
exit /B 0
Copied: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd (from r1544136, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd)
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd?p2=subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd&p1=subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd&r1=1544136&r2=1544778&rev=1544778&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntests-javahl.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd Sat Nov 23 12:44:00 2013
@@ -24,17 +24,23 @@ CALL ..\svn-config.cmd
IF ERRORLEVEL 1 EXIT /B 1
IF "%SVN_BRANCH%" LEQ "1.6.x" (
- ECHO --- Building 1.6.x or older: Skipping bindings ---
- EXIT /B 0
+ ECHO --- Building 1.6.x or older: Skipping bindings ---
+ EXIT /B 0
+)
+
+IF "%SVN_BRANCH%" LSS "1.9." (
+ IF NOT EXIST "%TESTDIR%\bin" MKDIR "%TESTDIR%\bin"
+ xcopy /y /i ..\deps\release\bin\*.dll "%TESTDIR%\bin"
+
+ PATH %TESTDIR%\bin;!PATH!
)
-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
+ ECHO [JavaHL test runner reported error !ERRORLEVEL!] 1>&2
+ SET result=1
)
-exit /b %result%
+EXIT /b %result%