From 77e59f01a098cd57733139e256838cd31bc75415 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Wed, 27 Jan 2016 20:49:02 -0500 Subject: [PATCH] tests: avoid errors messages if java is not found Signed-off-by: Jean Privat --- tests/tests.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/tests.sh b/tests/tests.sh index 8766a0d..84ba34a 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -26,13 +26,15 @@ export NIT_SRAND=0 unset NIT_DIR # Get the first Java lib available -shopt -s nullglob -JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac)))) - -paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/libjvm.so` -paths=($paths) -JNI_LIB_PATH=`dirname ${paths[0]}` -shopt -u nullglob +if which_java=$(which javac 2>/dev/null); then + JAVA_HOME=$(dirname $(dirname $(readlink -f "$which_java"))) + + shopt -s nullglob + paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/libjvm.so` + paths=($paths) + JNI_LIB_PATH=`dirname ${paths[0]}` + shopt -u nullglob +fi outdir="out" compdir="nit_compile" -- 1.7.9.5