subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r930256 - in /subversion/trunk/tools/buildbot/slaves/win32-SharpSvn: svn-config.cmd.template svntest-build.cmd svntest-cleanup.cmd svntest-test.cmd
Date Fri, 02 Apr 2010 12:57:25 GMT
Author: rhuijben
Date: Fri Apr  2 12:57:25 2010
New Revision: 930256

URL: http://svn.apache.org/viewvc?rev=930256&view=rev
Log:
Extend scripting to allow building with shared libraries on the
slik-w2k3-x64-ra buildbot

* tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
  Pass nant arguments

* tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
  Hide taskkill results and remove hard reference to test directory.

* tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
  Add new value

* tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
  When possible use a incremental build

Modified:
    subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
    subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
    subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
    subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd

Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template?rev=930256&r1=930255&r2=930256&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template Fri Apr
 2 12:57:25 2010
@@ -3,6 +3,7 @@ CALL "c:\Program Files\Microsoft Visual 
 
 SET TESTDIR=E:\Full
 SET TESTPORT=1234
+SET "NANTARGS= "
 
 SET TEMP=%TESTDIR%\temp
 SET TMP=%TEMP%

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=930256&r1=930255&r2=930256&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd Fri Apr  2 12:57:25
2010
@@ -6,7 +6,7 @@ IF ERRORLEVEL 1 EXIT /B 1
 
 PUSHD ..\deps
 
-nant gen-dev -D:wc=..\build -D:impBase=../deps/build/win32
+nant gen-dev -D:wc=..\build -D:impBase=../deps/build/win32 %NANTARGS%
 IF ERRORLEVEL 1 EXIT /B 1
 
 POPD

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=930256&r1=930255&r2=930256&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd Fri Apr  2 12:57:25
2010
@@ -12,17 +12,23 @@ IF NOT EXIST "imports\" (
 )
 IF NOT EXIST build\imports.done (
   copy /y imports\dev-default.build default.build
-  nant build
+  nant build %NANTARGS%
   IF NOT ERRORLEVEL 1 (
     echo. > build\imports.done
   )
 )
 
 POPD
-    
-IF EXIST subversion_vcnet.sln (
-  msbuild subversion_vcnet.sln /p:Configuration=Debug /p:Platform=Win32 /t:clean
+
+PUSHD "%TEMP%"
+IF NOT ERRORLEVEL 1 (
+  rmdir /s /q "%TEMP%" 2> nul:
 )
-IF EXIST "debug\" rmdir /s /q debug
+POPD
+
+taskkill /im svn.exe /f 2> nul:
+taskkill /im svnadmin.exe /f 2> nul:
+taskkill /im svnserve.exe /f 2> nul:
+taskkill /im httpd.exe /f 2> nul:
 
-exit /B 0
\ No newline at end of file
+exit /B 0

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=930256&r1=930255&r2=930256&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd Fri Apr  2 12:57:25
2010
@@ -45,7 +45,7 @@ IF NOT "%1" == "" GOTO next
 IF NOT EXIST "%TESTDIR%\bin" MKDIR "%TESTDIR%\bin"
 xcopy /y /i ..\deps\release\bin\* "%TESTDIR%\bin"
 
-PATH E:\w2k3\bin;%PATH%
+PATH %TESTDIR%\bin;%PATH%
 
 if "%LOCAL%+%FSFS%" == "1+1" (
   echo win-tests.py -c %PARALLEL% %MODE% -f fsfs %ARGS% "%TESTDIR%\tests"
@@ -54,14 +54,14 @@ if "%LOCAL%+%FSFS%" == "1+1" (
 )
 
 if "%SVN%+%FSFS%" == "1+1" (
-  taskkill /im svnserve.exe /f
+  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"
   IF ERRORLEVEL 1 EXIT /B 1
 )
 
 if "%SERF%+%FSFS%" == "1+1" (
-  taskkill /im httpd.exe /f
+  taskkill /im httpd.exe /f 2> nul:
   echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --httpd-dir "%CD%\..\deps\release\httpd"
--httpd-port %TESTPORT% -u http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests"
   win-tests.py -c %PARALLEL% %MODE% -f fsfs --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port
%TESTPORT% -u http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests"
   IF ERRORLEVEL 1 EXIT /B 1



Mime
View raw message