X-Git-Url: http://nitlanguage.org

diff --git a/tests/tests.sh b/tests/tests.sh
index ca15577..6c76366 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -29,9 +29,9 @@ unset NIT_DIR
 shopt -s nullglob
 JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
 
-paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/`
-paths=($paths)	
-JNI_LIB_PATH=${paths[0]}
+paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/libjvm.so`
+paths=($paths)
+JNI_LIB_PATH=`dirname ${paths[0]}`
 shopt -u nullglob
 
 outdir="out"
@@ -316,6 +316,14 @@ need_skip()
 		echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><skipped/></testcase>"
 		return 0
 	fi
+
+	# Skip by OS
+	os_skip_file=`uname`.skip
+	if test -e $os_skip_file && echo "$1" | grep -f "$os_skip_file" >/dev/null 2>&1; then
+		echo "=> $2: [skip os]"
+		echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><skipped/></testcase>"
+		return 0
+	fi
 	return 1
 }
 
@@ -410,6 +418,8 @@ case $engine in
 		;;
 	nitvm)
 		isinterpret=true
+		enginebinname=nit
+		OPT="--vm $OPT"
 		savdirs="sav/niti/"
 		;;
 	emscripten)