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/04/06 09:55:22 UTC
svn commit: r931043 - in
/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn: ./
svntest-cleanup.cmd svntest-test.cmd
Author: rhuijben
Date: Tue Apr 6 07:55:21 2010
New Revision: 931043
URL: http://svn.apache.org/viewvc?rev=931043&view=rev
Log:
* tools/buildbot/slaves/win32-SharpSvn/
(svn:ignore): Add build.
* tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
Only copy the .dll's to the ramdisk bin directory and don't pass -v
to win-tests.py
* tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
Remove *svn* output from the dependency build results to avoid
conflicts.
Modified:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/ (props changed)
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
Propchange: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 6 07:55:21 2010
@@ -0,0 +1,3 @@
+build
+deps
+svn-config.cmd
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=931043&r1=931042&r2=931043&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd Tue Apr 6 07:55:21 2010
@@ -13,6 +13,7 @@ IF NOT EXIST "imports\" (
IF NOT EXIST build\imports.done (
copy /y imports\dev-default.build default.build
nant build %NANTARGS%
+ del release\bin\*svn*
IF NOT ERRORLEVEL 1 (
echo. > build\imports.done
)
Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd?rev=931043&r1=931042&r2=931043&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd Tue Apr 6 07:55:21 2010
@@ -43,20 +43,20 @@ IF NOT "%1" == "" GOTO next
IF NOT EXIST "%TESTDIR%\bin" MKDIR "%TESTDIR%\bin"
-xcopy /y /i ..\deps\release\bin\* "%TESTDIR%\bin"
+xcopy /y /i ..\deps\release\bin\*.dll "%TESTDIR%\bin"
PATH %TESTDIR%\bin;%PATH%
if "%LOCAL%+%FSFS%" == "1+1" (
echo win-tests.py -c %PARALLEL% %MODE% -f fsfs %ARGS% "%TESTDIR%\tests"
- win-tests.py -c %PARALLEL% -v %MODE% -f fsfs %ARGS% "%TESTDIR%\tests"
+ win-tests.py -c %PARALLEL% %MODE% -f fsfs %ARGS% "%TESTDIR%\tests"
IF ERRORLEVEL 1 EXIT /B 1
)
if "%SVN%+%FSFS%" == "1+1" (
taskkill /im svnserve.exe /f 2> nul:
echo win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://localhost %ARGS% "%TESTDIR%\tests"
- win-tests.py -c %PARALLEL% -v %MODE% -f fsfs -u svn://localhost %ARGS% "%TESTDIR%\tests"
+ win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://localhost %ARGS% "%TESTDIR%\tests"
IF ERRORLEVEL 1 EXIT /B 1
)