diff options
Diffstat (limited to 'tools/buildbot')
-rwxr-xr-x | tools/buildbot/slaves/bb-openbsd/svnbuild.sh | 9 | ||||
-rwxr-xr-x | tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh | 6 | ||||
-rwxr-xr-x | tools/buildbot/slaves/bb-openbsd/svncheck.sh | 6 | ||||
-rwxr-xr-x | tools/buildbot/slaves/bb-openbsd/svnclean.sh | 14 | ||||
-rw-r--r-- | tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl | 44 | ||||
-rw-r--r-- | tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat | 77 | ||||
-rw-r--r-- | tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat | 51 | ||||
-rw-r--r-- | tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat | 28 | ||||
-rw-r--r-- | tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat | 25 |
9 files changed, 22 insertions, 238 deletions
diff --git a/tools/buildbot/slaves/bb-openbsd/svnbuild.sh b/tools/buildbot/slaves/bb-openbsd/svnbuild.sh index 42c3260..e735465 100755 --- a/tools/buildbot/slaves/bb-openbsd/svnbuild.sh +++ b/tools/buildbot/slaves/bb-openbsd/svnbuild.sh @@ -22,7 +22,8 @@ set -e set -x -export JAVA_HOME=/usr/local/jdk-1.7.0 - -branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" -(cd .. && gmake BRANCH="$branch" THREADING="no") +url="$(svn info --show-item url)" +branch="${url##*/}" +(test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile) +touch ../objdir/svn-${branch}/.retrieved +(cd .. && gmake BRANCH="$branch" THREADING="no" JAVA="no" MAKE_JOBS=8) diff --git a/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh b/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh index 9d47b1f..e68775b 100755 --- a/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh +++ b/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh @@ -22,11 +22,11 @@ set -e set -x -branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" +url="$(svn info --show-item url)" +branch="${url##*/}" export MALLOC_OPTIONS=S -(cd .. && gmake BRANCH="$branch" THREADING="no" svn-check-bindings) +(cd .. && gmake BRANCH="$branch" THREADING="no" JAVA="no" svn-check-bindings) grep -q "^Result: PASS$" tests.log.bindings.pl || exit 1 grep -q "^OK$" tests.log.bindings.py || exit 1 grep -q ", 0 failures, 0 errors" tests.log.bindings.rb || exit 1 -#TODO javahl exit 0 diff --git a/tools/buildbot/slaves/bb-openbsd/svncheck.sh b/tools/buildbot/slaves/bb-openbsd/svncheck.sh index 7d50d98..4bac2bd 100755 --- a/tools/buildbot/slaves/bb-openbsd/svncheck.sh +++ b/tools/buildbot/slaves/bb-openbsd/svncheck.sh @@ -22,10 +22,10 @@ set -e set -x -branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" +url="$(svn info --show-item url)" +branch="${url##*/}" export MALLOC_OPTIONS=S -(cd .. && gmake BRANCH="$branch" PARALLEL="" THREADING="no" \ - MEMCACHED_SERVER="127.0.0.1:11211" \ +(cd .. && gmake BRANCH="$branch" PARALLEL="4" THREADING="no" JAVA="no" \ EXCLUSIVE_WC_LOCKS=1 \ svn-check-local \ svn-check-svn \ diff --git a/tools/buildbot/slaves/bb-openbsd/svnclean.sh b/tools/buildbot/slaves/bb-openbsd/svnclean.sh index 063f4dd..3fd8278 100755 --- a/tools/buildbot/slaves/bb-openbsd/svnclean.sh +++ b/tools/buildbot/slaves/bb-openbsd/svnclean.sh @@ -22,12 +22,20 @@ set -e set -x -branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" +url="$(svn info --show-item url)" +branch="${url##*/}" (test -h ../svn-trunk || ln -s build ../svn-trunk) -for i in 6 7 8 9 10; do +for i in $(jot - 6 12); do (test -h ../svn-1.${i}.x || ln -s build ../svn-1.${i}.x) done +lastchangedrev="$(svn info --show-item=last-changed-revision ../../unix-build/Makefile.svn)" svn update ../../unix-build +newlastchangedrev="$(svn info --show-item=last-changed-revision ../../unix-build/Makefile.svn)" (test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile) -(cd .. && gmake BRANCH="$branch" reset clean) +# always rebuild svn, but only rebuild dependencies if Makefile.svn has changed +if [ "$lastchangedrev" != "$newlastchangedrev" ]; then + (cd .. && gmake BRANCH="$branch" reset clean) +else + (cd .. && gmake BRANCH="$branch" svn-reset svn-bindings-reset svn-clean) +fi rm -f tests.log* fails.log* diff --git a/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl b/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl deleted file mode 100644 index 1221b7a..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -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.
-
-set MSDEV=C:\Program Files\VS6.0
-set HTTPD_BIN_DIR=C:\Program Files\Apache2
-set TEST_DIR=C:\tmp\svn-auto-test
-set SDK_DIR=C:\Program Files\VS.NET\Vc7\PlatformSDK\
-
-set HTTPD_SRC_DIR=..\httpd
-set BDB_DIR=..\db4-win32
-set NEON_DIR=..\neon
-set ZLIB_DIR=..\zlib
-set OPENSSL_DIR=..\openssl
-set INTL_DIR=..\svn-win32-libintl
-
-REM Uncomment this if you want clean subversion build, after testing
-REM set CLEAN_SVN=1
-
-REM Uncomment this if you want disable ra_svn tests
-REM set NO_RA_SVN=1
-
-REM Uncomment this if you want disable ra_dav tests
-REM set NO_RA_HTTP=1
-
-set SDKINC=%SDK_DIR%\include
-set SDKLIB=%SDK_DIR%\lib
-
-set PATH=%MSDEV%\VC98\Bin;%MSDEV%\Common\MSDev98\Bin\;%PATH%
-set INCLUDE=%SDKINC%;%MSDEV%\VC98\ATL\INCLUDE;%MSDEV%\VC98\INCLUDE;%MSDEV%\VC98\MFC\INCLUDE
-set LIB=%SDKLIB%;%MSDEV%\VC98\LIB;%MSDEV%\VC98\MFC\LIB
diff --git a/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat b/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat deleted file mode 100644 index 2d5a671..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat +++ /dev/null @@ -1,77 +0,0 @@ -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. - -IF NOT EXIST ..\config.bat GOTO noconfig -call ..\config.bat - -IF NOT "%OPENSSL_DIR%"=="" call :openssl -IF ERRORLEVEL 1 GOTO ERROR - -set PARAMS=-t dsp --with-berkeley-db=%BDB_DIR% --with-libintl=%INTL_DIR% --with-zlib=%ZLIB_DIR% --with-httpd=%HTTPD_SRC_DIR% --with-neon=%NEON_DIR% --enable-bdb-in-apr-util -IF NOT "%OPENSSL_DIR%"=="" set PARAMS=%PARAMS% --with-openssl=%OPENSSL_DIR% - -python gen-make.py %PARAMS% -IF ERRORLEVEL 1 GOTO ERROR - -MSDEV.COM %HTTPD_SRC_DIR%\apache.dsw /MAKE "BuildBin - Win32 Release" -IF ERRORLEVEL 1 GOTO ERROR - -MSDEV.COM subversion_msvc.dsw /USEENV /MAKE "__ALL_TESTS__ - Win32 Release" -IF ERRORLEVEL 1 GOTO ERROR - - -EXIT 0 - -REM ---------------------------------------------------- -:ERROR -ECHO. -ECHO *** Whoops, something choked. -ECHO. -CD .. -EXIT 1 - - -:openssl -rem ====== Build openssl. -pushd %OPENSSL_DIR% -perl Configure VC-WIN32 -IF ERRORLEVEL 1 goto openssl-err1 - -call ms\do_ms -IF ERRORLEVEL 1 goto openssl-err1 - -nmake -f ms\ntdll.mak /NOLOGO /S -IF ERRORLEVEL 1 goto openssl-err1 - -pushd out32dll -call ..\ms\test -IF ERRORLEVEL 1 goto openssl-err2 - -popd -popd -EXIT /B 0 - -:openssl-err2 -popd - -:openssl-err1 -popd -EXIT 1 - -:noconfig -echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you. -EXIT 2 diff --git a/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat b/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat deleted file mode 100644 index 70e8768..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat +++ /dev/null @@ -1,51 +0,0 @@ -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. - -IF NOT EXIST ..\config.bat GOTO noconfig -call ..\config.bat - -set FS_TYPE=%1 -set RA_TYPE=%2 - -REM By default, return zero -set ERR=0 - -if "%RA_TYPE%"=="ra_local" goto ra_local -if "%RA_TYPE%"=="ra_svn" goto ra_svn -if "%RA_TYPE%"=="ra_dav" goto ra_dav - -echo Unknown ra method '%RA_TYPE%' -EXIT 3 - -:ra_local -python win-tests.py %TEST_DIR% -f %FS_TYPE% -c -r -if ERRORLEVEL 1 set ERR=1 -EXIT %ERR% - -:ra_svn -python win-tests.py %TEST_DIR% -f %FS_TYPE% -c -r -u svn://localhost -if ERRORLEVEL 1 set ERR=1 -EXIT %ERR% - -:ra_dav -python win-tests.py %TEST_DIR% -f %FS_TYPE% -c -r --httpd-dir="%HTTPD_BIN_DIR%" --httpd-port 1234 -if ERRORLEVEL 1 set ERR=1 -EXIT %ERR% - -:noconfig -echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you. -EXIT 2 diff --git a/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat b/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat deleted file mode 100644 index 64df9b8..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat +++ /dev/null @@ -1,28 +0,0 @@ -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. - -IF NOT EXIST ..\config.bat GOTO noconfig -call ..\config.bat - -if NOT "%CLEAN_SVN%"=="" MSDEV.COM subversion_msvc.dsw /MAKE "__ALL_TESTS__ - Win32 Release" /CLEAN -if ERRORLEVEL 1 EXIT 1 - -EXIT 0 - -:noconfig -echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you. -EXIT 2 diff --git a/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat b/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat deleted file mode 100644 index bb0d872..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat +++ /dev/null @@ -1,25 +0,0 @@ -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. - -IF NOT EXIST ..\config.bat GOTO noconfig -call ..\config.bat - -EXIT 0 - -:noconfig -echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you. -EXIT 2 |