Author: brock
Date: Wed Jan 7 22:43:30 2015
New Revision: 1650183
URL: http://svn.apache.org/r1650183
Log:
HIVE-9276 - Exclude encryption related cases from TestCliDriver (Ferdinand Xu
via Brock)
Modified:
hive/branches/HIVE-8065/itests/qtest/pom.xml
hive/branches/HIVE-8065/itests/src/test/resources/testconfiguration.properties
Modified: hive/branches/HIVE-8065/itests/qtest/pom.xml
URL:
http://svn.apache.org/viewvc/hive/branches/HIVE-8065/itests/qtest/pom.xml?rev=1650183&r1=1650182&r2=1650183&view=diff
==============================================================================
--- hive/branches/HIVE-8065/itests/qtest/pom.xml (original)
+++ hive/branches/HIVE-8065/itests/qtest/pom.xml Wed Jan 7 22:43:30 2015
@@ -435,7 +435,7 @@
templatePath="${basedir}/${hive.path.to.root}/ql/src/test/templates/"
template="TestCliDriver.vm"
queryDirectory="${basedir}/${hive.path.to.root}/ql/src/test/queries/clientpositive/"
queryFile="${qfile}"
-
excludeQueryFile="${minimr.query.files},${minitez.query.files}"
+
excludeQueryFile="${minimr.query.files},${minitez.query.files},${encrypted.query.files}"
queryFileRegex="${qfile_regex}"
clusterMode="${clustermode}"
runDisabled="${run_disabled}"
@@ -522,7 +522,7 @@
templatePath="${basedir}/${hive.path.to.root}/ql/src/test/templates/"
template="TestCliDriver.vm"
queryDirectory="${basedir}/${hive.path.to.root}/ql/src/test/queries/clientpositive/"
queryFile="${qfile}"
-
includeQueryFile="${encrypted.query.files.shared}"
+ includeQueryFile="${encrypted.query.files}"
queryFileRegex="${qfile_regex}"
clusterMode="encrypted"
runDisabled="${run_disabled}"
Modified:
hive/branches/HIVE-8065/itests/src/test/resources/testconfiguration.properties
URL:
http://svn.apache.org/viewvc/hive/branches/HIVE-8065/itests/src/test/resources/testconfiguration.properties?rev=1650183&r1=1650182&r2=1650183&view=diff
==============================================================================
---
hive/branches/HIVE-8065/itests/src/test/resources/testconfiguration.properties
(original)
+++
hive/branches/HIVE-8065/itests/src/test/resources/testconfiguration.properties
Wed Jan 7 22:43:30 2015
@@ -295,7 +295,7 @@ minitez.query.files=bucket_map_join_tez1
vectorized_dynamic_partition_pruning.q,\
tez_multi_union.q
-encrypted.query.files.shared=encryption_join_unencrypted_tbl.q,\
+encrypted.query.files=encryption_join_unencrypted_tbl.q,\
encryption_insert_partition_static.q,\
encryption_insert_partition_dynamic.q,\
encryption_join_with_different_encryption_keys.q\