You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2019/09/02 22:33:26 UTC
svn commit: r1866295 - in
/subversion/trunk/tools/buildbot/slaves/bb-openbsd: svnbuild.sh svnclean.sh
Author: stsp
Date: Mon Sep 2 22:33:26 2019
New Revision: 1866295
URL: http://svn.apache.org/viewvc?rev=1866295&view=rev
Log:
* tools/buildbot/slaves/bb-openbsd/svnbuild.sh,
tools/buildbot/slaves/bb-openbsd/svnclean.sh: Make these scripts more
resilient against missing files after buildslave system reboot.
Modified:
subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnbuild.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=1866295&r1=1866294&r2=1866295&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnbuild.sh Mon Sep 2 22:33:26 2019
@@ -22,8 +22,10 @@
set -e
set -x
+(test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile)
+(cd .. && gmake dirs-create)
url="$(svn info --show-item url)"
branch="${url##*/}"
-(test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile)
+mkdir -p ../objdir/svn-${branch}
touch ../objdir/svn-${branch}/.retrieved
(cd .. && gmake BRANCH="$branch" THREADING="no" JAVA="no" MAKE_JOBS=8)
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=1866295&r1=1866294&r2=1866295&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh Mon Sep 2 22:33:26 2019
@@ -22,8 +22,6 @@
set -e
set -x
-url="$(svn info --show-item url)"
-branch="${url##*/}"
(test -h ../svn-trunk || ln -s build ../svn-trunk)
for i in $(jot - 6 12); do
(test -h ../svn-1.${i}.x || ln -s build ../svn-1.${i}.x)
@@ -33,6 +31,8 @@ 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)
# always rebuild svn, but only rebuild dependencies if Makefile.svn has changed
+url="$(svn info --show-item url)"
+branch="${url##*/}"
if [ "$lastchangedrev" != "$newlastchangedrev" ]; then
(cd .. && gmake BRANCH="$branch" reset clean)
else