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/01/14 00:55:03 UTC

svn commit: r1231405 - in /pig/branches/branch-0.9/test/e2e/pig: build.xml drivers/TestDriverPig.pm

Author: daijy
Date: Fri Jan 13 23:55:03 2012
New Revision: 1231405

URL: http://svn.apache.org/viewvc?rev=1231405&view=rev
Log:
PIG-2413: e2e test should support testing against two cluster (PIG-2413-4.patch)

Modified:
    pig/branches/branch-0.9/test/e2e/pig/build.xml
    pig/branches/branch-0.9/test/e2e/pig/drivers/TestDriverPig.pm

Modified: pig/branches/branch-0.9/test/e2e/pig/build.xml
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/e2e/pig/build.xml?rev=1231405&r1=1231404&r2=1231405&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/e2e/pig/build.xml (original)
+++ pig/branches/branch-0.9/test/e2e/pig/build.xml Fri Jan 13 23:55:03 2012
@@ -182,8 +182,6 @@
       <env key="PH_ROOT" value="."/>
       <env key="PH_PIG" value="${pig.dir}"/>
       <env key="PH_OLDPIG" value="${harness.old.pig}"/>
-      <env key="PH_OLD_CLUSTER_CONF" value="${harness.old.cluster.conf}"/>
-      <env key="OLD_HADOOP_HOME" value="${harness.old.hadoop.home}"/>
       <env key="PH_CLUSTER_CONF" value="${harness.cluster.conf}"/>
       <env key="PH_CLUSTER_BIN" value="${harness.cluster.bin}"/>
       <env key="PH_JYTHON_JAR" value="${jython.jar}"/>

Modified: pig/branches/branch-0.9/test/e2e/pig/drivers/TestDriverPig.pm
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/e2e/pig/drivers/TestDriverPig.pm?rev=1231405&r1=1231404&r2=1231405&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/e2e/pig/drivers/TestDriverPig.pm (original)
+++ pig/branches/branch-0.9/test/e2e/pig/drivers/TestDriverPig.pm Fri Jan 13 23:55:03 2012
@@ -540,14 +540,30 @@ sub generateBenchmark
                 $orighadoopyarnhome = $ENV{'YARN_HOME'};
                 $orighadoopyarnconf = $ENV{'YARN_CONF_DIR'};
 
-                $ENV{'HADOOP_HOME'} = $ENV{'OLD_HADOOP_HOME'};
-                $ENV{'HADOOP_CONF_DIR'} = $ENV{'PH_OLD_CLUSTER_CONF'};
-                $ENV{'HADOOP_PREFIX'} = $ENV{'OLD_HADOOP_PREFIX'};
-                $ENV{'HADOOP_COMMON_HOME'} = $ENV{'OLD_HADOOP_COMMON_HOME'};
-                $ENV{'HADOOP_HDFS_HOME'} = $ENV{'OLD_HADOOP_HDFS_HOME'};
-                $ENV{'HADOOP_MAPRED_HOME'} = $ENV{'OLD_HADOOP_MAPRED_HOME'};
-                $ENV{'YARN_HOME'} = $ENV{'OLD_YARN_HOME'};
-                $ENV{'YARN_CONF_DIR'} = $ENV{'OLD_YARN_CONF_DIR'};
+                if (defined($ENV{'OLD_HADOOP_HOME'})) {
+                    $ENV{'HADOOP_HOME'} = $ENV{'OLD_HADOOP_HOME'};
+                }
+                if (defined($ENV{'PH_OLD_CLUSTER_CONF'})) {
+                    $ENV{'HADOOP_CONF_DIR'} = $ENV{'PH_OLD_CLUSTER_CONF'};
+                }
+                if (defined($ENV{'OLD_HADOOP_PREFIX'})) {
+                    $ENV{'HADOOP_PREFIX'} = $ENV{'OLD_HADOOP_PREFIX'};
+                }
+                if (defined($ENV{'OLD_HADOOP_COMMON_HOME'})) {
+                    $ENV{'HADOOP_COMMON_HOME'} = $ENV{'OLD_HADOOP_COMMON_HOME'};
+                }
+                if (defined($ENV{'OLD_HADOOP_HDFS_HOME'})) {
+                    $ENV{'HADOOP_HDFS_HOME'} = $ENV{'OLD_HADOOP_HDFS_HOME'};
+                }
+                if (defined($ENV{'OLD_HADOOP_MAPRED_HOME'})) {
+                    $ENV{'HADOOP_MAPRED_HOME'} = $ENV{'OLD_HADOOP_MAPRED_HOME'};
+                }
+                if (defined($ENV{'OLD_YARN_HOME'})) {
+                    $ENV{'YARN_HOME'} = $ENV{'OLD_YARN_HOME'};
+                }
+                if (defined($ENV{'OLD_YARN_CONF_DIR'})) {
+                    $ENV{'YARN_CONF_DIR'} = $ENV{'OLD_YARN_CONF_DIR'};
+                }
 	}
 	# Modify the test number so we don't run over the actual test output
 	# and logs