Author: stsp
Date: Fri Jan 26 09:32:02 2018
New Revision: 1822261
URL: http://svn.apache.org/viewvc?rev=1822261&view=rev
Log:
* tools/buildbot/slaves/bb-openbsd
(svnbuild.sh, svncheck-bindings.sh, svncheck.sh, svnclean.sh):
Adjust these scripts to fit my new build machine.
Modified:
subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck.sh
subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh
Modified: subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnbuild.sh?rev=1822261&r1=1822260&r2=1822261&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnbuild.sh Fri Jan 26
09:32:02 2018
@@ -22,7 +22,6 @@
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##*/}"
+(cd .. && gmake BRANCH="$branch" THREADING="no" JAVA="no" MAKE_JOBS=8)
Modified: subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh?rev=1822261&r1=1822260&r2=1822261&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
(original)
+++ subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh Fri
Jan 26 09:32:02 2018
@@ -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
Modified: subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck.sh?rev=1822261&r1=1822260&r2=1822261&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/bb-openbsd/svncheck.sh Fri Jan 26
09:32:02 2018
@@ -22,9 +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" \
+(cd .. && gmake BRANCH="$branch" PARALLEL="" THREADING="no" JAVA="no" \
MEMCACHED_SERVER="127.0.0.1:11211" \
EXCLUSIVE_WC_LOCKS=1 \
svn-check-local \
Modified: subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh?rev=1822261&r1=1822260&r2=1822261&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh Fri Jan 26
09:32:02 2018
@@ -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-clean)
+fi
rm -f tests.log* fails.log*
