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/07 23:15:43 UTC
svn commit: r1298161 - in /pig/trunk: CHANGES.txt
test/e2e/harness/test_harness.pl test/e2e/pig/build.xml
Author: daijy
Date: Wed Mar 7 22:15:42 2012
New Revision: 1298161
URL: http://svn.apache.org/viewvc?rev=1298161&view=rev
Log:
PIG-2572: e2e harness deploy fails when using pig that does not bundle hadoop
Modified:
pig/trunk/CHANGES.txt
pig/trunk/test/e2e/harness/test_harness.pl
pig/trunk/test/e2e/pig/build.xml
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1298161&r1=1298160&r2=1298161&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Mar 7 22:15:42 2012
@@ -425,6 +425,8 @@ Release 0.9.3 - Unreleased
BUG FIXES
+PIG-2572: e2e harness deploy fails when using pig that does not bundle hadoop (thw via daijy)
+
PIG-2568: PigOutputCommitter hide exception in commitJob (daijy)
PIG-2564: Build fails - Hadoop 0.23.1-SNAPSHOT no longer available (thw via daijy)
Modified: pig/trunk/test/e2e/harness/test_harness.pl
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/harness/test_harness.pl?rev=1298161&r1=1298160&r2=1298161&view=diff
==============================================================================
--- pig/trunk/test/e2e/harness/test_harness.pl (original)
+++ pig/trunk/test/e2e/harness/test_harness.pl Wed Mar 7 22:15:42 2012
@@ -283,7 +283,6 @@ if ($harnessCfg eq "") {
}
}
-
# Read the global config file
my $globalCfg = "";
if ( -e "$harnessCfg" ) {
@@ -370,7 +369,7 @@ my $log;
open $log, "> $logfile" or die "FATAL ERROR $0 at ".__LINE__." : Can't open $logfile, $!\n";
print "================================================================================================\n";
-print "LOGGING RESULTS TO " . cwd . "/$logfile\n";
+print "LOGGING RESULTS TO " . Cwd::realpath($logfile) . "\n";
print "================================================================================================\n";
# If they have requested deployment, do it now
Modified: pig/trunk/test/e2e/pig/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/build.xml?rev=1298161&r1=1298160&r2=1298161&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/build.xml (original)
+++ pig/trunk/test/e2e/pig/build.xml Wed Mar 7 22:15:42 2012
@@ -43,6 +43,8 @@
<property name="harness.dir" value="${basedir}/../harness"/>
<property name="harness.tar" value="${harness.dir}/harness.tar"/>
+ <property name="harness.PH_LOCAL" value="."/>
+ <property name="harness.PH_OUT" value="."/>
<property name="test.location" value="${basedir}/testdist"/>
<property name="benchmark.location" value="${test.location}/benchmarks"/>
@@ -232,8 +234,8 @@
<exec executable="./test_harness.pl" dir="${test.location}" failonerror="true">
<env key="HARNESS_ROOT" value="."/>
<env key="HADOOP_VERSION" value="${hadoopversion}"/>
- <env key="PH_LOCAL" value="."/>
- <env key="PH_OUT" value="."/>
+ <env key="PH_LOCAL" value="${harness.PH_LOCAL}"/>
+ <env key="PH_OUT" value="${harness.PH_OUT}"/>
<env key="PH_ROOT" value="."/>
<env key="PH_PIG" value="${pig.dir}"/>
<env key="PH_OLDPIG" value="${harness.old.pig}"/>
@@ -281,8 +283,8 @@
<target name="deploy-base" depends="property-check, tar, init-test">
<exec executable="./test_harness.pl" dir="${test.location}" failonerror="true">
<env key="HARNESS_ROOT" value="."/>
- <env key="PH_LOCAL" value="."/>
- <env key="PH_OUT" value="."/>
+ <env key="PH_LOCAL" value="${harness.PH_LOCAL}"/>
+ <env key="PH_OUT" value="${harness.PH_OUT}"/>
<env key="PH_ROOT" value="."/>
<env key="PH_PIG" value="${pig.dir}"/>
<env key="PH_OLDPIG" value="${harness.old.pig}"/>
@@ -290,6 +292,7 @@
<env key="PH_CLUSTER_BIN" value="${harness.cluster.bin}"/>
<env key="PH_JYTHON_JAR" value="${jython.jar}"/>
<env key="HARNESS_CONF" value="${harness.conf.file}"/>
+ <env key="HADOOP_HOME" value="${harness.hadoop.home}"/>
<arg value="-deploycfg"/>
<arg value="${deploy.conf}"/>