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/03/26 10:08:26 UTC

svn commit: r1305259 - in /pig/branches/branch-0.10: CHANGES.txt test/e2e/pig/drivers/TestDriverPig.pm

Author: daijy
Date: Mon Mar 26 08:08:26 2012
New Revision: 1305259

URL: http://svn.apache.org/viewvc?rev=1305259&view=rev
Log:
PIG-2612: e2e harness: should not require PH_OLD_CLUSTER_CONF

Modified:
    pig/branches/branch-0.10/CHANGES.txt
    pig/branches/branch-0.10/test/e2e/pig/drivers/TestDriverPig.pm

Modified: pig/branches/branch-0.10/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/CHANGES.txt?rev=1305259&r1=1305258&r2=1305259&view=diff
==============================================================================
--- pig/branches/branch-0.10/CHANGES.txt (original)
+++ pig/branches/branch-0.10/CHANGES.txt Mon Mar 26 08:08:26 2012
@@ -182,6 +182,8 @@ PIG-2228: support partial aggregation in
 
 BUG FIXES
 
+PIG-2612: e2e harness: should not require PH_OLD_CLUSTER_CONF (thw via daijy)
+
 PIG-2505: AvroStorage won't read any file not ending in .avro (russell.jurney via daijy)
 
 PIG-2585: Enable ignored e2e test cases (daijy)

Modified: pig/branches/branch-0.10/test/e2e/pig/drivers/TestDriverPig.pm
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/drivers/TestDriverPig.pm?rev=1305259&r1=1305258&r2=1305259&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/drivers/TestDriverPig.pm (original)
+++ pig/branches/branch-0.10/test/e2e/pig/drivers/TestDriverPig.pm Mon Mar 26 08:08:26 2012
@@ -580,7 +580,7 @@ sub generateBenchmark
                 if (defined($ENV{'OLD_HADOOP_HOME'}) && $ENV{'OLD_HADOOP_HOME'} ne "") {
                     $ENV{'HADOOP_HOME'} = $ENV{'OLD_HADOOP_HOME'};
                 }
-                if (defined($ENV{'PH_OLD_CLUSTER_CONF'})) {
+                if (defined($ENV{'PH_OLD_CLUSTER_CONF'}) && $ENV{'PH_OLD_CLUSTER_CONF'} ne "") {
                     $ENV{'HADOOP_CONF_DIR'} = $ENV{'PH_OLD_CLUSTER_CONF'};
                 }
                 if (defined($ENV{'OLD_HADOOP_PREFIX'})) {