From: Joe Buck <jbbuck@gmail.com>
Date: Thu, 8 Nov 2012 18:09:24 +0000 (-0800)
Subject: test.sh: Adding LD_LIBRARY_PATH so JUnit can find .so files.
X-Git-Tag: v0.55~142^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ef16edbc3b0ea679639f2810a840d536467a6c4;p=ceph.git

test.sh: Adding LD_LIBRARY_PATH so JUnit can find .so files.
Removing useless java.library.path references.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
---

diff --git a/qa/workunits/libcephfs-java/test.sh b/qa/workunits/libcephfs-java/test.sh
index 6ed6d79bfc37d..bf1dd37f0cf13 100755
--- a/qa/workunits/libcephfs-java/test.sh
+++ b/qa/workunits/libcephfs-java/test.sh
@@ -5,12 +5,15 @@ TLIB=binary/usr/local/lib
 
 echo "starting libcephfs-java tests"
 
+export LD_LIBRARY_PATH=$BASE/$TLIB 
+command="java -DCEPH_CONF_FILE=$BASE/ceph.conf -Djava.library.path=$LD_LIBRARY_PATH -cp /usr/share/java/junit4.jar:$BASE/$TLIB/libcephfs.jar:$BASE/$TLIB/libcephfs-test.jar org.junit.runner.JUnitCore com.ceph.fs.CephAllTests"
+
 echo "----------------------"
-echo java -DCEPH_CONF_FILE=$BASE/ceph.conf -Djava.library.path=$BASE/$TLIB/libcephfs.so:$BASE/$TLIB/libcephfs_jni.so:$BASE/$TLIB -cp /home/buck/git/ceph/src/java/lib/junit-4.8.2.jar:$BASE/$TLIB/libcephfs.jar:$BASE/$TLIB/libcephfs-test.jar org.junit.runner.JUnitCore com.ceph.fs.CephAllTests
+echo $command
 echo "----------------------"
 
-java -DCEPH_CONF_FILE=$BASE/ceph.conf -Djava.library.path=$BASE/$TLIB/libcephfs.so:$BASE/$TLIB/libcephfs_jni.so:$BASE/$TLIB -cp /home/buck/git/ceph/src/java/lib/junit-4.8.2.jar:$BASE/$TLIB/libcephfs.jar:$BASE/$TLIB/libcephfs-test.jar org.junit.runner.JUnitCore com.ceph.fs.CephAllTests
+$command
 
-echo "completing libcephfs-java tests"
+echo "completed libcephfs-java tests"
 
 exit 0