Return-Path: 
 <common-commits-return-10418-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: (qmail 428 invoked from network); 21 Jan 2010 05:58:19 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 21 Jan 2010 05:58:19 -0000
Received: (qmail 52236 invoked by uid 500); 21 Jan 2010 05:58:19 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 52025 invoked by uid 500); 21 Jan 2010 05:58:19 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 52016 invoked by uid 99); 21 Jan 2010 05:58:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jan 2010 05:58:18 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jan 2010 05:58:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6E89823888EC; Thu, 21 Jan 2010 05:57:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r901540 - in /hadoop/common/trunk: CHANGES.txt build.xml
Date: Thu, 21 Jan 2010 05:57:42 -0000
To: common-commits@hadoop.apache.org
From: cos@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100121055757.6E89823888EC@eris.apache.org>

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="*"/>