PIG-5244: Several unit tests are failing in Tez mode after merging spark branch (nkollar via szita)
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1796822 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index ee8220d..001418f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -122,6 +122,8 @@
BUG FIXES
+PIG-5244: Several unit tests are failing in Tez mode after merging spark branch (nkollar via szita)
+
PIG-5207: BugFix e2e tests fail on spark (szita)
PIG-5194: HiveUDF fails with Spark exec type (szita)
diff --git a/build.xml b/build.xml
index e17380f..0cfc18e 100644
--- a/build.xml
+++ b/build.xml
@@ -909,6 +909,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"/>
diff --git a/test/excluded-tests-mr b/test/excluded-tests-mr
index 5a65242..53396a5 100644
--- a/test/excluded-tests-mr
+++ b/test/excluded-tests-mr
@@ -1,2 +1,2 @@
**/tez/*.java
-+**/spark/*.java
\ No newline at end of file
+**/spark/*.java
\ No newline at end of file
diff --git a/test/excluded-tests-tez b/test/excluded-tests-tez
index 50b7540..9c3505a 100644
--- a/test/excluded-tests-tez
+++ b/test/excluded-tests-tez
@@ -1,2 +1,2 @@
**/Test*MR.java
-+**/spark/*.java
\ No newline at end of file
+**/spark/*.java
\ No newline at end of file
diff --git a/test/org/apache/pig/test/TestEvalPipeline2.java b/test/org/apache/pig/test/TestEvalPipeline2.java
index 34db8b8..e378254 100644
--- a/test/org/apache/pig/test/TestEvalPipeline2.java
+++ b/test/org/apache/pig/test/TestEvalPipeline2.java
@@ -1597,9 +1597,8 @@
String[] expected = new String[] {"(1,A)", "(1,B)", "(2,C)"};
- Util.checkQueryOutputs(iter, expected,
- org.apache.pig.newplan.logical.Util.translateSchema(pigServer.dumpSchema("flattened")),
- Util.isSparkExecType(cluster.getExecType()));
+ Util.checkQueryOutputsAfterSortRecursive(iter, expected,
+ org.apache.pig.newplan.logical.Util.translateSchema(pigServer.dumpSchema("flattened")));
}
// See PIG-2237
