You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by co...@apache.org on 2011/01/16 09:10:30 UTC
svn commit: r1059508 - in /hadoop/hdfs/trunk: CHANGES.txt build.xml
Author: cos
Date: Sun Jan 16 08:10:30 2011
New Revision: 1059508
URL: http://svn.apache.org/viewvc?rev=1059508&view=rev
Log:
HDFS-996. JUnit tests should never depend on anything in conf. Contributed by Konstantin Boudnik
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/build.xml
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1059508&r1=1059507&r2=1059508&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Sun Jan 16 08:10:30 2011
@@ -522,6 +522,8 @@ Release 0.21.1 - Unreleased
HDFS-1552. Remove java5 dependencies from build. (cos)
+ HDFS-996. JUnit tests should never depend on anything in conf (cos)
+
INCOMPATIBLE CHANGES
HDFS-538. Per the contract elucidated in HADOOP-6201, throw
Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=1059508&r1=1059507&r2=1059508&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Sun Jan 16 08:10:30 2011
@@ -93,6 +93,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.hdfs.build.classes" value="${test.build.dir}/hdfs/classes"/>
@@ -228,7 +229,9 @@
<include name="hadoop-common-test-${hadoop-common.version}.jar" />
<exclude name="**/excluded/" />
</fileset>
- <path refid="classpath"/>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${test.conf.dir}"/>
+ <path refid="ivy-common.classpath"/>
</path>
<!-- the cluster test classpath: uses conf.dir for configuration -->
@@ -288,6 +291,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="*"/>