allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject git commit: Remove run_clonedigger and adjust Makefiles
Date Thu, 01 May 2014 14:33:07 GMT
Repository: allura
Updated Branches:
  refs/heads/master 19b4b8a78 -> 271177576


Remove run_clonedigger and adjust Makefiles


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/27117757
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/27117757
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/27117757

Branch: refs/heads/master
Commit: 27117757641f71b94d64157b6635c797b183edb3
Parents: 19b4b8a
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu May 1 11:59:14 2014 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Thu May 1 12:23:50 2014 +0300

----------------------------------------------------------------------
 Makefile              | 26 ++++++++-------------
 Makefile.def.buildbot | 18 --------------
 requirements.txt      |  1 -
 run_clonedigger       | 58 ----------------------------------------------
 4 files changed, 10 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/27117757/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 94e38b7..6f374e6 100644
--- a/Makefile
+++ b/Makefile
@@ -15,26 +15,20 @@
 #       specific language governing permissions and limitations
 #       under the License.
 
-# Allura Makefile
-SHELL=/bin/bash
-
--include Makefile.def
-
-# Constants
-PID_PATH?=.
-
-# Targets
+# Targets for buildbot
 test:
-ifdef BB
-# running on buildbot (Makefile.def.buildbot sets BB to 1)
-# setup pysvn
+	# Supposed to run on buildbot. If you want to run tests locally use ./run_tests script
+	# 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
-# rebuild apps
+	# rebuild apps
 	./rebuild-all.bash
-endif
-	ALLURA_VALIDATION=none ./run_tests
-	./run_clonedigger
+	./run_tests
 
+
+# Helpers for local development
 run:
 	paster serve --reload Allura/development.ini
+
+taskd:
+	cd Allura && paster taskd development.ini

http://git-wip-us.apache.org/repos/asf/allura/blob/27117757/Makefile.def.buildbot
----------------------------------------------------------------------
diff --git a/Makefile.def.buildbot b/Makefile.def.buildbot
deleted file mode 100644
index 051d52d..0000000
--- a/Makefile.def.buildbot
+++ /dev/null
@@ -1,18 +0,0 @@
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-
-BB=1

http://git-wip-us.apache.org/repos/asf/allura/blob/27117757/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 173a54c..2d1c71e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -74,7 +74,6 @@ mock==1.0.1
 nose==1.3.0
 pyflakes==0.5.0
 WebTest==1.4.0
-clonedigger==1.1.0
 testfixtures==3.0.0
 q==2.3
 WebError==0.10.3

http://git-wip-us.apache.org/repos/asf/allura/blob/27117757/run_clonedigger
----------------------------------------------------------------------
diff --git a/run_clonedigger b/run_clonedigger
deleted file mode 100755
index d7f1a1f..0000000
--- a/run_clonedigger
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-
-if [ -n "$SF_SYSTEM_FUNC" ]; then
-	if [ -z "$VIRTUAL_ENV" ]; then
-        source /var/local/env-allura/bin/activate
-	fi
-fi
-
-# main
-
-if [ "$TEST_MODULES"  == "" ]; then
-    TEST_MODULES="\
-    AlluraTest \
-    Allura \
-    ForgeBlog \
-    ForgeLink \
-    ForgeChat \
-    ForgeDiscussion \
-    ForgeGit \
-    ForgeSVN \
-    ForgeTracker \
-    ForgeWiki \
-    ForgeActivity \
-    ForgeShortUrl \
-    "
-fi
-
-if [ "$INCLUDE_TESTS" ]; then
-    ignore=""
-else
-    ignore="tests"
-fi
-
-mkdir -p report.clonedigger
-
-for module in $TEST_MODULES; do
-    (
-        echo "Running clonedigger in module $module"
-        clonedigger --output="report.clonedigger/$module-$(date --iso-8601=seconds).html"
--language=python --ignore-dir="$ignore" $module || exit
-    ) || exit
-done


Mime
View raw message