Return-Path: 
 <commits-return-5369-apmail-pig-commits-archive=pig.apache.org@pig.apache.org>
X-Original-To: apmail-pig-commits-archive@www.apache.org
Delivered-To: apmail-pig-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C21B6DD1F
	for <apmail-pig-commits-archive@www.apache.org>;
 Mon,  1 Oct 2012 21:34:40 +0000 (UTC)
Received: (qmail 30893 invoked by uid 500); 1 Oct 2012 21:34:40 -0000
Delivered-To: apmail-pig-commits-archive@pig.apache.org
Received: (qmail 30850 invoked by uid 500); 1 Oct 2012 21:34:40 -0000
Mailing-List: contact commits-help@pig.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@pig.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@pig.apache.org>
List-Post: <mailto:commits@pig.apache.org>
List-Id: <commits.pig.apache.org>
Reply-To: dev@pig.apache.org
Delivered-To: mailing list commits@pig.apache.org
Received: (qmail 30843 invoked by uid 99); 1 Oct 2012 21:34:40 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Oct 2012 21:34:40 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Oct 2012 21:34:38 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id CE20123888EA
	for <commits@pig.apache.org>; Mon,  1 Oct 2012 21:33:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1392633 - in /pig/trunk: CHANGES.txt
 test/e2e/pig/build.xml
Date: Mon, 01 Oct 2012 21:33:52 -0000
To: commits@pig.apache.org
From: gdfm@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121001213352.CE20123888EA@eris.apache.org>

Author: gdfm
Date: Mon Oct  1 21:33:52 2012
New Revision: 1392633

URL: http://svn.apache.org/viewvc?rev=1392633&view=rev
Log:
PIG-2920: e2e tests override PERL5LIB environment variable (azaroth)

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=1392633&r1=1392632&r2=1392633&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Oct  1 21:33:52 2012
@@ -285,6 +285,8 @@ OPTIMIZATIONS
 
 BUG FIXES
 
+PIG-2920: e2e tests override PERL5LIB environment variable (azaroth)
+
 PIG-2917: SpillableMemoryManager memory leak for WeakReference (haitao.yao via dvryaboy)
 
 PIG-2938: All unit tests that use MR2 MiniCluster are broken in trunk (cheolsoo via dvryaboy)

Modified: pig/trunk/test/e2e/pig/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/build.xml?rev=1392633&r1=1392632&r2=1392633&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/build.xml (original)
+++ pig/trunk/test/e2e/pig/build.xml Mon Oct  1 21:33:52 2012
@@ -48,6 +48,7 @@
   <property name="harness.tar" value="${harness.dir}/harness.tar"/>
   <property name="harness.PH_LOCAL" value="."/>
   <property name="harness.PH_OUT" value="."/>
+  <property name="harness.PERL5LIB" value="./libexec"/>
 
   <property name="test.location" value="${basedir}/testdist"/>
   <property name="benchmark.location" value="${test.location}/benchmarks"/>
@@ -270,7 +271,7 @@
       <env key="PH_OLD_CLUSTER_CONF" value="${PH_OLD_CLUSTER_CONF}"/>
       <env key="PH_BENCHMARK_CACHE_PATH" value="${PH_BENCHMARK_CACHE_PATH}"/>
       <env key="HCAT_BIN" value="${hcat.bin}"/>
-      <env key="PERL5LIB" value="./libexec"/>
+      <env key="PERL5LIB" value="${harness.PERL5LIB}"/>
       <arg line="${tests.to.run}"/>
       <arg value="${test.location}/tests/cmdline.conf"/>
       <arg value="${test.location}/tests/multiquery.conf"/>