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 2014/09/28 05:10:11 UTC
svn commit: r1628043 - in /pig/trunk: CHANGES.txt test/e2e/pig/build.xml

Author: daijy
Date: Sun Sep 28 03:10:11 2014
New Revision: 1628043

URL: http://svn.apache.org/r1628043
Log:
PIG-4205: e2e test property-check does not check all prerequisites

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/e2e/pig/build.xml

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1628043&r1=1628042&r2=1628043&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sun Sep 28 03:10:11 2014
@@ -84,6 +84,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-4205: e2e test property-check does not check all prerequisites (kellyzly via daijy)
+
 PIG-4180: e2e test Native_3 fail on Hadoop 2 (daijy)
 
 PIG-4178: HCatDDL_[1-3] fail on Windows (daijy)

Modified: pig/trunk/test/e2e/pig/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/build.xml?rev=1628043&r1=1628042&r2=1628043&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/build.xml (original)
+++ pig/trunk/test/e2e/pig/build.xml Sun Sep 28 03:10:11 2014
@@ -215,23 +215,14 @@
 
   <!-- Check that the necessary properties are setup -->
   <target name="property-check">
-    <fail message="Please set the property harness.cluster.conf to the conf directory of your hadoop installation or harness.hadoop.home to HADOOP_HOME for your Hadoop installation.">
+    <fail message="Please set the property harness.cluster.conf to the conf directory of your hadoop installation,harness.hadoop.home to HADOOP_HOME for your Hadoop installation and harness.cluster.bin to the binary executable of your hadoop installation.">
         <condition>
             <not>
-                <or>
+                <and>
                 <isset property="harness.cluster.conf"/>
                 <isset property="harness.hadoop.home"/>
-                </or>
-            </not>
-        </condition>
-    </fail>
-    <fail message="Please set the property harness.cluster.bin to the binary executable of your hadoop installation or harness.hadoop.home to HADOOP_HOME for your Hadoop installation.">
-        <condition>
-            <not>
-                <or>
                 <isset property="harness.cluster.bin"/>
-                <isset property="harness.hadoop.home"/>
-                </or>
+                </and>
             </not>
         </condition>
     </fail>