You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2012/10/31 23:30:16 UTC

svn commit: r1404395 - in /pig/trunk: CHANGES.txt test/org/apache/pig/test/TestLoad.java

Author: daijy
Date: Wed Oct 31 22:30:16 2012
New Revision: 1404395

URL: http://svn.apache.org/viewvc?rev=1404395&view=rev
Log:
PIG-2942: DevTests, TestLoad has a false failure on Windows (jgordon via daijy)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/org/apache/pig/test/TestLoad.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1404395&r1=1404394&r2=1404395&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Oct 31 22:30:16 2012
@@ -42,9 +42,6 @@ OPTIMIZATIONS
 
 BUG FIXES
 
-PIG-2801:  grunt "sh" command should invoke the shell implicitly instead of calling exec directly with the command tokens
-(jgordon via daijy)
-
 PIG-2885: TestJobSumission and TestHBaseStorage don't work with HBase 0.94 and ZK 3.4.3 (cheolsoo via sms)
 
 PIG-2928: Fix e2e test failures in trunk: FilterBoolean_23/24 (cheolsoo via dvryaboy)
@@ -526,6 +523,11 @@ Release 0.10.1 - Unreleased
 
 BUG FIXES
 
+PIG-2942: DevTests, TestLoad has a false failure on Windows (jgordon via daijy)
+
+PIG-2801:  grunt "sh" command should invoke the shell implicitly instead of calling exec directly with the command tokens
+(jgordon via daijy)
+
 PIG-2798: pig streaming tests assume interpreters are auto-resolved (jgordon via daijy)
 
 PIG-2795: Fix test cases that generate pig scripts with "load " + pathStr to encode "\" in the path (jgordon via daijy)

Modified: pig/trunk/test/org/apache/pig/test/TestLoad.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLoad.java?rev=1404395&r1=1404394&r2=1404395&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLoad.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLoad.java Wed Oct 31 22:30:16 2012
@@ -81,8 +81,7 @@ public class TestLoad {
         pc = servers[0].getPigContext();
         String curDir = System.getProperty("user.dir");
         String inpDir = curDir + File.separatorChar + "test/org/apache/pig/test/data/InputFiles/";
-        if ((System.getProperty("os.name").toUpperCase().startsWith("WINDOWS")))
-            inpDir="/"+FileLocalizer.parseCygPath(inpDir, FileLocalizer.STYLE_WINDOWS);
+
         // copy passwd file to cluster and set that as the input location for the load
         Util.copyFromLocalToCluster(cluster, inpDir + "passwd", "passwd");
         FileSpec inpFSpec = new FileSpec("passwd", new FuncSpec(PigStorage.class.getName(), new String[]{":"}));