Author: cdouglas
Date: Wed Jan 13 13:14:29 2010
New Revision: 898736
URL: http://svn.apache.org/viewvc?rev=898736&view=rev
Log:
HADOOP-6451. Fix build to run contrib unit tests. Contributed by Tom White
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/build.xml
hadoop/common/trunk/src/contrib/build.xml
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=898736&r1=898735&r2=898736&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Wed Jan 13 13:14:29 2010
@@ -1270,6 +1270,8 @@
HADOOP-6441. Protect web ui from cross site scripting attacks (XSS) on
the host http header and using encoded utf-7. (omalley)
+ HADOOP-6451. Fix build to run contrib unit tests. (Tom White via cdouglas)
+
Release 0.20.2 - Unreleased
NEW FEATURES
Modified: hadoop/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=898736&r1=898735&r2=898736&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Wed Jan 13 13:14:29 2010
@@ -375,7 +375,7 @@
</target>
<target name="compile-contrib" depends="compile-core">
- <subant target="compile" inheritall="true">
+ <subant target="compile">
<property name="version" value="${version}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
@@ -661,7 +661,7 @@
</target>
<target name="test-contrib" depends="compile, compile-core-test"
description="Run contrib unit tests">
- <subant target="test" inheritall="true">
+ <subant target="test">
<property name="version" value="${version}"/>
<property name="clover.jar" value="${clover.jar}"/>
<fileset file="${contrib.dir}/build.xml"/>
@@ -678,7 +678,7 @@
</target>
<target name="test" depends="jar-test,test-core" description="Run all unit
tests">
- <subant target="test-contrib" inheritall="true">
+ <subant target="test-contrib">
<fileset dir="." includes="build.xml"/>
</subant>
</target>
@@ -973,7 +973,7 @@
<arg line="${native.src.dir}/packageNativeHadoop.sh"/>
</exec>
- <subant target="package" inheritall="true">
+ <subant target="package">
<!--Pass down the version in case its needed again and the target
distribution directory so contribs know where to install to.-->
<property name="version" value="${version}"/>
@@ -1073,7 +1073,7 @@
<arg line="${native.src.dir}/packageNativeHadoop.sh"/>
</exec>
- <subant target="package" inheritall="true">
+ <subant target="package">
<!--Pass down the version in case its needed again and the target
distribution directory so contribs know where to install to.-->
<property name="version" value="${version}"/>
@@ -1227,7 +1227,7 @@
<!-- Using subant instead of ant as a workaround for 30569 -->
<!-- ================================================================== -->
<target name="clean-contrib">
- <subant target="clean" inheritall="true">
+ <subant target="clean">
<fileset file="src/contrib/build.xml"/>
</subant>
</target>
Modified: hadoop/common/trunk/src/contrib/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/contrib/build.xml?rev=898736&r1=898735&r2=898736&view=diff
==============================================================================
--- hadoop/common/trunk/src/contrib/build.xml (original)
+++ hadoop/common/trunk/src/contrib/build.xml Wed Jan 13 13:14:29 2010
@@ -46,11 +46,8 @@
<!-- ====================================================== -->
<target name="test">
<subant target="test">
- <fileset dir="." includes="hdfsproxy/build.xml"/>
- <fileset dir="." includes="streaming/build.xml"/>
- <fileset dir="." includes="fairscheduler/build.xml"/>
- <fileset dir="." includes="capacity-scheduler/build.xml"/>
- <fileset dir="." includes="mrunit/build.xml"/>
+ <fileset dir="." includes="failmon/build.xml"/>
+ <fileset dir="." includes="hod/build.xml"/>
</subant>
</target>
