svn commit: r1778681 - in /pig/trunk: CHANGES.txt build.xml test/org/apache/pig/test/TezMiniCluster.java

[rohini]

Author: rohini
Date: Fri Jan 13 22:56:13 2017
New Revision: 1778681

URL: http://svn.apache.org/viewvc?rev=1778681&view=rev
Log:
PIG-5105: Tez unit tests failing with Argument list too long (rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/build.xml
    pig/trunk/test/org/apache/pig/test/TezMiniCluster.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1778681&r1=1778680&r2=1778681&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Jan 13 22:56:13 2017
@@ -32,6 +32,8 @@ PIG-5067: Revisit union on numeric type
  
 IMPROVEMENTS
 
+PIG-5105: Tez unit tests failing with "Argument list too long" (rohini)
+
 PIG-4901: To use Multistorage for each Group (szita via daijy)
 
 PIG-5025: Fix flaky test failures in TestLoad.java (szita via rohini)

Modified: pig/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1778681&r1=1778680&r2=1778681&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Fri Jan 13 22:56:13 2017
@@ -881,6 +881,9 @@
             <sysproperty key="test.exec.type" value="${test.exec.type}" />
             <sysproperty key="ssh.gateway" value="${ssh.gateway}" />
             <sysproperty key="hod.server" value="${hod.server}" />
+            <sysproperty key="build.classes" value="${build.classes}" />
+            <sysproperty key="test.build.classes" 
value="${test.build.classes}" />
+            <sysproperty key="ivy.lib.dir" value="${ivy.lib.dir}" />
             <sysproperty key="java.io.tmpdir" value="${junit.tmp.dir}" />
             <sysproperty key="hadoop.log.dir" value="${test.log.dir}"/>
             <jvmarg line="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M 
${debugArgs} -Djava.library.path=${hadoop.root}\bin"/>

Modified: pig/trunk/test/org/apache/pig/test/TezMiniCluster.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TezMiniCluster.java?rev=1778681&r1=1778680&r2=1778681&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TezMiniCluster.java (original)
+++ pig/trunk/test/org/apache/pig/test/TezMiniCluster.java Fri Jan 13 22:56:13 
2017
@@ -96,8 +96,13 @@ public class TezMiniCluster extends Mini
             m_mr.init(m_dfs_conf);
             m_mr.start();
             m_mr_conf = m_mr.getConfig();
-            m_mr_conf.set(YarnConfiguration.YARN_APPLICATION_CLASSPATH,
-                    System.getProperty("java.class.path"));
+            File libDir = new File(System.getProperty("ivy.lib.dir", 
"build/ivy/lib/Pig"));
+            File classesDir = new File(System.getProperty("build.classes", 
"build/classes"));
+            File testClassesDir = new 
File(System.getProperty("test.build.classes", "test/build/classes"));
+            String classpath = libDir.getAbsolutePath() + "/*"
+                    + File.pathSeparator + classesDir.getAbsolutePath()
+                    + File.pathSeparator + testClassesDir.getAbsolutePath();
+            m_mr_conf.set(YarnConfiguration.YARN_APPLICATION_CLASSPATH, 
classpath);
             m_mr_conf.set(MRJobConfig.MAP_JAVA_OPTS, "-Xmx512m");
             m_mr_conf.set(MRJobConfig.REDUCE_JAVA_OPTS, "-Xmx512m");