hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r904397 - in /hadoop/mapreduce/trunk: CHANGES.txt build.xml
Date Fri, 29 Jan 2010 07:20:19 GMT
Author: cos
Date: Fri Jan 29 07:20:19 2010
New Revision: 904397

URL: http://svn.apache.org/viewvc?rev=904397&view=rev
Log:
MAPREDUCE-1369. JUnit tests should never depend on anything in conf. Contributed by Anatoli
Fomenko.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/build.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=904397&r1=904396&r2=904397&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Jan 29 07:20:19 2010
@@ -1182,3 +1182,6 @@
 
     MAPREDUCE-1406. Fix spelling of JobContext.MAP_COMBINE_MIN_SPILLS.
     (cdouglas)
+
+    MAPREDUCE-1369. JUnit tests should never depend on anything in conf
+    (Anatoli Fomenko via cos)

Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=904397&r1=904396&r2=904397&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Fri Jan 29 07:20:19 2010
@@ -110,6 +110,7 @@
   <property name="test.junit.maxmemory" value="512m" />
   <property name="test.tmp.dir" value="${env.TMP}" />
   <property name="test.temp.dir" value="${env.TEMP}" />
+  <property name="test.conf.dir" value="${build.dir}/test/conf" />
 
   <property name="test.tools.input.dir" value="${basedir}/src/test/tools/data" />
 
@@ -235,7 +236,9 @@
     <pathelement location="${build.examples}"/>
     <pathelement location="${build.tools}"/>
     <pathelement path="${clover.jar}"/>
-    <path refid="classpath"/>
+    <pathelement location="${build.classes}"/>
+    <pathelement location="${test.conf.dir}"/>
+    <path refid="ivy-common.classpath"/>
     <pathelement location="${test.mapred.build.classes}" />
     <path refid="ivy-test.classpath"/>
   </path>
@@ -308,6 +311,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="*"/>



Mime
View raw message