# Set lang do default to avoid failed tests because of locale
export LANG=C
+export LC_ALL=C
+export NIT_TESTING=true
+export MNIT_SRAND=0
+
+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
+
+outdir="out"
+compdir=".nit_compile"
usage()
{
e=`basename "$0"`
cat<<END
Usage: $e [options] modulenames
--o option Pass option to nitc
+-o option Pass option to the engine
-v Verbose (show tests steps)
-h This help
+--engine Use a specific engine (default=nitg)
+--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)
+--node Run as a node in parallel, will not output context information
END
}
+# Run a command with a timeout and a time count.
+# Options:
+# -o file write the user time into file (REQUIRED). see `-o` in `man time`
+# -a append the time to the file (instead of overwriting it). see `-a` in `man time`
+saferun()
+{
+ local stop=false
+ local o=
+ local a=
+ while [ $stop = false ]; do
+ case $1 in
+ -o) o="$2"; shift; shift;;
+ -a) a="-a"; shift;;
+ *) stop=true
+ esac
+ done
+ if 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
+timestamp()
+{
+ if test -n "$TIMESTAMP"; then
+ echo "timestamp='`$TIMESTAMP`'"
+ else
+ echo ""
+ fi
+
+}
+
+# Get platform specific commands ##########################
+
+# Detect a working timeout
+if sh -c "timelimit echo" 1>/dev/null 2>&1; then
+ TIMEOUT="timelimit -t 600"
+elif sh -c "timeout 1 echo" 1>/dev/null 2>&1; then
+ TIMEOUT="timeout 600s"
+else
+ echo "No timelimit or timeout command detected. Tests may hang :("
+fi
+
+# Detect a working time command
+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"
+else
+ TIME=
+fi
+
+# Detect a working date command
+if date -Iseconds >/dev/null 2>&1; then
+ TIMESTAMP="date -Iseconds"
+else
+ TIMESTAMP=
+fi
+
+# $1 is the pattern of the test
+# $2 is the file to compare to
+# the result is:
+# 0: if the file to compare to do not exists
+# 1: if the file match
+# 2: if the file match with soso
+# 3: if the file do not match
+function compare_to_result()
+{
+ local pattern="$1"
+ 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"
+ if [ "$?" == 0 ]; then
+ return 1
+ fi
+ sed '/[Ww]arning/d;/[Ee]rror/d' "$outdir/$pattern.res" > "$outdir/$pattern.res2"
+ 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"
+ if [ "$?" == 0 ]; then
+ return 2
+ else
+ return 3
+ fi
+}
+
# As argument: the pattern used for the file
function process_result()
{
# Result
pattern=$1
+ description=$2
+ pack=$3
SAV=""
- FAIL=""
+ NSAV=""
+ FIXME=""
+ NFIXME=""
SOSO=""
- if [ -r "sav/$pattern.sav" ]; then
- diff -u "out/$pattern.res" "sav/$pattern.sav" > "out/$pattern.diff.sav.log"
- if [ "$?" == 0 ]; then
- SAV=OK
- else
- SAV=NOK
- fi
- sed '/[Ww]arning/d;/[Ee]rror/d' "out/$pattern.res" > "out/$pattern.res2"
- sed '/[Ww]arning/d;/[Ee]rror/d' "sav/$pattern.sav" > "out/$pattern.sav2"
- grep '[Ee]rror' "out/$pattern.res" >/dev/null && echo "Error" >> "out/$pattern.res2"
- grep '[Ee]rror' "sav/$pattern.sav" >/dev/null && echo "Error" >> "out/$pattern.sav2"
- diff -u "out/$pattern.res2" "out/$pattern.sav2" > "out/$pattern.diff.sav2.log"
- if [ "$?" == 0 ]; then
- SOSO=OK
- else
- SOSO=NOK
- fi
- fi
- if [ -r "sav/$pattern.fail" ]; then
- diff -u "out/$pattern.res" "sav/$pattern.fail" > "out/$pattern.diff.fail.log"
- if [ "$?" == 0 ]; then
- FAIL=OK
+ NSOSO=""
+ SOSOF=""
+ NSOSOF=""
+ OLD=""
+ LIST=""
+ FIRST=""
+ echo >>$xml "<testcase classname='$pack' name='$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
+ compare_to_result "$pattern" "$sav"
+ case "$?" in
+ 0)
+ ;; # no file
+ 1)
+ OLD="$LIST"
+ FIXME="$sav"
+ LIST="$LIST $sav"
+ ;;
+ 2)
+ if [ -z "$FIRST" ]; then
+ SOSOF="$sav"
+ FIRST="$sav"
+ fi
+ LIST="$LIST $sav"
+ ;;
+ 3)
+ if [ -z "$FIRST" ]; then
+ NFIXME="$sav"
+ FIRST="$sav"
+ fi
+ LIST="$LIST $sav"
+ ;;
+ esac
+
+ sav=$savdir/$pattern.res
+ compare_to_result "$pattern" "$sav"
+ case "$?" in
+ 0)
+ ;; # no file
+ 1)
+ OLD="$LIST"
+ SAV="$sav"
+ LIST="$LIST $sav"
+ ;;
+ 2)
+ if [ -z "$FIRST" ]; then
+ SOSO="$sav"
+ FIRST="$sav"
+ fi
+ LIST="$LIST $sav"
+ ;;
+ 3)
+ if [ -z "$FIRST" ]; then
+ NSAV="$sav"
+ FIRST="$sav"
+ fi
+ LIST="$LIST $sav"
+ ;;
+ esac
+ done
+ OLD=`echo "$OLD" | sed -e 's/ */ /g' -e 's/^ //' -e 's/ $//'`
+ grep 'NOT YET IMPLEMENTED' "$outdir/$pattern.res" >/dev/null
+ NYI="$?"
+ if [ -n "$SAV" ]; then
+ if [ -n "$OLD" ]; then
+ echo "[*ok*] $outdir/$pattern.res $SAV - but $OLD remains!"
+ echo >>$xml "<error message='ok $outdir/$pattern.res - but $OLD remains'/>"
+ remains="$remains $OLD"
else
- FAIL=NOK
+ echo "[ok] $outdir/$pattern.res $SAV"
fi
- fi
- if [ "x$SAV" = "xOK" ]; then
- if [ "x$FAIL" = "x" ]; then
- echo "[ok] out/$pattern.res"
+ ok="$ok $pattern"
+ elif [ -n "$FIXME" ]; then
+ if [ -n "$OLD" ]; then
+ echo "[*fixme*] $outdir/$pattern.res $FIXME - but $OLD remains!"
+ echo >>$xml "<error message='ok $outdir/$pattern.res - but $OLD remains'/>"
+ remains="$remains $OLD"
else
- echo "[ok] out/$pattern.res - but sav/$pattern.fail remains!"
+ echo "[fixme] $outdir/$pattern.res $FIXME"
+ echo >>$xml "<skipped/>"
fi
- ok="$ok $pattern"
- elif [ "x$FAIL" = "xOK" ]; then
- echo "[fail] out/$pattern.res"
- ok="$ok $pattern"
- elif [ "x$SOSO" = "xOK" ]; then
- echo "[soso] out/$pattern.res sav/$pattern.sav"
- ok="$ok $pattern"
- elif [ "x$SAV" = "xNOK" ]; then
- echo "[======= fail out/$pattern.res sav/$pattern.sav =======]"
+ todos="$todos $pattern"
+ elif [ "x$NYI" = "x0" ]; then
+ echo "[todo] $outdir/$pattern.res -> not yet implemented"
+ echo >>$xml "<skipped/>"
+ todos="$todos $pattern"
+ elif [ -n "$SOSO" ]; then
+ echo "[======= soso $outdir/$pattern.res $SOSO =======]"
+ echo >>$xml "<error message='soso $outdir/$pattern.res $SOSO'/>"
+ echo >>$xml "<system-out><![CDATA["
+ cat -v $outdir/$pattern.diff.sav.log | head >>$xml -n 50
+ echo >>$xml "]]></system-out>"
nok="$nok $pattern"
echo "$ii" >> "$ERRLIST"
- elif [ "x$FAIL" = "xNOK" ]; then
- echo "[======= changed out/$pattern.res sav/$pattern.fail ======]"
+ elif [ -n "$SOSOF" ]; then
+ echo "[======= fixme soso $outdir/$pattern.res $SOSOF =======]"
+ echo >>$xml "<error message='soso $outdir/$pattern.res $SOSO'/>"
+ echo >>$xml "<system-out><![CDATA["
+ cat -v $outdir/$pattern.diff.sav.log | head >>$xml -n 50
+ echo >>$xml "]]></system-out>"
nok="$nok $pattern"
echo "$ii" >> "$ERRLIST"
- else
- echo "[=== no sav ===] out/$pattern.res"
+ elif [ -n "$NSAV" ]; then
+ echo "[======= fail $outdir/$pattern.res $NSAV =======]"
+ echo >>$xml "<error message='fail $outdir/$pattern.res $NSAV'/>"
+ echo >>$xml "<system-out><![CDATA["
+ cat -v $outdir/$pattern.diff.sav.log | head >>$xml -n 50
+ echo >>$xml "]]></system-out>"
+ nok="$nok $pattern"
+ echo "$ii" >> "$ERRLIST"
+ elif [ -n "$NFIXME" ]; then
+ echo "[======= changed $outdir/$pattern.res $NFIXME ======]"
+ echo >>$xml "<error message='changed $outdir/$pattern.res $NFIXME'/>"
+ echo >>$xml "<system-out><![CDATA["
+ cat -v $outdir/$pattern.diff.sav.log | head >>$xml -n 50
+ echo >>$xml "]]></system-out>"
+ nok="$nok $pattern"
+ echo "$ii" >> "$ERRLIST"
+ elif [ -s $outdir/$pattern.res ]; then
+ echo "[=== no sav ===] $outdir/$pattern.res is not empty"
+ echo >>$xml "<error message='no sav and not empty'/>"
+ echo >>$xml "<system-out><![CDATA["
+ cat -v >>$xml $outdir/$pattern.res
+ echo >>$xml "]]></system-out>"
nos="$nos $pattern"
+ echo "$ii" >> "$ERRLIST"
+ else
+ # no sav but empty res
+ echo "[0k] $outdir/$pattern.res is empty"
+ ok="$ok $pattern"
fi
+ if test -s $outdir/$pattern.cmp.err; then
+ echo >>$xml "<system-err><![CDATA["
+ cat -v >>$xml $outdir/$pattern.cmp.err
+ echo >>$xml "]]></system-err>"
+ fi
+ echo >>$xml "</testcase>"
}
-find_nitc()
+need_skip()
{
- recent=`ls -t ../src/nitc ../src/nitc_[0-9] ../bin/nitc ../c_src/nitc 2>/dev/null | head -1`
- if [[ "x$recent" == "x" ]]; then
- echo 'Could not find nitc, aborting'
- exit 1
+ test "$noskip" = true && return 1
+ if echo "$1" | grep -f "$engine.skip" >/dev/null 2>&1; then
+ echo "=> $2: [skip]"
+ echo >>$xml "<testcase classname='$3' name='$2' `timestamp`><skipped/></testcase>"
+ return 0
fi
- echo 'Using nitc from: '$recent
- NITC=$recent
+ if test -n "$isinterpret" && echo "$1" | grep -f "exec.skip" >/dev/null 2>&1; then
+ echo "=> $2: [skip exec]"
+ echo >>$xml "<testcase classname='$3' name='$2' `timestamp`><skipped/></testcase>"
+ return 0
+ fi
+ return 1
}
-make_alts0()
+skip_exec()
{
- ii="$1"
- xalt="$2"
- fs=""
- for alt in `sed -n "s/.*#!*\($xalt[0-9]*\)#.*/\1/p" "$ii" | sort -u`; do
- f=`basename "$ii" .nit`
- d=`dirname "$ii"`
- ff="$f"
- i="$ii"
-
- if [ "x$alt" != "x" ]; then
- test -d alt || mkdir -p alt
- i="alt/${f}_$alt.nit"
- ff="${ff}_$alt"
- sed "s/#$alt#//g;/#!$alt#/d" "$ii" > "$i"
- fi
- ff="$ff$MARK"
- fs="$fs $i"
- done
- echo "$fs"
+ test "$noskip" = true && return 1
+ if echo "$1" | grep -f "exec.skip" >/dev/null 2>&1; then
+ echo -n "_ "
+ return 0
+ fi
+ return 1
}
-make_alts()
+
+skip_cc()
{
- ii="$1"
- fs="$1"
- for xalt in `sed -n 's/.*#!*\([0-9]*alt\)[0-9]*#.*/\1/p' "$ii" | sort -u`; do
- fs2=""
- for f in $fs; do
- fs2="$fs2 `make_alts0 $f $xalt`"
- done
- fs="$fs $fs2"
- done
- echo "$fs"
+ test "$noskip" = true && return 1
+ if echo "$1" | grep -f "cc.skip" >/dev/null 2>&1; then
+ return 0
+ fi
+ return 1
}
-# The default nitc compiler
-[ -z "$NITC" ] && find_nitc
-
-# Set NIT_DIR if needed
-[ -z "$NIT_DIR" ] && export NIT_DIR=..
+find_nitc()
+{
+ name="$enginebinname"
+ recent=`ls -t ../src/$name ../src/$name_[0-9] ../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
+ fi
+ if [ "x$isnode" = "xfalse" ]; then
+ echo "Found binary for engine $engine: $recent $OPT"
+ fi
+ NITC=$recent
+}
verbose=false
+isnode=false
stop=false
+engine=nitg
+noskip=
+savdirs=
while [ $stop = false ]; do
case $1 in
-o) OPT="$OPT $2"; shift; shift;;
-v) verbose=true; shift;;
-h) usage; exit;;
+ --engine) engine="$2"; shift; shift;;
+ --noskip) noskip=true; shift;;
+ --outdir) outdir="$2"; shift; shift;;
+ --compdir) compdir="$2"; shift; shift;;
+ --node) isnode=true; shift;;
*) stop=true
esac
done
+enginebinname=$engine
+isinterpret=
+case $engine in
+ nitg)
+ engine=nitg-s;
+ enginebinname=nitg;
+ OPT="--separate $OPT --compile-dir $compdir"
+ savdirs="sav/nitg-common/"
+ ;;
+ nitg-s)
+ enginebinname=nitg;
+ OPT="--separate $OPT --compile-dir $compdir"
+ savdirs="sav/nitg-common/"
+ ;;
+ nitg-e)
+ enginebinname=nitg;
+ OPT="--erasure $OPT --compile-dir $compdir"
+ savdirs="sav/nitg-common/"
+ ;;
+ nitg-sg)
+ enginebinname=nitg;
+ OPT="--semi-global $OPT --compile-dir $compdir"
+ savdirs="sav/nitg-common/"
+ ;;
+ nitg-g)
+ enginebinname=nitg;
+ OPT="--global $OPT --compile-dir $compdir"
+ savdirs="sav/nitg-common/"
+ ;;
+ nit)
+ engine=niti
+ isinterpret=true
+ ;;
+ niti)
+ enginebinname=nit
+ isinterpret=true
+ ;;
+ nitvm)
+ isinterpret=true
+ savdirs="sav/niti/"
+ ;;
+ emscripten)
+ enginebinname=nitg
+ OPT="-m emscripten_nodejs.nit --semi-global $OPT --compile-dir $compdir"
+ savdirs="sav/nitg-sg/"
+ ;;
+ nitc)
+ echo "disabled engine $engine"
+ exit 0
+ ;;
+ *)
+ echo "unknown engine $engine"
+ exit 1
+ ;;
+esac
+
+savdirs="sav/$engine $savdirs sav/"
+
+# The default nitc compiler
+[ -z "$NITC" ] && find_nitc
+
+# Set NIT_DIR if needed
+[ -z "$NIT_DIR" ] && export NIT_DIR=..
# Mark to distinguish files among tests
# MARK=
-# File where error tests are outputed
-# Old ERRLIST is backuped
-ERRLIST=${ERRLIST:-errlist}
-ERRLIST_TARGET=$ERRLIST
-
if [ $# = 0 ]; then
usage;
exit
fi
+# CLEAN the out directory
+rm -rf "$outdir/" 2>/dev/null
+mkdir "$outdir" 2>/dev/null
+
+# File where error tests are outputed
+# Old ERRLIST is backuped
+ERRLIST=${ERRLIST:-errlist}
+ERRLIST_TARGET=$ERRLIST
+
# Initiate new ERRLIST
if [ "x$ERRLIST" = "x" ]; then
- ERRLIST=/dev=null
+ ERRLIST=/dev/null
else
ERRLIST=$ERRLIST.tmp
> "$ERRLIST"
ok=""
nok=""
+todos=""
-# CLEAN the out directory
-rm -rf out/ 2>/dev/null
-mkdir out 2>/dev/null
+if [ "x$XMLDIR" = "x" ]; then
+ xml="tests-$engine.xml"
+else
+ sum=`echo $@ | md5sum | cut -f1 -d " "`
+ xml="$XMLDIR/tests-$engine-$sum.xml"
+ mkdir -p "$XMLDIR"
+fi
+
+echo >$xml "<testsuites><testsuite>"
for ii in "$@"; do
if [ ! -f $ii ]; then
echo "File '$ii' does not exist."
continue
fi
+ f=`basename "$ii" .nit`
+
+ pack="tests.${engine}".`echo $ii | perl -p -e 's|^../([^/]*)/([a-zA-Z_]*).*|\1.\2| || s|^([a-zA-Z]*)[^_]*_([a-zA-Z]*).*|\1.\2| || s|\W*([a-zA-Z_]*).*|\1|'`
+
+ # 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 alt"
fi
- f=`basename "$ii" .nit`
- for i in `make_alts $ii`; do
+ for i in "$ii" `./alterner.pl --start '#' --altsep '_' $ii`; do
bf=`basename $i .nit`
- ff="out/$bf"
+ ff="$outdir/$bf"
+
+ # Sould we skip the alternative for this engine?
+ need_skip $bf $bf $pack && continue
+
echo -n "=> $bf: "
- # Compile
- if [ "x$verbose" = "xtrue" ]; then
- echo ""
- echo $NITC --no-color $OPT -o "$ff.bin" "$i" "$includes"
+ if [ -f "$f.inputs" ]; then
+ inputs="$f.inputs"
+ export MNIT_READ_INPUT="$f.inputs"
+ else
+ inputs=/dev/null
+ export MNIT_READ_INPUT=/dev/null
+ fi
+
+ ffout="$ff.bin"
+ if [ "$engine" = "emscripten" ]; then
+ ffout="$ff.bin.js"
+ fi
+
+ if [ -n "$isinterpret" ]; then
+ cat > "$ff.bin" <<END
+exec $NITC --no-color $OPT $includes -- "$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"
+ else
+ nocc=
+ fi
+ # Compile
+ if [ "x$verbose" = "xtrue" ]; then
+ echo ""
+ echo $NITC --no-color $OPT -o "$ffout" "$includes" $nocc "$i"
+ fi
+ NIT_NO_STACK=1 JNI_LIB_PATH=$JNI_LIB_PATH JAVA_HOME=$JAVA_HOME \
+ saferun -o "$ff.time.out" $NITC --no-color $OPT -o "$ffout" $includes $nocc "$i" 2> "$ff.cmp.err" > "$ff.compile.log"
+ ERR=$?
+ if [ "x$verbose" = "xtrue" ]; then
+ cat "$ff.compile.log"
+ cat >&2 "$ff.cmp.err"
+ fi
fi
- $NITC --no-color $OPT -o "$ff.bin" "$i" $includes 2> "$ff.cmp.err" > "$ff.compile.log"
- ERR=$?
- if [ "x$verbose" = "xtrue" ]; then
- cat "$ff.compile.log"
- cat >&2 "$ff.cmp.err"
+ if [ "$engine" = "emscripten" ]; then
+ echo > "$ff.bin" "nodejs $ffout \"\$@\""
+ chmod +x "$ff.bin"
+ if grep "Fatal Error: more than one primitive class" "$ff.compile.log" > /dev/null; then
+ echo " [skip] do no not imports kernel"
+ echo >>$xml "<testcase classname='$pack' name='$bf' `timestamp`><skipped/></testcase>"
+ continue
+ fi
fi
- egrep '^[A-Z0-9_]*$' "$ff.compile.log" > "$ff.res"
if [ "$ERR" != 0 ]; then
echo -n "! "
- cp "$ff.cmp.err" "$ff.res"
- process_result $bf
- elif [ -x "./$ff.bin" ]; then
- cp "$ff.cmp.err" "$ff.res"
+ cat "$ff.compile.log" "$ff.cmp.err" > "$ff.res"
+ process_result $bf $bf $pack
+ elif [ -n "$nocc" ]; then
+ # not compiled
+ echo -n "nocc "
+ > "$ff.res"
+ process_result $bf $bf $pack
+ elif [ -x "$ff.bin" ]; then
+ if skip_exec "$bf"; then
+ # No exec
+ > "$ff.res"
+ process_result $bf $bf $pack
+ break
+ fi
echo -n ". "
# Execute
args=""
if [ "x$verbose" = "xtrue" ]; then
echo ""
- echo "NIT_NO_STACK=1 ./$ff.bin" $args
- fi
- if [ -f "$f.inputs" ]; then
- NIT_NO_STACK=1 "./$ff.bin" $args < "$f.inputs" >> "$ff.res" 2>"$ff.err"
- else
- NIT_NO_STACK=1 "./$ff.bin" $args >> "$ff.res" 2>"$ff.err"
+ echo "NIT_NO_STACK=1 $ff.bin" $args
fi
+ NIT_NO_STACK=1 LD_LIBRARY_PATH=$JNI_LIB_PATH \
+ 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
+
if [ "x$verbose" = "xtrue" ]; then
cat "$ff.res"
cat >&2 "$ff.err"
elif [ -d "$ff.write" ]; then
LANG=C /bin/ls -F $ff.write >> "$ff.res"
fi
- if [ -s "$ff.err" ]; then
- cat "$ff.err" >> "$ff.res"
- fi
- process_result $bf
+ cp "$ff.res" "$ff.res2"
+ cat "$ff.cmp.err" "$ff.err" "$ff.res2" > "$ff.res"
+ process_result $bf $bf $pack
if [ -f "$f.args" ]; then
fargs=$f.args
cptr=0
while read line; do
((cptr=cptr+1))
- args=$line
+ args="$line"
bff=$bf"_args"$cptr
fff=$ff"_args"$cptr
+ name="$bf args $cptr"
+
+ # 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 ""
- echo "NIT_NO_STACK=1 ./$ff.bin" $args
- fi
- echo -n "==> args #"$cptr " "
- if [ -f "$f.inputs" ]; then
- NIT_NO_STACK=1 "./$ff.bin" $args < "$f.inputs" > "$fff.res" 2>"$fff.err"
- else
- sh -c "NIT_NO_STACK=1 ./$ff.bin ''$args > $fff.res 2>$fff.err"
+ echo "NIT_NO_STACK=1 $ff.bin" $args
fi
+ echo -n "==> $name "
+ echo "$ff.bin $args" > "$fff.bin"
+ chmod +x "$fff.bin"
+ WRITE="$fff.write" saferun -o "$fff.time.out" sh -c "NIT_NO_STACK=1 $fff.bin < $ffinputs > $fff.res 2>$fff.err"
if [ "x$verbose" = "xtrue" ]; then
cat "$fff.res"
cat >&2 "$fff.err"
LANG=C /bin/ls -F $fff.write >> "$fff.res"
fi
if [ -s "$fff.err" ]; then
- cat "$fff.err" >> "$fff.res"
+ cp "$fff.res" "$fff.res2"
+ cat "$fff.err" "$fff.res2" > "$fff.res"
fi
- process_result $bff
+ process_result $bff " $name" $pack
done < $fargs
fi
+ elif [ -f "$ff.bin" ]; then
+ #Not executable (platform?)"
+ > "$ff.res"
+ process_result $bf "$bf" $pack
else
echo -n "! "
+ cat "$ff.cmp.err" > "$ff.res"
echo "Compilation error" > "$ff.res"
- process_result $bf
+ process_result $bf "$bf" $pack
fi
done
done
-echo "ok: " `echo $ok | wc -w` "/" `echo $ok $nok $nos | wc -w`
+if [ "x$isnode" = "xfalse" ]; then
+ echo "engine: $engine ($enginebinname $OPT)"
+ echo "ok: " `echo $ok | wc -w` "/" `echo $ok $nok $nos $todos | wc -w`
-if [ -n "$nok" ]; then
- echo "fail: $nok"
- echo "There were $(echo $nok | wc -w) errors ! (see file $ERRLIST)"
-fi
-if [ -n "$nos" ]; then
- echo "no sav: $nos"
+ if [ -n "$nok" ]; then
+ echo "fail: $nok"
+ echo "There were $(echo $nok | wc -w) errors ! (see file $ERRLIST)"
+ fi
+ if [ -n "$nos" ]; then
+ echo "no sav: $nos"
+ fi
+ if [ -n "$todos" ]; then
+ echo "todo/fixme: $todos"
+ fi
+ if [ -n "$remains" ]; then
+ echo "sav that remains: $remains"
+ fi
fi
# write $ERRLIST
if [ "x$ERRLIST" != "x" ]; then
- if [ -x "$ERRLIST_TARGET" ]; then
+ if [ -f "$ERRLIST_TARGET" ]; then
mv "$ERRLIST_TARGET" "${ERRLIST_TARGET}.bak"
fi
- mv $ERRLIST $ERRLIST_TARGET
+ uniq $ERRLIST > $ERRLIST_TARGET
+ rm $ERRLIST
fi
+echo >>$xml "</testsuite></testsuites>"
+
if [ -n "$nok" ]; then
exit 1
else