You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hcatalog-commits@incubator.apache.org by ga...@apache.org on 2012/04/25 19:19:22 UTC
svn commit: r1330494 - in /incubator/hcatalog/trunk: CHANGES.txt
src/test/e2e/hcatalog/tools/generate/generate_data.pl
Author: gates
Date: Wed Apr 25 19:19:21 2012
New Revision: 1330494
URL: http://svn.apache.org/viewvc?rev=1330494&view=rev
Log:
HCATALOG-386 e2e tests should respect JAVA_HOME when it's set
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1330494&r1=1330493&r2=1330494&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Apr 25 19:19:21 2012
@@ -120,6 +120,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/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl?rev=1330494&r1=1330493&r2=1330494&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl (original)
+++ incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl Wed Apr 25 19:19:21 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",