export LANG=C
export LC_ALL=C
export NIT_TESTING=true
+# 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}/libjvm.so`
-paths=($paths)
-JNI_LIB_PATH=`dirname ${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"
esac
done
(
- ulimit -f "$filelimit"
- ulimit -t "$usertimelimit"
+ 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="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
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:
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
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
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
fi
# Skip by OS
- local os_skip_file=`uname`.skip
+ 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>"
fi
# Skip by hostname
- local host_skip_file=`hostname -s`.skip
+ 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>"
test "$noskip" = true && return 1
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
test "$noskip" = true && return 1
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
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()
{
local name="$enginebinname"
- local recent=`ls -t ../src/$name ../src/$name_[0-9] ../bin/$name ../c_src/$name 2>/dev/null | head -1`
+ 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
done
enginebinname=$engine
isinterpret=
+isinteractive=
case $engine in
nitc|nitg)
engine=nitcs;
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"
;;
esac
-savdirs="sav/`hostname -s` sav/`uname` sav/$engine $savdirs sav/"
+savdirs="sav/`$HOSTNAME` sav/$UNAME sav/$engine $savdirs sav/"
# The default nitc compiler
[ -z "$NITC" ] && find_nitc
# 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
> "$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"
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"