Merge: More tweaks to support the Java FFI on turing

Pull-Request: #903
Reviewed-by: Jean Privat <jean@pryen.org>

diff --combined tests/tests.sh
index 09eb300,e437553..faed626
--- 1/tests/tests.sh
--- 2/tests/tests.sh
+++ b/tests/tests.sh
@@@ -27,13 -27,13 +27,13 @@@ unset NIT_DI
  
  # 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"
@@@ -373,27 -373,22 +373,27 @@@ case $engine i
                engine=nitg-s;
                enginebinname=nitg;
                OPT="--separate $OPT --compile-dir $compdir"
 +              savdirs="sav/nitg-common/"
                ;;
        nitg-s)
                enginebinname=nitg;
                OPT="--separate $OPT --compile-dir $compdir"
 +              savdirs="sav/nitg-common/"
                ;;
        nitg-e)
                enginebinname=nitg;
                OPT="--erasure $OPT --compile-dir $compdir"
 +              savdirs="sav/nitg-common/"
                ;;
        nitg-sg)
                enginebinname=nitg;
                OPT="--semi-global $OPT --compile-dir $compdir"
 +              savdirs="sav/nitg-common/"
                ;;
        nitg-g)
                enginebinname=nitg;
                OPT="--global $OPT --compile-dir $compdir"
 +              savdirs="sav/nitg-common/"
                ;;
        nit)
                engine=niti