Author: cos
Date: Thu Jan 21 05:57:30 2010
New Revision: 901540
URL: http://svn.apache.org/viewvc?rev=901540&view=rev
Log:
HADOOP-6374. JUnit tests should never depend on anything in conf. Contributed
by Anatoli Fomenko.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/build.xml
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=901540&r1=901539&r2=901540&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Thu Jan 21 05:57:30 2010
@@ -1283,6 +1283,9 @@
HADOOP-6451. Fix build to run contrib unit tests. (Tom White via cdouglas)
+ HADOOP-6374. JUnit tests should never depend on anything in conf.
+ (Anatoli Fomenko via cos)
+
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=901540&r1=901539&r2=901540&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Thu Jan 21 05:57:30 2010
@@ -87,6 +87,7 @@
<property name="test.junit.printsummary" value="yes" />
<property name="test.junit.haltonfailure" value="no" />
<property name="test.junit.maxmemory" value="512m" />
+ <property name="test.conf.dir" value="${build.dir}/test/conf" />
<property name="test.core.build.classes"
value="${test.build.dir}/core/classes"/>
@@ -190,7 +191,9 @@
<pathelement location="${build.tools}"/>
<pathelement path="${clover.jar}"/>
<path refid="ivy-test.classpath"/>
- <path refid="classpath"/>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${test.conf.dir}"/>
+ <path refid="ivy-common.classpath"/>
</path>
<!--
<path id="test.hdfs.classpath">
@@ -256,6 +259,12 @@
<mapper type="glob" from="*.template" to="*"/>
</copy>
+ <mkdir dir="${test.conf.dir}"/>
+ <copy todir="${test.conf.dir}" verbose="true">
+ <fileset dir="${conf.dir}" includes="**/*.template"/>
+ <mapper type="glob" from="*.template" to="*"/>
+ </copy>
+
<copy todir="${contrib.dir}" verbose="true">
<fileset dir="${contrib.dir}" includes="**/*.template"/>
<mapper type="glob" from="*.template" to="*"/>
