cat -v >>$xml out/$pattern.res
echo >>$xml "]]></system-out>"
nos="$nos $pattern"
+ echo "$ii" >> "$ERRLIST"
else
# no sav but empty res
echo "[0k] out/$pattern.res is empty"
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
+ 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'><skipped/></testcase>"
return 0
esac
done
enginebinname=$engine
+isinterpret=
case $engine in
nitg)
engine=nitg-s;
;;
nit)
engine=niti
+ isinterpret=true
;;
niti)
enginebinname=nit
+ isinterpret=true
+ ;;
+ nitvm)
+ isinterpret=true
+ savdirs="sav/niti/"
;;
emscripten)
enginebinname=nitg
ffout="$ff.bin.js"
fi
- if [ "$engine" = "niti" ]; then
+ if [ -n "$isinterpret" ]; then
cat > "./$ff.bin" <<END
exec $NITC --no-color $OPT "$i" $includes -- "\$@"
END
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
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=""
# 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>"