address comments

scwf · scwf · commit 0d7f6cf958cb · 2014-10-28T15:44:39.000-07:00
diff --git a/dev/run-tests b/dev/run-tests
@@ -133,51 +133,32 @@ CURRENT_BLOCK=$BLOCK_PYTHON_STYLE
 
 echo ""
 echo "========================================================================="
-echo "Building Spark with hive 0.12"
+echo "Building Spark"
 echo "========================================================================="
 
 CURRENT_BLOCK=$BLOCK_BUILD
 
 {
   # We always build with Hive because the PySpark Spark SQL tests need it.
-  BUILD_MVN_PROFILE_ARGS_12="$SBT_MAVEN_PROFILES_ARGS -Phive -Phive-0.12.0"
+  BUILD_MVN_PROFILE_ARGS="$SBT_MAVEN_PROFILES_ARGS -Phive -Phive-0.12.0"
 
-  echo "[info] Building Spark with these arguments: $BUILD_MVN_PROFILE_ARGS_12"
+  echo "[info] Building Spark with these arguments: $BUILD_MVN_PROFILE_ARGS"
 
   # NOTE: 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.
-  # NOTE: Do not quote $BUILD_MVN_PROFILE_ARGS_12 or else it will be interpreted as a
+  # NOTE: Do not quote $BUILD_MVN_PROFILE_ARGS or else it will be interpreted as a
   #+ single argument!
   # QUESTION: Why doesn't 'yes "q"' work?
   # QUESTION: Why doesn't 'grep -v -e "^\[info\] Resolving"' work?
+  # First build with 0.12 to ensure patches do not break the hive 12 build
   echo -e "q\n" \
-    | sbt/sbt $BUILD_MVN_PROFILE_ARGS_12 clean package assembly/assembly \
+    | sbt/sbt $BUILD_MVN_PROFILE_ARGS clean hive/compile hive-thiftserver/compile \
     | grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including"
-}
-
-echo ""
-echo "========================================================================="
-echo "Building Spark with hive 0.13"
-echo "========================================================================="
 
-CURRENT_BLOCK=$BLOCK_BUILD
-
-{
-  # We always build with Hive because the PySpark Spark SQL tests need it.
-  BUILD_MVN_PROFILE_ARGS_13="$SBT_MAVEN_PROFILES_ARGS -Phive -Phive-0.13.1"
-
-  echo "[info] Building Spark with these arguments: $BUILD_MVN_PROFILE_ARGS_13"
-
-  # NOTE: 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.
-  # NOTE: Do not quote $BUILD_MVN_PROFILE_ARGS_13 or else it will be interpreted as a
-  #+ single argument!
-  # QUESTION: Why doesn't 'yes "q"' work?
-  # QUESTION: Why doesn't 'grep -v -e "^\[info\] Resolving"' work?
+  # Then build with default version(0.13.1) because tests based on this version
   echo -e "q\n" \
-    | sbt/sbt $BUILD_MVN_PROFILE_ARGS_13 clean package assembly/assembly \
+    | sbt/sbt $SBT_MAVEN_PROFILES_ARGS -Phive clean hive/compile hive-thiftserver/compile  \
     | grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including"
 }
 
