Author: rhuijben
Date: Thu Apr 8 09:21:26 2010
New Revision: 931846
URL: http://svn.apache.org/viewvc?rev=931846&view=rev
Log:
* tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
* tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
* tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
* tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
* tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
* tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
* tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
Add apache license block. Start all not included scripts with the
same setlocal. Normalize some command casing.
Modified:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
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
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.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=931846&r1=931845&r2=931846&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
Thu Apr 8 09:21:26 2010
@@ -1,4 +1,23 @@
@echo off
+REM ================================================================
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM ================================================================
+
CALL "c:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
SET TESTDIR=E:\Full
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=931846&r1=931845&r2=931846&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
Thu Apr 8 09:21:26 2010
@@ -1,9 +1,25 @@
@echo off
-SETLOCAL ENABLEEXTENSIONS
+REM ================================================================
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM ================================================================
+
+SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
CALL ..\svn-config.cmd
IF ERRORLEVEL 1 EXIT /B 1
-
-
-
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=931846&r1=931845&r2=931846&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 Apr 8 09:21:26 2010
@@ -1,4 +1,23 @@
@echo off
+REM ================================================================
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM ================================================================
+
SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
CALL ..\svn-config.cmd
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=931846&r1=931845&r2=931846&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd Thu
Apr 8 09:21:26 2010
@@ -1,4 +1,23 @@
@echo off
+REM ================================================================
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM ================================================================
+
SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
CALL ..\svn-config.cmd
@@ -12,4 +31,4 @@ IF ERRORLEVEL 1 EXIT /B 1
POPD
msbuild subversion_vcnet.sln /p:Configuration=Debug /p:Platform=win32
/t:__ALL_TESTS__
-IF ERRORLEVEL 1 EXIT /B 1
\ No newline at end of file
+IF ERRORLEVEL 1 EXIT /B 1
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=931846&r1=931845&r2=931846&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
Thu Apr 8 09:21:26 2010
@@ -1,5 +1,25 @@
@echo off
-SETLOCAL ENABLEEXTENSIONS
+REM ================================================================
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM ================================================================
+
+SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+
CALL ..\svn-config.cmd
IF NOT EXIST "..\deps\" MKDIR "..\deps"
Modified:
subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd?rev=931846&r1=931845&r2=931846&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
Thu Apr 8 09:21:26 2010
@@ -1,9 +1,24 @@
@echo off
-SETLOCAL ENABLEEXTENSIONS
+REM ================================================================
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM ================================================================
+
+SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
CALL ..\svn-config.cmd
IF ERRORLEVEL 1 EXIT /B 1
-
-
-
-
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=931846&r1=931845&r2=931846&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
(original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd Thu
Apr 8 09:21:26 2010
@@ -1,4 +1,23 @@
-...@echo off
+...@echo off
+REM ================================================================
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM ================================================================
+
SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
CALL ..\svn-config.cmd
@@ -34,6 +53,9 @@ IF "%1" == "-r" (
) ELSE IF "%1" == "serf" (
SET SERF=1
SHIFT
+) ELSE IF "%1" == "neon" (
+ SET NEON=1
+ SHIFT
) ELSE (
SET ARGS=!ARGS! -t %1
SHIFT
@@ -47,22 +69,29 @@ xcopy /y /i ..\deps\release\bin\*.dll "%
PATH %TESTDIR%\bin;%PATH%
-if "%LOCAL%+%FSFS%" == "1+1" (
+IF "%LOCAL%+%FSFS%" == "1+1" (
echo win-tests.py -c %PARALLEL% %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" (
+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% %MODE% -f fsfs -u svn://localhost %ARGS%
"%TESTDIR%\tests"
IF ERRORLEVEL 1 EXIT /B 1
)
-if "%SERF%+%FSFS%" == "1+1" (
+IF "%SERF%+%FSFS%" == "1+1" (
+ taskkill /im httpd.exe /f 2> nul:
+ echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library serf
--httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u
http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests"
+ win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library serf --httpd-dir
"%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u
http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests"
+ IF ERRORLEVEL 1 EXIT /B 1
+)
+
+IF "%NEON%+%FSFS%" == "1+1" (
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"
+ echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library neon
--httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u
http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests"
+ win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library neon --httpd-dir
"%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u
http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests"
IF ERRORLEVEL 1 EXIT /B 1
)
