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 2010/08/01 11:10:16 UTC
svn commit: r981183 - in
/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn:
svntest-bindings.cmd svntest-cleanup.cmd
Author: rhuijben
Date: Sun Aug 1 09:10:16 2010
New Revision: 981183
URL: http://svn.apache.org/viewvc?rev=981183&view=rev
Log:
* svntest-bindings.cmd
Fix building the javahl tests by running them before the
python tests. (Gives an unchanged python environment)
* svntest-cleanup.cmd
Also kill svnsync and svnrdump if these might be stuck.
Modified:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-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=981183&r1=981182&r2=981183&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd Sun Aug 1 09:10:16 2010
@@ -29,6 +29,17 @@ IF ERRORLEVEL 1 (
EXIT /B 0
)
+PATH %PATH%;%TESTDIR%\bin
+SET result=0
+
+
+echo python win-tests.py -r -f fsfs --javahl "%TESTDIR%\tests"
+python win-tests.py -r -f fsfs --javahl "%TESTDIR%\tests"
+IF ERRORLEVEL 1 (
+ echo [python reported error %ERRORLEVEL%]
+ SET result=1
+)
+
IF EXIST "%TESTDIR%\swig" rmdir /s /q "%TESTDIR%\swig"
mkdir "%TESTDIR%\swig\py-release\libsvn"
mkdir "%TESTDIR%\swig\py-release\svn"
@@ -38,16 +49,12 @@ xcopy "release\subversion\bindings\swig\
xcopy "subversion\bindings\swig\python\*.py" "%TESTDIR%\swig\py-release\libsvn\*.py"
xcopy "subversion\bindings\swig\python\svn\*.py" "%TESTDIR%\swig\py-release\svn\*.py"
-PATH %PATH%;%TESTDIR%\bin
SET PYTHONPATH=%TESTDIR%\swig\py-release
-SET result=0
-
python subversion\bindings\swig\python\tests\run_all.py
-IF ERRORLEVEL 1 SET result=1
-
-echo win-tests.py -r -f fsfs --javahl "%TESTDIR%\tests"
-win-tests.py -r -f fsfs --javahl "%TESTDIR%\tests"
-IF ERRORLEVEL 1 SET result=1
+IF ERRORLEVEL 1 (
+ echo [Python reported error %ERRORLEVEL%]
+ SET result=1
+)
-exit /b %RESULT%
+exit /b %result%
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=981183&r1=981182&r2=981183&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd Sun Aug 1 09:10:16 2010
@@ -51,6 +51,8 @@ POPD
taskkill /im svn.exe /f 2> nul:
taskkill /im svnadmin.exe /f 2> nul:
taskkill /im svnserve.exe /f 2> nul:
+taskkill /im svnrdump.exe /f 2> nul:
+taskkill /im svnsync.exe /f 2> nul:
taskkill /im httpd.exe /f 2> nul:
IF EXIST "%TESTDIR%\tests\subversion\tests\cmdline\httpd\" (
rmdir /s /q "%TESTDIR%\tests\subversion\tests\cmdline\httpd"