hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From harisan...@apache.org
Subject hive git commit: HIVE-10675 : Provide option to skip Accumulo related Hive tests in itests directory (Hari Subramaniyan, reviewed by Sushanth Sowmyan)
Date Mon, 18 May 2015 21:49:00 GMT
Repository: hive
Updated Branches:
  refs/heads/master 325a592f5 -> 46b4cc9c5


HIVE-10675 : Provide option to skip Accumulo related Hive tests in itests directory (Hari
Subramaniyan, reviewed by Sushanth Sowmyan)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/46b4cc9c
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/46b4cc9c
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/46b4cc9c

Branch: refs/heads/master
Commit: 46b4cc9c5aee9152d99f3613e4d9d031aec1947c
Parents: 325a592
Author: Hari Subramaniyan <harisankar@apache.org>
Authored: Mon May 18 14:48:27 2015 -0700
Committer: Hari Subramaniyan <harisankar@apache.org>
Committed: Mon May 18 14:48:27 2015 -0700

----------------------------------------------------------------------
 itests/qtest/pom.xml | 58 +++++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/46b4cc9c/itests/qtest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml
index 90411df..e90f6f4 100644
--- a/itests/qtest/pom.xml
+++ b/itests/qtest/pom.xml
@@ -36,17 +36,15 @@
     <run_disabled>false</run_disabled>
     <clustermode></clustermode>
     <execute.beeline.tests>false</execute.beeline.tests>
+    <!-- Profile activation clause for accumulo-tests will flip skip.accumulo.tests to
false
+         as long as -DskipAccumuloTests is not specified -->
+    <skip.accumulo.tests>true</skip.accumulo.tests>
   </properties>
 
   <dependencies>
     <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- test intra-project -->
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-minicluster</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-ant</artifactId>
       <version>${project.version}</version>
@@ -362,6 +360,24 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>accumulo-tests</id>
+      <activation>
+        <property>
+          <name>!skipAccumuloTests</name>
+        </property>
+      </activation>
+      <properties>
+        <skip.accumulo.tests>false</skip.accumulo.tests>
+      </properties>
+      <dependencies>
+	<dependency>
+	  <groupId>org.apache.accumulo</groupId>
+	  <artifactId>accumulo-minicluster</artifactId>
+	  <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
   <build>
@@ -407,7 +423,6 @@
                 <mkdir dir="${project.build.directory}/qfile-results/hbase-handler/positive/"
/>
                 <mkdir dir="${project.build.directory}/qfile-results/hbase-handler/negative/"
/>
                 <mkdir dir="${project.build.directory}/qfile-results/hbase-handler/minimrpositive/"
/>
-                <mkdir dir="${project.build.directory}/qfile-results/accumulo-handler/positive/"
/>
 
                 <mkdir dir="${project.build.directory}/qfile-results/contribpositive"/>
                 <mkdir dir="${project.build.directory}/qfile-results/contribnegative"/>
@@ -599,19 +614,24 @@
                   cleanupScript="q_test_cleanup.sql"/>
 
                 <!-- Accumulo Positive -->
-                <qtestgen hiveRootDirectory="${basedir}/${hive.path.to.root}/"
-                  outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
-                  templatePath="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/templates/"
template="TestAccumuloCliDriver.vm"
-                  queryDirectory="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/queries/positive/"
-                  queryFile="${qfile}"
-                  runDisabled="${run_disabled}"
-                  clusterMode="${clustermode}"
-                  resultsDirectory="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/results/positive/"
className="TestAccumuloCliDriver"
-                  logFile="${project.build.directory}/testaccumuloclidrivergen.log"
-                  logDirectory="${project.build.directory}/qfile-results/accumulo-handler/positive/"
-                  initScript="q_test_init.sql"
-                  cleanupScript="q_test_cleanup.sql"/>
-
+                <if>
+                  <equals arg1="${skip.accumulo.tests}" arg2="false" />
+                    <then>
+                      <mkdir dir="${project.build.directory}/qfile-results/accumulo-handler/positive/"
/>
+                      <qtestgen hiveRootDirectory="${basedir}/${hive.path.to.root}/"
+                      outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
+	              templatePath="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/templates/"
template="TestAccumuloCliDriver.vm"
+                      queryDirectory="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/queries/positive/"
+                      queryFile="${qfile}"
+                      runDisabled="${run_disabled}"
+                      clusterMode="${clustermode}"
+                      resultsDirectory="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/results/positive/"
className="TestAccumuloCliDriver"
+                      logFile="${project.build.directory}/testaccumuloclidrivergen.log"
+                      logDirectory="${project.build.directory}/qfile-results/accumulo-handler/positive/"
+                      initScript="q_test_init.sql"
+                      cleanupScript="q_test_cleanup.sql"/>
+                    </then>
+                </if>
 
                 <!-- Beeline -->
                 <if>


Mime
View raw message