test: correcting hadoop-internal tests

Changing the hadoop-internal tests to use the
newly added $TESTDIR environment variable.
Also, removed unneeded variables.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Sam Lang <sam.lang@inktank.com>

diff --git a/qa/workunits/hadoop-internal-tests/test.sh b/qa/workunits/hadoop-internal-tests/test.sh
index 017a0bd411b260231fd2b50af07dc3bc88ce33af..5b84761dee444ac5fbbefd52d72a92a5396f6081 100755 (executable)
--- a/qa/workunits/hadoop-internal-tests/test.sh
+++ b/qa/workunits/hadoop-internal-tests/test.sh
@@ -1,13 +1,12 @@
 #!/bin/sh -e
 
-BASE=/tmp/cephtest
-TLIB=binary/usr/local/lib
-
 echo "starting hadoop-internal-tests tests"
 
-export LD_LIBRARY_PATH=$BASE/$TLIB 
-command1="cd $BASE/hadoop"
-command2="ant -Dextra.library.path=$BASE/$TLIB -Dceph.conf.file=$BASE/ceph.conf test -Dtestcase=TestCephFileSystem"
+# bail if $TESTDIR is not set as this test will fail in that scenario
+[ -z $TESTDIR] && { echo "\$TESTDIR needs to be set, but is not. Exiting."; exit 1; }
+
+command1="cd $TESTDIR/hadoop"
+command2="ant -Dextra.library.path=$LD_LIBRARY_PATH -Dceph.conf.file=$CEPH_CONF -Dtestcase=TestCephFileSystem"
 
 #print out the command
 echo "----------------------"