aboutsummaryrefslogtreecommitdiff
path: root/dev/run-tests
diff options
context:
space:
mode:
authorMichael Armbrust <michael@databricks.com>2014-07-25 15:36:57 -0700
committerMichael Armbrust <michael@databricks.com>2014-07-25 15:36:57 -0700
commitafd757a241f41d7f8c458ef8f1f9ce8ed12986e5 (patch)
tree136e49b3392763acd5f952b70a50137cb96e9c75 /dev/run-tests
parent37ad3b724590dcf42bcdbfaf91b7a11914501945 (diff)
downloadspark-afd757a241f41d7f8c458ef8f1f9ce8ed12986e5.tar.gz
spark-afd757a241f41d7f8c458ef8f1f9ce8ed12986e5.tar.bz2
spark-afd757a241f41d7f8c458ef8f1f9ce8ed12986e5.zip
Revert "[SPARK-2410][SQL] Merging Hive Thrift/JDBC server"
This reverts commit 06dc0d2c6b69c5d59b4d194ced2ac85bfe2e05e2. #1399 is making Jenkins fail. We should investigate and put this back after its passing tests. Author: Michael Armbrust <michael@databricks.com> Closes #1594 from marmbrus/revertJDBC and squashes the following commits: 59748da [Michael Armbrust] Revert "[SPARK-2410][SQL] Merging Hive Thrift/JDBC server"
Diffstat (limited to 'dev/run-tests')
-rwxr-xr-xdev/run-tests2
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/run-tests b/dev/run-tests
index 98ec969dc1..51e4def0f8 100755
--- a/dev/run-tests
+++ b/dev/run-tests
@@ -65,7 +65,7 @@ echo "========================================================================="
# (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.
if [ -n "$_RUN_SQL_TESTS" ]; then
- echo -e "q\n" | SBT_MAVEN_PROFILES="$SBT_MAVEN_PROFILES -Phive -Phive-thriftserver" sbt/sbt clean package \
+ echo -e "q\n" | SBT_MAVEN_PROFILES="$SBT_MAVEN_PROFILES -Phive" sbt/sbt clean package \
assembly/assembly test | grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including"
else
echo -e "q\n" | sbt/sbt clean package assembly/assembly test | \