diff options
| author | Reynold Xin <rxin@apache.org> | 2014-07-30 11:45:24 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-07-30 11:45:24 -0700 |
| commit | ff511bacf223e19244f5f6114d60af7dcadeda4d (patch) | |
| tree | 8866b1d28bfa2f869a858186055de258c6654851 /dev | |
| parent | fc47bb6967e0df40870413e09d37aa9b90248f43 (diff) | |
| download | spark-ff511bacf223e19244f5f6114d60af7dcadeda4d.tar.gz spark-ff511bacf223e19244f5f6114d60af7dcadeda4d.tar.bz2 spark-ff511bacf223e19244f5f6114d60af7dcadeda4d.zip | |
[SPARK-2746] Set SBT_MAVEN_PROFILES only when it is not set explicitly by the user.
Author: Reynold Xin <rxin@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.
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/run-tests | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dev/run-tests b/dev/run-tests index 795d16a4d9..c95ef8a574 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 |