svn commit: r1292546 - in /pig/trunk: build.xml test/org/apache/pig/test/TestJobControlCompiler.java

[da...@apache.org]

Author: daijy
Date: Wed Feb 22 22:18:40 2012
New Revision: 1292546

URL: http://svn.apache.org/viewvc?rev=1292546&view=rev
Log:
Fix unit test failure for PIG-2010 (PIG-2010-2.patch)

Modified:
    pig/trunk/build.xml
    pig/trunk/test/org/apache/pig/test/TestJobControlCompiler.java

Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1292546&r1=1292545&r2=1292546&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Wed Feb 22 22:18:40 2012
@@ -647,6 +647,7 @@
                 </section>
             </manifest>
             <fileset file="${basedir}/conf/pig-default.properties" />
+            <exclude name="hadoop-site.xml" />
         </jar>
         <!-- @depricated -->
         <jar jarfile="${output.jarfile}" basedir="${build.classes}">
@@ -681,6 +682,7 @@
                 <include name="zookeeper*.jar" />
             </zipgroupfileset>
             <fileset file="${basedir}/conf/pig-default.properties" />
+            <exclude name="hadoop-site.xml" />
         </jar>
         <antcall target="include-meta" inheritRefs="true" inheritall="true"/>
         <copy file="${output.jarfile}" tofile="${output.jarfile.backcompat}"/>
@@ -738,6 +740,7 @@
                 </section>
             </manifest>
             <fileset file="${basedir}/conf/pig-default.properties" />
+            <exclude name="hadoop-site.xml" />
         </jar>
         <!-- @deprecated -->
         <jar jarfile="${output.jarfile.withouthadoop}" basedir="${build.classes}">
@@ -761,6 +764,7 @@
                 <include name="automaton-${automaton.version}.jar" />
             </zipgroupfileset>
             <fileset file="${basedir}/conf/pig-default.properties" />
+            <exclude name="hadoop-site.xml" />
         </jar>
         <copy file="${output.jarfile.withouthadoop}" tofile="${output.jarfile.backcompat.withouthadoop}"/>
     </target>

Modified: pig/trunk/test/org/apache/pig/test/TestJobControlCompiler.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestJobControlCompiler.java?rev=1292546&r1=1292545&r2=1292546&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestJobControlCompiler.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestJobControlCompiler.java Wed Feb 22 22:18:40 2012
@@ -57,8 +57,7 @@ public class TestJobControlCompiler {
     // creating a hadoop-site.xml and making it visible to Pig
     // making sure it is at the same location as for other tests to not pick up a 
     // conf from a previous test
-    File conf_dir = new File(System.getProperty("user.home"), "pigtest/conf/");
-    conf_dir.mkdirs();
+    File conf_dir = new File("build/classes");
     File hadoopSite = new File(conf_dir, "hadoop-site.xml");
     hadoopSite.deleteOnExit();
     FileWriter fw = new FileWriter(hadoopSite);