Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D9357F0C0 for ; Wed, 3 Apr 2013 15:01:14 +0000 (UTC) Received: (qmail 75441 invoked by uid 500); 3 Apr 2013 15:01:14 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 75400 invoked by uid 500); 3 Apr 2013 15:01:14 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 75357 invoked by uid 99); 3 Apr 2013 15:01:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Apr 2013 15:01:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 86818836CE8; Wed, 3 Apr 2013 15:01:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: allura-commits@incubator.apache.org Date: Wed, 03 Apr 2013 15:01:14 -0000 Message-Id: <10b6a3b6fd69415498aae88eeaac0816@git.apache.org> In-Reply-To: <68f0aa2b36eb4a909ee69f6478da7c2e@git.apache.org> References: <68f0aa2b36eb4a909ee69f6478da7c2e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Don't run tests twice on 42cc buildbot Don't run tests twice on 42cc buildbot Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c0f67e31 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c0f67e31 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c0f67e31 Branch: refs/heads/master Commit: c0f67e3184b1a1d299b794e2bdecd2a2aa9a26e5 Parents: e9ad55a Author: Igor Bondarenko Authored: Wed Apr 3 12:55:43 2013 +0000 Committer: Dave Brondsema Committed: Wed Apr 3 14:49:42 2013 +0000 ---------------------------------------------------------------------- Makefile | 8 ++++++++ Makefile.def.buildbot | 9 +-------- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c0f67e31/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index dfe1ea4..12c9048 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,14 @@ PID_PATH?=. # Targets test: +ifdef BB +# running on buildbot (Makefile.def.buildbot sets BB to 1) +# rebuild apps + ./rebuild-all.bash +# setup pysvn + -[ ! -f $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn ] && ln -s /usr/lib64/python2.7/site-packages/pysvn $(VIRTUAL_ENV)/lib/python2.7/site-packages/ + -[ ! -d $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info ] && mkdir $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info +endif ALLURA_VALIDATION=none ./run_tests ./run_clonedigger http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c0f67e31/Makefile.def.buildbot ---------------------------------------------------------------------- diff --git a/Makefile.def.buildbot b/Makefile.def.buildbot index f88ae0e..82179d7 100644 --- a/Makefile.def.buildbot +++ b/Makefile.def.buildbot @@ -1,8 +1 @@ -test: buildbot_test - -buildbot_test: - ./rebuild-all.bash - -[ ! -f $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn ] && ln -s /usr/lib64/python2.7/site-packages/pysvn $(VIRTUAL_ENV)/lib/python2.7/site-packages/ - -[ ! -d $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info ] && mkdir $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info - ALLURA_VALIDATION=none ./run_tests - ./run_clonedigger +BB=1