You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2011/02/09 00:32:53 UTC
svn commit: r1068678 - in /hive/trunk: CHANGES.txt build.xml
Author: jvs
Date: Tue Feb 8 23:32:53 2011
New Revision: 1068678
URL: http://svn.apache.org/viewvc?rev=1068678&view=rev
Log:
HIVE-1970. Modify build to run all tests regardless of subproject failures.
(Carl Steinbach via jvs)
Modified:
hive/trunk/CHANGES.txt
hive/trunk/build.xml
Modified: hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hive/trunk/CHANGES.txt?rev=1068678&r1=1068677&r2=1068678&view=diff
==============================================================================
--- hive/trunk/CHANGES.txt (original)
+++ hive/trunk/CHANGES.txt Tue Feb 8 23:32:53 2011
@@ -798,6 +798,9 @@ Trunk - Unreleased
HIVE-1952. fix some outputs and make some tests deterministic
(namit via He Yongqiang)
+ HIVE-1970. Modify build to run all tests regardless of subproject failures.
+ (Carl Steinbach via jvs)
+
TASKS
HIVE-1526. Hive should depend on a release version of Thrift
Modified: hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1068678&r1=1068677&r2=1068678&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Tue Feb 8 23:32:53 2011
@@ -36,6 +36,7 @@
<property name="ql.test.query.dir" location="${basedir}/ql/src/test/queries"/>
<property name="test.data.dir" location="${basedir}/data"/>
<property name="test.build.dir" value="${build.dir.hive}/test"/>
+ <property name="test.continue.on.failure" value="true"/>
<property name="build.docs" value="${target.dir}/docs"/>
<property name="build.javadoc" value="${build.docs}/api"/>
<property name="docs.src" value="${hive.root}/docs"/>
@@ -57,6 +58,13 @@
<isset property="offline"/>
</condition>
+ <!-- ForTask is not defined in net/sf/antcontrib/antcontrib.properties! -->
+ <taskdef name="for" classname="net.sf.antcontrib.logic.ForTask">
+ <classpath>
+ <pathelement location="${hive.root}/testlibs/ant-contrib-1.0b3.jar"/>
+ </classpath>
+ </taskdef>
+
<!-- ====================================================== -->
<!-- Macro definitions -->
<!-- ====================================================== -->
@@ -116,17 +124,6 @@
</sequential>
</macrodef>
- <macrodef name="iterate-test-dirs">
- <attribute name="target"/>
- <sequential>
- <subant target="@{target}">
- <property name="build.dir.hive" location="${build.dir.hive}"/>
- <property name="is-offline" value="${is-offline}"/>
- <filelist dir="." files="common/build.xml,serde/build.xml,metastore/build.xml,ql/build.xml,cli/build.xml,contrib/build.xml,service/build.xml,jdbc/build.xml,hwi/build.xml,hbase-handler/build.xml"/>
- </subant>
- </sequential>
- </macrodef>
-
<macrodef name="iterate">
<attribute name="target"/>
<sequential>
@@ -204,13 +201,21 @@
<iterate-test target="compile-test"/>
</target>
- <target name="test"
- depends="clean-test,jar"
- description="Run tests">
+ <target name="test" depends="clean-test,jar-test" description="Run tests">
<antcall target="test-shims">
<param name="hadoop.version.ant-internal" value="${hadoop.security.version}" />
</antcall>
- <iterate-test-dirs target="test"/>
+ <for keepgoing="${test.continue.on.failure}" param="file">
+ <path>
+ <fileset dir="." includes="*/build.xml" excludes="ant/*,odbc/*"/>
+ </path>
+ <sequential>
+ <ant antfile="@{file}" target="test" inheritAll="false" inheritRefs="true">
+ <property name="build.dir.hive" location="${build.dir.hive}"/>
+ <property name="is-offline" value="${is-offline}"/>
+ </ant>
+ </sequential>
+ </for>
</target>
<!-- create an html report from junit output files -->