You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/04/03 19:27:07 UTC
[38/46] 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/cj/5879
Commit: c0f67e3184b1a1d299b794e2bdecd2a2aa9a26e5
Parents: e9ad55a
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Apr 3 12:55:43 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
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