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

diff --git a/tests/tests.sh b/tests/tests.sh
index 88487d4..ead5484 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -69,7 +69,9 @@ saferun()
 			*) stop=true
 		esac
 	done
-	if test -n "$TIME"; then
+	if test -d "$1"; then
+		find $1 | sort
+	elif test -n "$TIME"; then
 		$TIME -o "$o" $a $TIMEOUT "$@"
 	else
 		if test -n "$a"; then echo 0 >> "$o"; else echo 0 > "$o"; fi
@@ -319,7 +321,7 @@ need_skip()
 
 	# Skip by OS
 	os_skip_file=`uname`.skip
-	if test -e $os_skip_file && echo "$1" | grep -f "$os_skip_file"; then
+	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
@@ -418,6 +420,8 @@ case $engine in
 		;;
 	nitvm)
 		isinterpret=true
+		enginebinname=nit
+		OPT="--vm $OPT"
 		savdirs="sav/niti/"
 		;;
 	emscripten)