From commits-return-50733-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Mon Sep 2 22:33:30 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id DD10F180658 for ; Tue, 3 Sep 2019 00:33:29 +0200 (CEST) Received: (qmail 14213 invoked by uid 500); 2 Sep 2019 22:33:48 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 14203 invoked by uid 99); 2 Sep 2019 22:33:48 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Sep 2019 22:33:48 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 0DEFD3A0839 for ; Mon, 2 Sep 2019 22:33:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1866295 - in /subversion/trunk/tools/buildbot/slaves/bb-openbsd: svnbuild.sh svnclean.sh Date: Mon, 02 Sep 2019 22:33:26 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190902223328.0DEFD3A0839@svn01-us-west.apache.org> 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