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

diff --git a/tests/tests.sh b/tests/tests.sh
index 6e559b0..956c0ab 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -23,6 +23,17 @@ export NIT_TESTING=true
 
 unset NIT_DIR
 
+# Get the first Java lib available
+shopt -s nullglob
+paths=`echo /usr/lib/jvm/*/`
+paths=($paths)	
+JAVA_HOME=${paths[0]}
+
+paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/`
+paths=($paths)	
+JNI_LIB_PATH=${paths[0]}
+shopt -u nullglob
+
 usage()
 {
 	e=`basename "$0"`
@@ -32,7 +43,7 @@ Usage: $e [options] modulenames
 -v          Verbose (show tests steps)
 -h          This help
 --tap       Produce TAP output
---engine    Use a specific engine (default=nitc)
+--engine    Use a specific engine (default=nitg)
 --noskip    Do not skip a test even if the .skip file matches
 --[no]soso  Force enable (or disable) SOSO
 END
@@ -145,6 +156,7 @@ function process_result()
 			remains="$remains $OLD"
 		else
 			echo "[fixme] out/$pattern.res $FIXME"
+			echo >>$xml "<skipped/>"
 		fi
 		todos="$todos $pattern"
 	elif [ -n "$SOSO" ]; then
@@ -159,6 +171,7 @@ function process_result()
 			echo "not ok - $description # TODO not yet implemented"
 		else
 			echo "[todo] out/$pattern.res -> not yet implemented"
+			echo >>$xml "<skipped/>"
 		fi
 		todos="$todos $pattern"
 	elif [ -n "$SOSOF" ]; then
@@ -166,6 +179,7 @@ function process_result()
 			echo "not ok - $description # TODO SOSO expected failure"
 		else
 			echo "[fixme soso] out/$pattern.res $SOSOF"
+			echo >>$xml "<skipped/>"
 		fi
 		todos="$todos $pattern"
 	elif [ -n "$NSAV" ]; then
@@ -176,7 +190,7 @@ function process_result()
 		fi
 		echo >>$xml "<error message='fail out/$pattern.res $NSAV'/>"
 		echo >>$xml "<system-out><![CDATA["
-		head >>$xml -n 50 out/$pattern.diff.sav.log
+		cat -v out/$pattern.diff.sav.log | head >>$xml -n 50
 		echo >>$xml "]]></system-out>"
 		nok="$nok $pattern"
 		echo "$ii" >> "$ERRLIST"
@@ -188,25 +202,33 @@ function process_result()
 		fi
 		echo >>$xml "<error message='changed out/$pattern.res $NFIXME'/>"
 		echo >>$xml "<system-out><![CDATA["
-		head >>$xml -n 50 out/$pattern.diff.sav.log
+		cat -v out/$pattern.diff.sav.log | head >>$xml -n 50
 		echo >>$xml "]]></system-out>"
 		nok="$nok $pattern"
 		echo "$ii" >> "$ERRLIST"
-	else
+	elif [ -s out/$pattern.res ]; then
 		if [ -n "$tap" ]; then
-			echo "ok - $description # skip no sav"
+			echo "no ok - $description"
 		else
-			echo "[=== no sav ===] out/$pattern.res"
+			echo "[=== no sav ===] out/$pattern.res is not empty"
 		fi
-		echo >>$xml "<skipped/>"
+		echo >>$xml "<error message='no sav and not empty'/>"
 		echo >>$xml "<system-out><![CDATA["
-		cat  >>$xml out/$pattern.res
+		cat -v >>$xml out/$pattern.res
 		echo >>$xml "]]></system-out>"
 		nos="$nos $pattern"
+	else
+		# no sav but empty res
+		if [ -n "$tap" ]; then
+			echo "ok - $description"
+		else
+			echo "[0k] out/$pattern.res is empty"
+		fi
+		ok="$ok $pattern"
 	fi
 	if test -s out/$pattern.cmp.err; then
 		echo >>$xml "<system-err><![CDATA["
-		cat  >>$xml out/$pattern.cmp.err
+		cat -v >>$xml out/$pattern.cmp.err
 		echo >>$xml "]]></system-err>"
 	fi
 	echo >>$xml "</testcase>"
@@ -225,6 +247,35 @@ need_skip()
 		echo >>$xml "<testcase classname='$3' name='$2'><skipped/></testcase>"
 		return 0
 	fi
+	if test $engine = niti && echo "$1" | grep -f "exec.skip" >/dev/null 2>&1; then
+		((tapcount=tapcount+1))
+		if [ -n "$tap" ]; then
+			echo "ok - $2 # skip"
+		else
+			echo "=> $2: [skip exec]"
+		fi
+		echo >>$xml "<testcase classname='$3' name='$2'><skipped/></testcase>"
+		return 0
+	fi
+	return 1
+}
+
+skip_exec()
+{
+	test "$noskip" = true && return 1
+	if echo "$1" | grep -f "exec.skip" >/dev/null 2>&1; then
+		echo -n "_ "
+		return 0
+	fi
+	return 1
+}
+
+skip_cc()
+{
+	test "$noskip" = true && return 1
+	if echo "$1" | grep -f "cc.skip" >/dev/null 2>&1; then
+		return 0
+	fi
 	return 1
 }
 
@@ -253,7 +304,7 @@ find_nitc()
 verbose=false
 stop=false
 tapcount=0
-engine=nitc
+engine=nitg
 noskip=
 while [ $stop = false ]; do
 	case $1 in
@@ -270,9 +321,6 @@ while [ $stop = false ]; do
 done
 enginebinname=$engine
 case $engine in
-	nitc)
-		savdirs="sav/$engine/fixme/ sav/$engine/ sav/sav/ sav/"
-		;;
 	nitg)
 		engine=nitg-s;
 		enginebinname=nitg;
@@ -302,6 +350,14 @@ case $engine in
 		enginebinname=nit
 		savdirs="sav/$engine/fixme/ sav/$engine/ sav/fixme/ sav/"
 		;;
+	nitc)
+		echo "disabled engine $engine"
+		exit 0
+		;;
+	*)
+		echo "unknown engine $engine"
+		exit 1
+		;;
 esac
 
 # The default nitc compiler
@@ -392,12 +448,18 @@ END
 			> "$ff.compile.log"
 			ERR=0
 		else
+			if skip_cc "$bf"; then
+				nocc="--no-cc"
+			else
+				nocc=
+			fi
 			# Compile
 			if [ "x$verbose" = "xtrue" ]; then
 				echo ""
-				echo $NITC --no-color $OPT -o "$ff.bin" "$i" "$includes"
+				echo $NITC --no-color $OPT -o "$ff.bin" "$i" "$includes" $nocc
 			fi
-			NIT_NO_STACK=1 $TIMEOUT $NITC --no-color $OPT -o "$ff.bin" "$i" $includes 2> "$ff.cmp.err" > "$ff.compile.log"
+			NIT_NO_STACK=1 JNI_LIB_PATH=$JNI_LIB_PATH JAVA_HOME=$JAVA_HOME \
+				$TIMEOUT $NITC --no-color $OPT -o "$ff.bin" "$i" $includes $nocc 2> "$ff.cmp.err" > "$ff.compile.log"
 			ERR=$?
 			if [ "x$verbose" = "xtrue" ]; then
 				cat "$ff.compile.log"
@@ -408,6 +470,15 @@ END
 			test -z "$tap" && echo -n "! "
 			cat "$ff.compile.log" "$ff.cmp.err" > "$ff.res"
 			process_result $bf $bf $pack
+		elif skip_exec "$bf"; then
+			# No exec
+			> "$ff.res"
+			process_result $bf $bf $pack
+		elif [ -n "$nocc" ]; then
+			# not compiled
+			test -z "$tap" && echo -n "nocc "
+			> "$ff.res"
+			process_result $bf $bf $pack
 		elif [ -x "./$ff.bin" ]; then
 			test -z "$tap" && echo -n ". "
 			# Execute
@@ -415,8 +486,9 @@ END
 			if [ "x$verbose" = "xtrue" ]; then
 				echo ""
 				echo "NIT_NO_STACK=1 ./$ff.bin" $args
-			fi
-			NIT_NO_STACK=1 $TIMEOUT "./$ff.bin" $args < "$inputs" > "$ff.res" 2>"$ff.err"
+			fi	
+			NIT_NO_STACK=1 LD_LIBRARY_PATH=$JNI_LIB_PATH \
+				$TIMEOUT "./$ff.bin" $args < "$inputs" > "$ff.res" 2>"$ff.err"
 			if [ "x$verbose" = "xtrue" ]; then
 				cat "$ff.res"
 				cat >&2 "$ff.err"
@@ -443,6 +515,13 @@ END
 					# Sould we skip the input for this engine?
 					need_skip $bff "  $name" $pack && continue
 
+					# use a specific inputs file, if required
+					if [ -f "$bff.inputs" ]; then
+						ffinputs="$bff.inputs"
+					else
+						ffinputs=$inputs
+					fi
+
 					rm -rf "$fff.res" "$fff.err" "$fff.write" 2> /dev/null
 					if [ "x$verbose" = "xtrue" ]; then
 						echo ""
@@ -451,7 +530,7 @@ END
 					test -z "$tap" && echo -n "==> $name "
 					echo "./$ff.bin $args" > "./$fff.bin"
 					chmod +x "./$fff.bin"
-					sh -c "NIT_NO_STACK=1 $TIMEOUT ./$fff.bin < $inputs > $fff.res 2>$fff.err"
+					WRITE="$fff.write" sh -c "NIT_NO_STACK=1 $TIMEOUT ./$fff.bin < $ffinputs > $fff.res 2>$fff.err"
 					if [ "x$verbose" = "xtrue" ]; then
 						cat "$fff.res"
 						cat >&2 "$fff.err"
@@ -468,6 +547,9 @@ END
 					process_result $bff "  $name" $pack
 				done < $fargs
 			fi
+		elif [ -f "./$ff.bin" ]; then
+			echo "Not executable (platform?)" > "$ff.res"
+			process_result $bf "$bf" $pack
 		else
 			test -z "$tap" && echo -n "! "
 			cat "$ff.cmp.err" > "$ff.res"