diff options
author | Patrick Wendell <pwendell@gmail.com> | 2014-04-17 17:24:00 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-17 17:24:00 -0700 |
commit | 6c746ba3a921364405b58c0c5621c6c517572500 (patch) | |
tree | 93ce2f406c239e992725115789d9cdfe50ab23c8 /dev | |
parent | 0058b5d2c74147d24b127a5432f89ebc7050dc18 (diff) | |
download | spark-6c746ba3a921364405b58c0c5621c6c517572500.tar.gz spark-6c746ba3a921364405b58c0c5621c6c517572500.tar.bz2 spark-6c746ba3a921364405b58c0c5621c6c517572500.zip |
FIX: Don't build Hive in assembly unless running Hive tests.
This will make the tests more stable when not running SQL tests.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #439 from pwendell/hive-tests and squashes the following commits:
88a6032 [Patrick Wendell] FIX: Don't build Hive in assembly unless running Hive tests.
Diffstat (limited to 'dev')
-rwxr-xr-x | dev/run-tests | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/dev/run-tests b/dev/run-tests index 7be58588b1..6043f859ae 100755 --- a/dev/run-tests +++ b/dev/run-tests @@ -38,7 +38,7 @@ if [ -n "$AMPLAB_JENKINS" ]; then diffs=`git diff --dirstat master | awk '{ print $2; }' | grep "^sql/"` if [ -n "$diffs" ]; then echo "Detected changes in SQL. Will run Hive test suite." - run_sql_tests=true + export _RUN_SQL_TESTS=true # exported for PySpark tests fi fi @@ -62,13 +62,12 @@ echo "=========================================================================" # echo "q" is needed because sbt on encountering a build file with failure # (either resolution or compilation) prompts the user for input either q, r, # etc to quit or retry. This echo is there to make it not block. -echo -e "q\n" | SPARK_HIVE=true sbt/sbt clean assembly | \ - grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including" - -if [ -n "$run_sql_tests" ]; then - echo -e "q\n" | SPARK_HIVE=true sbt/sbt test | grep -v -e "info.*Resolving" +if [ -n "$_RUN_SQL_TESTS" ]; then + echo -e "q\n" | SPARK_HIVE=true sbt/sbt clean assembly test | \ + grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including" else - echo -e "q\n" | sbt/sbt test | grep -v -e "info.*Resolving" + echo -e "q\n" | sbt/sbt clean assembly test | \ + grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including" fi echo "=========================================================================" |