You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/07/30 20:47:09 UTC
git commit: [SPARK-2746] Set SBT_MAVEN_PROFILES only when it is not
set explicitly by the user.
Repository: spark
Updated Branches:
refs/heads/master fc47bb696 -> ff511bacf
[SPARK-2746] Set SBT_MAVEN_PROFILES only when it is not set explicitly by the user.
Author: Reynold Xin <rx...@apache.org>
Closes #1655 from rxin/SBT_MAVEN_PROFILES and squashes the following commits:
b268c4b [Reynold Xin] [SPARK-2746] Set SBT_MAVEN_PROFILES only when it is not set explicitly by the user.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ff511bac
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ff511bac
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ff511bac
Branch: refs/heads/master
Commit: ff511bacf223e19244f5f6114d60af7dcadeda4d
Parents: fc47bb6
Author: Reynold Xin <rx...@apache.org>
Authored: Wed Jul 30 11:45:24 2014 -0700
Committer: Reynold Xin <rx...@apache.org>
Committed: Wed Jul 30 11:45:24 2014 -0700
----------------------------------------------------------------------
dev/run-tests | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ff511bac/dev/run-tests
----------------------------------------------------------------------
diff --git a/dev/run-tests b/dev/run-tests
index 795d16a..c95ef8a 100755
--- a/dev/run-tests
+++ b/dev/run-tests
@@ -21,7 +21,10 @@
FWDIR="$(cd `dirname $0`/..; pwd)"
cd $FWDIR
-export SBT_MAVEN_PROFILES="-Pyarn -Phadoop-2.3 -Dhadoop.version=2.3.0"
+if [ -z "$SBT_MAVEN_PROFILES" ]; then
+ export SBT_MAVEN_PROFILES="-Pyarn -Phadoop-2.3 -Dhadoop.version=2.3.0"
+fi
+echo "SBT_MAVEN_PROFILES=\"$SBT_MAVEN_PROFILES\""
# Remove work directory
rm -rf ./work