summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Buck <jbbuck@gmail.com>2013-09-16 18:11:50 -0700
committerJoe Buck <jbbuck@gmail.com>2013-09-16 22:08:31 -0700
commit446fec7465e46b21da4080ea0e50ac84a4b3bf96 (patch)
treeedc79a9fa3369dfee1262fe8e7a6f92cb6c29064
parentece79759ea3fd2159d346aaf577f66dd5fc4d6e3 (diff)
downloadceph-446fec7465e46b21da4080ea0e50ac84a4b3bf96.tar.gz
Add ANT_HOME to the workunit
Specify an ANT_HOME entry for this workunit, as it is needed on CentOS. Signed-off-by: Joe Buck <jbbuck@gmail.com>
-rwxr-xr-xqa/workunits/libcephfs-java/test.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/qa/workunits/libcephfs-java/test.sh b/qa/workunits/libcephfs-java/test.sh
index cf5fbf0e481..3a0e3032c52 100755
--- a/qa/workunits/libcephfs-java/test.sh
+++ b/qa/workunits/libcephfs-java/test.sh
@@ -26,7 +26,15 @@ 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"
+ant_home="$ANT_HOME"
+if [ -z "$ant_home" ] ; then
+ echo "Setting ANT_HOME to /usr/share/ant/"
+ ant_home="/usr/share/ant/"
+else
+ echo "ANT_HOME was set to $ant_home"
+fi
+
+command="java -DANT_HOME=$ant_home -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