test: updating libcephfs-java tests

Recent changes in teuthology necessitate
changes to libcephfs-java test case.

Signed-off-by: Joe Buck <jbbuck@gmail.com>

diff --git a/qa/workunits/libcephfs-java/test.sh b/qa/workunits/libcephfs-java/test.sh
index 1e33d3eec154c161746e2722d5a73110684ed92b..cf5fbf0e481ebf981bd7de7bd23fecd6f683c3b1 100755 (executable)
--- a/qa/workunits/libcephfs-java/test.sh
+++ b/qa/workunits/libcephfs-java/test.sh
@@ -1,8 +1,32 @@
 #!/bin/sh -e
 
 echo "starting libcephfs-java tests"
+# configure CEPH_CONF and LD_LIBRARY_PATH if they're not already set
+conf="$CEPH_CONF"
+if [ -z "$conf" ] ; then
+       echo "Setting conf to /etc/ceph/ceph.conf" 
+       conf="/etc/ceph/ceph.conf"
+else
+       echo "conf is set to $conf"
+fi
 
-command="java -DCEPH_CONF_FILE=$CEPH_CONF -Djava.library.path=$LD_LIBRARY_PATH -cp /usr/share/java/junit4.jar:$CEPH_JAVA_PATH/libcephfs.jar:$CEPH_JAVA_PATH/libcephfs-test.jar org.junit.runner.JUnitCore com.ceph.fs.CephAllTests"
+ld_lib_path="$LD_LIBRARY_PATH"
+if [ -z "$ld_lib_path" ] ; then
+       echo "Setting ld_lib_path to /usr/lib/jni"
+       ld_lib_path="/usr/lib/jni"
+else
+       echo "ld_lib_path was set to $ld_lib_path"
+fi
+
+ceph_java="$CEPH_JAVA_PATH"
+if [ -z "$ceph_java" ] ; then
+       echo "Setting ceph_java to /usr/share/java"
+       ceph_java="/usr/share/java"
+else
+       echo "ceph_java was set to $ceph_java"
+fi
+
+command="java -DCEPH_CONF_FILE=$conf -Djava.library.path=$ld_lib_path -cp /usr/share/java/junit4.jar:$ceph_java/libcephfs.jar:$ceph_java/libcephfs-test.jar org.junit.runner.JUnitCore com.ceph.fs.CephAllTests"
 
 echo "----------------------"
 echo $command