From hcatalog-commits-return-840-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Wed Apr 25 19:21:08 2012 Return-Path: X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39E06CF9C for ; Wed, 25 Apr 2012 19:21:08 +0000 (UTC) Received: (qmail 2171 invoked by uid 500); 25 Apr 2012 19:21:08 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 2139 invoked by uid 500); 25 Apr 2012 19:21:08 -0000 Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hcatalog-dev@incubator.apache.org Delivered-To: mailing list hcatalog-commits@incubator.apache.org Received: (qmail 2132 invoked by uid 99); 25 Apr 2012 19:21:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Apr 2012 19:21:08 +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; Wed, 25 Apr 2012 19:21:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B77C723889E7; Wed, 25 Apr 2012 19:20:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1330497 - in /incubator/hcatalog/branches/branch-0.4: CHANGES.txt src/test/e2e/hcatalog/tools/generate/generate_data.pl Date: Wed, 25 Apr 2012 19:20:44 -0000 To: hcatalog-commits@incubator.apache.org From: gates@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120425192044.B77C723889E7@eris.apache.org> Author: gates Date: Wed Apr 25 19:20:44 2012 New Revision: 1330497 URL: http://svn.apache.org/viewvc?rev=1330497&view=rev Log: HCATALOG-386 e2e tests should respect JAVA_HOME when it's set Modified: incubator/hcatalog/branches/branch-0.4/CHANGES.txt incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/generate_data.pl Modified: incubator/hcatalog/branches/branch-0.4/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/CHANGES.txt?rev=1330497&r1=1330496&r2=1330497&view=diff ============================================================================== --- incubator/hcatalog/branches/branch-0.4/CHANGES.txt (original) +++ incubator/hcatalog/branches/branch-0.4/CHANGES.txt Wed Apr 25 19:20:44 2012 @@ -114,6 +114,8 @@ Release 0.4.0 - Unreleased OPTIMIZATIONS BUG FIXES + HCAT-386 e2e tests should respect JAVA_HOME when it's set (gates) + HCAT-363 HCat leaks metastore connection (rohini via toffer) HCAT-314 HCatOutputFormat.setOutput is called more than once by HCatStorer (avandana via toffer) Modified: incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/generate_data.pl URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/generate_data.pl?rev=1330497&r1=1330496&r2=1330497&view=diff ============================================================================== --- incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/generate_data.pl (original) +++ incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/generate_data.pl Wed Apr 25 19:20:44 2012 @@ -368,8 +368,19 @@ sub findHiveJars() return ($execJar, $cliJar); } - - +sub getJavaCmd() +{ + if (defined $ENV{'JAVA_HOME'}) { + return "$ENV{'JAVA_HOME'}/bin/java"; + } else { + my $java = `which java`; + if ($?) { + die "Unable to find java executable;" + } else { + return $java; + } + } +} # main { @@ -422,7 +433,7 @@ sub findHiveJars() my ($hadoopCoreJar, $commonsLoggingJar, $commonsConfigJar, $commonsLangJar, $commonsCliJar) = findHadoopJars(); my ($hiveExecJar, $hiveCliJar) = findHiveJars(); - my @cmd = ('java', '-cp', + my @cmd = (getJavaCmd(), '-cp', "../tools/generate/java/hive-gen.jar:$hadoopCoreJar:" . "$commonsLoggingJar:$commonsConfigJar:$commonsLangJar:" . "$hiveExecJar",