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 <[email protected]> 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. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/32252725 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/32252725 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/32252725 Branch: refs/heads/branch-1.0 Commit: 3225272595e325b8918671f06efae98827c7d413 Parents: 67d01d8 Author: Patrick Wendell <[email protected]> Authored: Thu Apr 17 17:24:00 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Thu Apr 17 17:26:17 2014 -0700 ---------------------------------------------------------------------- dev/run-tests | 13 ++++++------- python/run-tests | 4 +++- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/32252725/dev/run-tests ---------------------------------------------------------------------- diff --git a/dev/run-tests b/dev/run-tests index 7be5858..6043f85 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 "=========================================================================" http://git-wip-us.apache.org/repos/asf/spark/blob/32252725/python/run-tests ---------------------------------------------------------------------- diff --git a/python/run-tests b/python/run-tests index 7bbf10d..36a9612 100755 --- a/python/run-tests +++ b/python/run-tests @@ -49,7 +49,9 @@ function run_test() { run_test "pyspark/rdd.py" run_test "pyspark/context.py" run_test "pyspark/conf.py" -run_test "pyspark/sql.py" +if [ -n "$_RUN_SQL_TESTS" ]; then + run_test "pyspark/sql.py" +fi run_test "-m doctest pyspark/broadcast.py" run_test "-m doctest pyspark/accumulators.py" run_test "-m doctest pyspark/serializers.py"
