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

diff --git a/tests/tests.sh b/tests/tests.sh
index ca15577..e413069 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -21,21 +21,44 @@
 export LANG=C
 export LC_ALL=C
 export NIT_TESTING=true
-export MNIT_SRAND=0
+# Use the pid as a collision prevention
+export NIT_TESTING_ID=$$
+export NIT_SRAND=0
 
 unset NIT_DIR
 
 # Get the first Java lib available
-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]}
-shopt -u nullglob
+if which_java=$(which javac 2>/dev/null); then
+	JAVA_HOME=$(dirname $(dirname $(readlink -f "$which_java")))
+
+	shopt -s nullglob
+	paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/libjvm.so`
+	paths=($paths)
+	JNI_LIB_PATH=`dirname ${paths[0]}`
+	shopt -u nullglob
+fi
 
 outdir="out"
-compdir=".nit_compile"
+compdir="nit_compile"
+
+# User CPU time limit (in seconds)
+# Is used to avoid to CPU intensive test (infinite loops). See ulimit -t
+usertimelimit=600 # 1 CPU minute
+
+# Real-time limit (in seconds)
+# Is used to avoid waiting or sleeping tests.
+# Require timeout or timelimit, or else is not used.
+realtimelimit=300 # 5 min
+
+# User limit for write files (in kilo-bytes)
+# Is used to avoid execution that loop and fill the hard drive. See ulimit -f
+# Note that a test might require a lot of temporary disk space (eg. nitc+gcc)
+filelimit=100000 # ~100MB
+
+# Limit (in bytes) for generated .res file.
+# Larger ones are truncated and will fail tests
+# Is used to avoid processing huge crappy res file (diff, xml, etc)
+reslimit=100000 # ~100KB
 
 usage()
 {
@@ -48,8 +71,9 @@ Usage: $e [options] modulenames
 --engine    Use a specific engine (default=nitc)
 --noskip    Do not skip a test even if the .skip file matches
 --outdir    Use a specific output folder (default=out/)
---compdir   Use a specific temporary compilation folder (default=.nit_compile)
+--compdir   Use a specific temporary compilation folder (default=$compdir)
 --node      Run as a node in parallel, will not output context information
+--autosav   Copy the .res files directly in the sav folder overriding existing .res files
 END
 }
 
@@ -69,12 +93,18 @@ saferun()
 			*) stop=true
 		esac
 	done
-	if test -n "$TIME"; then
+	(
+	ulimit -f "$filelimit" 2> /dev/null
+	ulimit -t "$usertimelimit" 2> /dev/null
+	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
 		$TIMEOUT "$@"
 	fi
+	)
 }
 
 # Output a timestamp attribute for XML, or an empty line
@@ -92,9 +122,9 @@ timestamp()
 
 # Detect a working timeout
 if sh -c "timelimit echo" 1>/dev/null 2>&1; then
-	TIMEOUT="timelimit -t 600"
+	TIMEOUT="timelimit -t $realtimelimit"
 elif sh -c "timeout 1 echo" 1>/dev/null 2>&1; then
-	TIMEOUT="timeout 600s"
+	TIMEOUT="timeout ${realtimelimit}s"
 else
 	echo "No timelimit or timeout command detected. Tests may hang :("
 fi
@@ -104,6 +134,8 @@ if env time --quiet -f%U true 2>/dev/null; then
 	TIME="env time --quiet -f%U"
 elif env time -f%U true 2>/dev/null; then
 	TIME="env time -f%U"
+elif env gtime -f%U true 2>/dev/null; then
+	TIME="env gtime -f%U"
 else
 	TIME=
 fi
@@ -115,6 +147,15 @@ else
 	TIMESTAMP=
 fi
 
+# Detect a working hostname command
+if hostname --version 2>&1 | grep coreutils >/dev/null 2>&1; then
+	HOSTNAME="hostname"
+else
+	HOSTNAME="hostname -s"
+fi
+
+UNAME=`uname | sed s/-.*//`
+
 # $1 is the pattern of the test
 # $2 is the file to compare to
 # the result is:
@@ -128,7 +169,7 @@ function compare_to_result()
 	local sav="$2"
 	if [ ! -r "$sav" ]; then return 0; fi
 	test "`cat -- "$sav"`" = "UNDEFINED" && return 1
-	diff -u -- "$sav" "$outdir/$pattern.res" > "$outdir/$pattern.diff.sav.log"
+	diff -u --strip-trailing-cr -- "$sav" "$outdir/$pattern.res" > "$outdir/$pattern.diff.sav.log"
 	if [ "$?" == 0 ]; then
 		return 1
 	fi
@@ -136,7 +177,7 @@ function compare_to_result()
 	sed '/[Ww]arning/d;/[Ee]rror/d' "$sav" > "$outdir/$pattern.sav2"
 	grep '[Ee]rror' "$outdir/$pattern.res" >/dev/null && echo "Error" >> "$outdir/$pattern.res2"
 	grep '[Ee]rror' "$sav" >/dev/null && echo "Error" >> "$outdir/$pattern.sav2"
-	diff -u "$outdir/$pattern.sav2" "$outdir/$pattern.res2" > "$outdir/$pattern.diff.sav.log2"
+	diff -u --strip-trailing-cr "$outdir/$pattern.sav2" "$outdir/$pattern.res2" > "$outdir/$pattern.diff.sav.log2"
 	if [ "$?" == 0 ]; then
 		return 2
 	else
@@ -155,24 +196,33 @@ EOF
 function process_result()
 {
 	# Result
-	pattern=$1
-	description=$2
-	pack=$3
-	SAV=""
-	NSAV=""
-	FIXME=""
-	NFIXME=""
-	SOSO=""
-	NSOSO=""
-	SOSOF=""
-	NSOSOF=""
-	OLD=""
-	LIST=""
-	FIRST=""
+	local pattern=$1
+	local description=$2
+	local pack=$3
+	local SAV=""
+	local NSAV=""
+	local FIXME=""
+	local NFIXME=""
+	local SOSO=""
+	local NSOSO=""
+	local SOSOF=""
+	local NSOSOF=""
+	local OLD=""
+	local LIST=""
+	local FIRST=""
+
+	# Truncate too big res file
+	local size=$(wc -c < "$outdir/$pattern.res")
+	if test -n "$reslimit" -a "$size" -gt "$reslimit"; then
+		# The most portable way to truncate a file is with Perl
+		perl -e "truncate \"$outdir/$pattern.res\", $reslimit;"
+		echo "***TRUNCATED***" >> "$outdir/$pattern.res"
+	fi
+
 	echo >>$xml "<testcase classname='`xmlesc "$pack"`' name='`xmlesc "$description"`' time='`cat -- "$outdir/$pattern.time.out"`' `timestamp`>"
 	#for sav in "sav/$engine/fixme/$pattern.res" "sav/$engine/$pattern.res" "sav/fixme/$pattern.res" "sav/$pattern.res" "sav/$pattern.sav"; do
 	for savdir in $savdirs; do
-		sav=$savdir/fixme/$pattern.res
+		local sav=$savdir/fixme/$pattern.res
 		compare_to_result "$pattern" "$sav"
 		case "$?" in
 			0)
@@ -225,13 +275,14 @@ function process_result()
 		esac
 	done
 	OLD=`echo "$OLD" | sed -e 's/   */ /g' -e 's/^ //' -e 's/ $//'`
-	grep 'NOT YET IMPLEMENTED' "$outdir/$pattern.res" >/dev/null
+	istodo  "$outdir/$pattern.res"
 	NYI="$?"
 	if [ -n "$SAV" ]; then
 		if [ -n "$OLD" ]; then
 			echo "[*ok*] $outdir/$pattern.res $SAV - but $OLD remains!"
 			echo >>$xml "<error message='`xmlesc "ok $outdir/$pattern.res - but $OLD remains"`'/>"
 			remains="$remains $OLD"
+			test "$autosav" = "true" && rm "$OLD"
 		else
 			echo "[ok] $outdir/$pattern.res $SAV"
 		fi
@@ -241,6 +292,7 @@ function process_result()
 			echo "[*fixme*] $outdir/$pattern.res $FIXME - but $OLD remains!"
 			echo >>$xml "<error message='`xmlesc "ok $outdir/$pattern.res - but $OLD remains"`'/>"
 			remains="$remains $OLD"
+			test "$autosav" = "true" && rm "$OLD"
 		else
 			echo "[fixme] $outdir/$pattern.res $FIXME"
 			echo >>$xml "<skipped/>"
@@ -258,6 +310,7 @@ function process_result()
 		echo >>$xml "]]></system-out>"
 		nok="$nok $pattern"
 		echo "$ii" >> "$ERRLIST"
+		test "$autosav" = "true" && cp "$outdir/$pattern.res" "$SOSO"
 	elif [ -n "$SOSOF" ]; then
 		echo "[======= fixme soso $outdir/$pattern.res $SOSOF =======]"
 		echo >>$xml "<error message='`xmlesc "soso $outdir/$pattern.res $SOSO"`'/>"
@@ -266,6 +319,7 @@ function process_result()
 		echo >>$xml "]]></system-out>"
 		nok="$nok $pattern"
 		echo "$ii" >> "$ERRLIST"
+		test "$autosav" = "true" && cp "$outdir/$pattern.res" && "$SOSO"
 	elif [ -n "$NSAV" ]; then
 		echo "[======= fail $outdir/$pattern.res $NSAV =======]"
 		echo >>$xml "<error message='`xmlesc "fail $outdir/$pattern.res $NSAV"`'/>"
@@ -274,6 +328,7 @@ function process_result()
 		echo >>$xml "]]></system-out>"
 		nok="$nok $pattern"
 		echo "$ii" >> "$ERRLIST"
+		test "$autosav" = "true" && cp "$outdir/$pattern.res" "$NSAV"
 	elif [ -n "$NFIXME" ]; then
 		echo "[======= changed $outdir/$pattern.res $NFIXME ======]"
 		echo >>$xml "<error message='`xmlesc "changed $outdir/$pattern.res $NFIXME"`'/>"
@@ -282,6 +337,7 @@ function process_result()
 		echo >>$xml "]]></system-out>"
 		nok="$nok $pattern"
 		echo "$ii" >> "$ERRLIST"
+		test "$autosav" = "true" && cp "$outdir/$pattern.res" "$NFIXME"
 	elif [ -s "$outdir/$pattern.res" ]; then
 		echo "[=== no sav ===] $outdir/$pattern.res is not empty"
 		echo >>$xml "<error message='no sav and not empty'/>"
@@ -290,6 +346,7 @@ function process_result()
 		echo >>$xml "]]></system-out>"
 		nos="$nos $pattern"
 		echo "$ii" >> "$ERRLIST"
+		test "$autosav" = "true" && cp "$outdir/$pattern.res" "sav/"
 	else
 		# no sav but empty res
 		echo "[0k] $outdir/$pattern.res is empty"
@@ -316,32 +373,70 @@ need_skip()
 		echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><skipped/></testcase>"
 		return 0
 	fi
+
+	# Skip by OS
+	local 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
+
+	# Skip by hostname
+	local host_skip_file=`$HOSTNAME`.skip
+	if test -e $host_skip_file && echo "$1" | grep -f "$host_skip_file" >/dev/null 2>&1; then
+		echo "=> $2: [skip hostname]"
+		echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><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
+	for savdir in $savdirs .; do
+		local f="$savdir/exec.skip"
+		test -f "$f" || continue
+		if echo "$1" | grep -f "$f" >/dev/null 2>&1; then
+			echo -n "_ no exec by $f; "
+			return 0
+		fi
+	done
 	return 1
 }
 
 skip_cc()
 {
 	test "$noskip" = true && return 1
-	if echo "$1" | grep -f "cc.skip" >/dev/null 2>&1; then
-		return 0
-	fi
+	for savdir in $savdirs .; do
+		local f="$savdir/cc.skip"
+		test -f "$f" || continue
+		if echo "$1" | grep -f "$f" >/dev/null 2>&1; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+# Check that the resfile ($1) matches some magic strings in `todo` files.
+istodo()
+{
+	test "$no" = true && return 1
+	for savdir in $savdirs .; do
+		local f="$savdir/todo"
+		test -f "$f" || continue
+		if grep -f "$f" "$1" >/dev/null 2>&1; then
+			return 0
+		fi
+	done
 	return 1
 }
 
 find_nitc()
 {
-	name="$enginebinname"
-	recent=`ls -t ../src/$name ../src/$name_[0-9] ../bin/$name ../c_src/$name 2>/dev/null | head -1`
+	local name="$enginebinname"
+	local recent=`ls -t ../src/$name ../src/$name_[0-9] ../bin/$name ../contrib/nitin/bin/$name ../c_src/$name 2>/dev/null | head -1`
 	if [[ "x$recent" == "x" ]]; then
 		echo "Could not find binary for engine $engine, aborting"
 		exit 1
@@ -354,6 +449,7 @@ find_nitc()
 
 verbose=false
 isnode=false
+autosav=false
 stop=false
 engine=nitc
 noskip=
@@ -368,37 +464,43 @@ while [ $stop = false ]; do
 		--outdir) outdir="$2"; shift; shift;;
 		--compdir) compdir="$2"; shift; shift;;
 		--node) isnode=true; shift;;
+		--autosav) autosav=true; shift;;
 		*) stop=true
 	esac
 done
 enginebinname=$engine
 isinterpret=
+isinteractive=
 case $engine in
 	nitc|nitg)
-		engine=nitg-s;
+		engine=nitcs;
 		enginebinname=nitc;
 		OPT="--separate $OPT --compile-dir $compdir"
-		savdirs="sav/nitg-common/"
+		savdirs="sav/nitc-common/"
 		;;
 	nitcs|nitg-s)
+		engine=nitcs;
 		enginebinname=nitc;
 		OPT="--separate $OPT --compile-dir $compdir"
-		savdirs="sav/nitg-common/"
+		savdirs="sav/nitc-common/"
 		;;
 	nitce|nitg-e)
+		engine=nitce;
 		enginebinname=nitc;
 		OPT="--erasure $OPT --compile-dir $compdir"
-		savdirs="sav/nitg-common/"
+		savdirs="sav/nitc-common/"
 		;;
 	nitcsg|nitg-sg)
+		engine=nitcsg;
 		enginebinname=nitc;
 		OPT="--semi-global $OPT --compile-dir $compdir"
-		savdirs="sav/nitg-common/"
+		savdirs="sav/nitc-common/"
 		;;
 	nitcg|nitg-g)
+		engine=nitcg;
 		enginebinname=nitc;
 		OPT="--global $OPT --compile-dir $compdir"
-		savdirs="sav/nitg-common/"
+		savdirs="sav/nitc-common/"
 		;;
 	nit)
 		engine=niti
@@ -410,16 +512,24 @@ case $engine in
 		;;
 	nitvm)
 		isinterpret=true
+		enginebinname=nit
+		OPT="--vm $OPT"
 		savdirs="sav/niti/"
 		;;
+	nitin)
+		enginebinname=nitin
+		isinteractive=true
+		;;
+	nitj)
+		engine=nitj;
+		OPT="--compile-dir $compdir --ant"
+		enginebinname=nitj;
+		savdirs="sav/nitc-common/"
+		;;
 	emscripten)
 		enginebinname=nitc
 		OPT="-m emscripten_nodejs.nit --semi-global $OPT --compile-dir $compdir"
-		savdirs="sav/nitg-sg/"
-		;;
-	nitc)
-		echo "disabled engine $engine"
-		exit 0
+		savdirs="sav/nitcsg/"
 		;;
 	*)
 		echo "unknown engine $engine"
@@ -427,7 +537,7 @@ case $engine in
 		;;
 esac
 
-savdirs="sav/$engine $savdirs sav/"
+savdirs="sav/`$HOSTNAME` sav/$UNAME sav/$engine $savdirs sav/"
 
 # The default nitc compiler
 [ -z "$NITC" ] && find_nitc
@@ -486,9 +596,9 @@ for ii in "$@"; do
 	# Sould we skip the file for this engine?
 	need_skip "$f" "$f" "$pack" && continue
 
-	tmp=${ii/../AA}
-	if [ "x$tmp" = "x$ii" ]; then
-		includes="-I . -I ../lib/standard -I ../lib/standard/collection -I alt"
+	local_tmp=${ii/../AA}
+	if [ "x$local_tmp" = "x$ii" ]; then
+		includes="-I . -I ../lib/core -I ../lib/core/collection -I alt"
 	else
 		includes="-I alt"
 	fi
@@ -524,6 +634,15 @@ END
 			> "$ff.compile.log"
 			ERR=0
 			echo 0.0 > "$ff.time.out"
+		elif [ -n "$isinteractive" ]; then
+			cat > "$ff.bin" <<END
+exec $NITC --no-color --no-prompt $OPT $includes < $(printf '%q' "$i") "\$@"
+END
+			chmod +x "$ff.bin"
+			> "$ff.cmp.err"
+			> "$ff.compile.log"
+			ERR=0
+			echo 0.0 > "$ff.time.out"
 		else
 			if skip_cc "$bf"; then
 				nocc="--no-cc"
@@ -542,6 +661,8 @@ END
 				cat -- "$ff.compile.log"
 				cat >&2 -- "$ff.cmp.err"
 			fi
+			# Clean
+			rm -r "$compdir" 2>/dev/null
 		fi
 		if [ "$engine" = "emscripten" ]; then
 			echo > "$ff.bin" "nodejs $ffout \"\$@\""
@@ -575,7 +696,7 @@ END
 				echo ""
 				echo "NIT_NO_STACK=1 $ff.bin" $args
 			fi
-			NIT_NO_STACK=1 LD_LIBRARY_PATH=$JNI_LIB_PATH \
+			NIT_NO_STACK=1 LD_LIBRARY_PATH=$JNI_LIB_PATH WRITE="$ff.write" \
 				saferun -a -o "$ff.time.out" "$ff.bin" $args < "$inputs" > "$ff.res" 2>"$ff.err"
 			mv "$ff.time.out" "$ff.times.out"
 			awk '{ SUM += $1} END { print SUM }' "$ff.times.out" > "$ff.time.out"