svn commit: r1229989 - in /incubator/hcatalog/trunk: CHANGES.txt src/test/e2e/hcatalog/tools/generate/generate_data.pl

[hashutosh]

Author: hashutosh
Date: Wed Jan 11 12:54:55 2012
New Revision: 1229989

URL: http://svn.apache.org/viewvc?rev=1229989&view=rev
Log:
HCATALOG-197: data generator for e2e assumes hadoop tarball installation 
(arpitgupta via hashutosh)

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=1229989&r1=1229988&r2=1229989&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Jan 11 12:54:55 2012
@@ -93,6 +93,8 @@ Trunk (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-197. data generator for e2e assumes hadoop tarball installation 
(arpitgupta via hashutosh)  
+
   HCAT-202. ant clean target is failing (thw via hashutosh)
 
   HCAT-200. e2e test build.xml does not work with rpms (arpitgupta via 
khorgath)

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=1229989&r1=1229988&r2=1229989&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 Jan 11 12:54:55 2012
@@ -336,11 +336,9 @@ our $hadoopCoreJar = undef;
 
 sub findHadoopJars()
 {
-    my $hadoopClassRoot;
-    if (defined $ENV{'HADOOP_HOME'}) {
-        $hadoopClassRoot = $ENV{'HADOOP_HOME'};
-    } else {
-        $hadoopClassRoot = "/usr/share/hadoop";
+    my $hadoopClassRoot=$ENV{'HADOOP_HOME'};
+    if ( -d "$hadoopClassRoot/share/hadoop" ) {
+      $hadoopClassRoot="$hadoopClassRoot/share/hadoop"
     }
 
     my $coreJar = `ls $hadoopClassRoot/hadoop-core-*.jar`;
@@ -349,7 +347,7 @@ sub findHadoopJars()
     my $langJar = `ls $hadoopClassRoot/lib/commons-lang-*.jar`;
     my $cliJar = `ls $hadoopClassRoot/lib/commons-cli-*.jar`;
 
-    if ($coreJar=="") {
+    if (! $coreJar) {
         die 'Please set $HADOOP_HOME\n';
     }