hadoop: workunits don't need java path

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
(cherry picked from commit b3329a961b1ed6bc05969a88743238a552e2b507)

Conflicts:
	qa/workunits/hadoop/terasort.sh

diff --git a/qa/workunits/hadoop/repl.sh b/qa/workunits/hadoop/repl.sh
index 2284cce0003e9590e1713a83f1ec0369428d8a41..f2e9fccbd308937f0ff9e29325fe0db4c3be0d58 100755 (executable)
--- a/qa/workunits/hadoop/repl.sh
+++ b/qa/workunits/hadoop/repl.sh
@@ -9,8 +9,6 @@ set -x
 # if HADOOP_PREFIX is not set, use default
 [ -z $HADOOP_PREFIX ] && { HADOOP_PREFIX=$TESTDIR/hadoop; }
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-
 # create pools with different replication factors
 for repl in 2 3 7 8 9; do
   name=hadoop.$repl

diff --git a/qa/workunits/hadoop/wordcount.sh b/qa/workunits/hadoop/wordcount.sh
index da91929fcdc74a2d3564f037d76f34b320ae2353..99e1e8ff89748d70b3828a0fd6b702e74245c084 100755 (executable)
--- a/qa/workunits/hadoop/wordcount.sh
+++ b/qa/workunits/hadoop/wordcount.sh
@@ -15,8 +15,6 @@ echo "starting hadoop-wordcount test"
 # if HADOOP_PREFIX is not set, use default
 [ -z $HADOOP_PREFIX ] && { HADOOP_PREFIX=$TESTDIR/hadoop; }
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-
 # Nuke hadoop directories
 $HADOOP_PREFIX/bin/hadoop fs -rm -r $WC_INPUT $WC_OUTPUT || true