nitlanguage
/
nit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b769de
)
tests: use even more portable code to find JAVA_HOME
author
Alexis Laferrière
<alexis.laf@xymus.net>
Tue, 11 Nov 2014 17:06:45 +0000
(12:06 -0500)
committer
Alexis Laferrière
<alexis.laf@xymus.net>
Tue, 11 Nov 2014 17:06:45 +0000
(12:06 -0500)
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
tests/tests.sh
patch
|
blob
|
history
diff --git
a/tests/tests.sh
b/tests/tests.sh
index
76ecf2c
..
e437553
100755
(executable)
--- a/
tests/tests.sh
+++ b/
tests/tests.sh
@@
-27,13
+27,13
@@
unset NIT_DIR
# Get the first Java lib available
shopt -s nullglob
-paths=`echo /usr/lib/jvm/*/`
-paths=($paths)
-JAVA_HOME=${paths[0]}
+JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/`
paths=($paths)
JNI_LIB_PATH=${paths[0]}
+echo $JAVA_HOME
+echo $JNI_LIB_PATH
shopt -u nullglob
outdir="out"