svn commit: r1404397 - in /pig/branches/branch-0.11: CHANGES.txt test/org/apache/pig/test/TestLoad.java

[da...@apache.org]

Author: daijy
Date: Wed Oct 31 22:31:35 2012
New Revision: 1404397

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

Modified:
    pig/branches/branch-0.11/CHANGES.txt
    pig/branches/branch-0.11/test/org/apache/pig/test/TestLoad.java

Modified: pig/branches/branch-0.11/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/CHANGES.txt?rev=1404397&r1=1404396&r2=1404397&view=diff
==============================================================================
--- pig/branches/branch-0.11/CHANGES.txt (original)
+++ pig/branches/branch-0.11/CHANGES.txt Wed Oct 31 22:31:35 2012
@@ -491,6 +491,8 @@ 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)
 

Modified: pig/branches/branch-0.11/test/org/apache/pig/test/TestLoad.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/test/org/apache/pig/test/TestLoad.java?rev=1404397&r1=1404396&r2=1404397&view=diff
==============================================================================
--- pig/branches/branch-0.11/test/org/apache/pig/test/TestLoad.java (original)
+++ pig/branches/branch-0.11/test/org/apache/pig/test/TestLoad.java Wed Oct 31 22:31:35 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[]{":"}));