You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by da...@apache.org on 2013/06/28 19:42:50 UTC
svn commit: r1497858 - in /hive/trunk: RELEASE_NOTES.txt
hcatalog/build-support/ant/test.xml hcatalog/build.properties
hcatalog/build.xml hcatalog/storage-handlers/hbase/build.xml
Author: daijy
Date: Fri Jun 28 17:42:50 2013
New Revision: 1497858
URL: http://svn.apache.org/r1497858
Log:
HIVE-4784:ant testreport doesn't include any HCatalog tests
Modified:
hive/trunk/RELEASE_NOTES.txt
hive/trunk/hcatalog/build-support/ant/test.xml
hive/trunk/hcatalog/build.properties
hive/trunk/hcatalog/build.xml
hive/trunk/hcatalog/storage-handlers/hbase/build.xml
Modified: hive/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/hive/trunk/RELEASE_NOTES.txt?rev=1497858&r1=1497857&r2=1497858&view=diff
==============================================================================
--- hive/trunk/RELEASE_NOTES.txt (original)
+++ hive/trunk/RELEASE_NOTES.txt Fri Jun 28 17:42:50 2013
@@ -268,6 +268,7 @@ Release Notes - Hive - Version 0.11.0
* [HIVE-4500] - HS2 holding too many file handles of hive_job_log_hive_*.txt files
* [HIVE-4505] - Hive can't load transforms added using 'ADD FILE'
* [HIVE-4527] - Fix eclipse project template
+ * [HIVE-4784] - ant testreport doesn't include any HCatalog tests
** Improvement
* [HIVE-581] - improve group by syntax
Modified: hive/trunk/hcatalog/build-support/ant/test.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/build-support/ant/test.xml?rev=1497858&r1=1497857&r2=1497858&view=diff
==============================================================================
--- hive/trunk/hcatalog/build-support/ant/test.xml (original)
+++ hive/trunk/hcatalog/build-support/ant/test.xml Fri Jun 28 17:42:50 2013
@@ -62,6 +62,12 @@
<enable/>
</assertions>
</junit>
+ <copy todir="${test.result.dir}">
+ <!--make sure hive's 'ant testreport' includes them-->
+ <fileset dir="${test.logs}">
+ <include name="**/TEST-*.xml"/>
+ </fileset>
+ </copy>
<fail if="tests.failed">Tests failed!</fail>
</sequential>
</macrodef>
Modified: hive/trunk/hcatalog/build.properties
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/build.properties?rev=1497858&r1=1497857&r2=1497858&view=diff
==============================================================================
--- hive/trunk/hcatalog/build.properties (original)
+++ hive/trunk/hcatalog/build.properties Fri Jun 28 17:42:50 2013
@@ -39,7 +39,7 @@ test.timeout=2700000
test.warehouse.dir=${test.dir}/hcat_junit_warehouse
mvnrepo=http://repo2.maven.org/maven2
test.src.dir=${basedir}/src/test
-test.junit.output.format=plain
+test.junit.output.format=xml
test.output=no
test.excludes=e2e/**
clover.jar=${clover.home}/lib/clover.jar
Modified: hive/trunk/hcatalog/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/build.xml?rev=1497858&r1=1497857&r2=1497858&view=diff
==============================================================================
--- hive/trunk/hcatalog/build.xml (original)
+++ hive/trunk/hcatalog/build.xml Fri Jun 28 17:42:50 2013
@@ -26,7 +26,8 @@
<!-- <import file="../build-common.xml"/> -->
<property name="path.to.basedir" location="${basedir}"/>
-
+ <property name="test.result.dir" location="${build.dir.hive}/hcatalog/test"
+ description="location to place TEST-*.xml files so that hive's testreport includes them"/>
<loadproperties srcfile="${basedir}/build.properties"/>
<!--
@@ -91,16 +92,29 @@
<target name="gen-test" description="Generate tests, a no-op for hcat"/>
<target name="test" depends="jar" description="run unit tests">
+ <mkdir dir="${test.result.dir}"/>
<!-- Placed in a parallel structure so that the tests keep going
even if some fail. Otherwise a failure in one of the earlier ant
call terminates the target and the rest do not run. -->
<parallel threadCount="1">
- <ant target="test" dir="core" inheritAll="false"/>
- <ant target="test" dir="hcatalog-pig-adapter" inheritAll="false"/>
- <ant target="test" dir="server-extensions" inheritAll="false"/>
- <ant target="test" dir="webhcat/svr" inheritAll="false"/>
- <ant target="test" dir="webhcat/java-client" inheritAll="false"/>
- <ant target="test" dir="storage-handlers/hbase" inheritAll="false"/>
+ <ant target="test" dir="core" inheritAll="false">
+ <property name="test.result.dir" location="${test.result.dir}"/>
+ </ant>
+ <ant target="test" dir="hcatalog-pig-adapter" inheritAll="false">
+ <property name="test.result.dir" location="${test.result.dir}"/>
+ </ant>
+ <ant target="test" dir="server-extensions" inheritAll="false">
+ <property name="test.result.dir" location="${test.result.dir}"/>
+ </ant>
+ <ant target="test" dir="webhcat/svr" inheritAll="false">
+ <property name="test.result.dir" location="${test.result.dir}"/>
+ </ant>
+ <ant target="test" dir="webhcat/java-client" inheritAll="false">
+ <property name="test.result.dir" location="${test.result.dir}"/>
+ </ant>
+ <ant target="test" dir="storage-handlers/hbase" inheritAll="false">
+ <property name="test.result.dir" location="${test.result.dir}"/>
+ </ant>
<!-- One checkstyle run for the whole repo. Runs after junit tests
to piggyback on resolved jars. -->
<path id="checkstyle.class.path">
@@ -174,6 +188,7 @@
<!-- Clean up children -->
<target name="clean-test" description="Cleanup test artifacts">
<echo message="${ant.project.name}"/>
+ <delete dir="${test.result.dir}"/>
<delete dir="${build.dir}"/>
<ant target="clean-test" dir="core" inheritAll="false"/>
<ant target="clean-test" dir="hcatalog-pig-adapter" inheritAll="false"/>
Modified: hive/trunk/hcatalog/storage-handlers/hbase/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/storage-handlers/hbase/build.xml?rev=1497858&r1=1497857&r2=1497858&view=diff
==============================================================================
--- hive/trunk/hcatalog/storage-handlers/hbase/build.xml (original)
+++ hive/trunk/hcatalog/storage-handlers/hbase/build.xml Fri Jun 28 17:42:50 2013
@@ -63,7 +63,6 @@
<property name="test.tmp.dir" value="${test.build.dir}/temp" />
<property name="test.data.dir" value="${test.build.dir}/data" />
<property name="test.timeout" value="2700000" />
- <property name="test.junit.output.format" value="plain" />
<property name="test.output" value="no"/>
<property name="hive.conf.dir" value="${hive.root}/conf"/>