X-Git-Url: http://nitlanguage.org diff --git a/tests/tests.sh b/tests/tests.sh index ef4cc4f..02ae121 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -15,121 +15,278 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This shell script compile, run and verify NIT program files +# This shell script compile, run and verify Nit program files -# Ruby binary (none if you want to let the program to decide) -#RUBY= -[ -z "$NITC" ] && NITC=../bin/nitc +# Set lang do default to avoid failed tests because of locale +export LANG=C -# Options to use with the ruby compiler -# OPT= +usage() +{ + e=`basename "$0"` + cat< "$pattern.diff.sav.log" + if [ "$?" == 0 ]; then + SAV=OK + else + SAV=NOK + fi + fi + if [ -r "sav/$pattern.fail" ]; then + diff -u "$pattern.res" "sav/$pattern.fail" > "$pattern.diff.fail.log" + if [ "$?" == 0 ]; then + FAIL=OK + else + FAIL=NOK + fi + fi + if [ "x$SAV" = "xOK" ]; then + if [ "x$FAIL" = "x" ]; then + echo "[ok] $pattern.res" + else + echo "[ok] $pattern.res - but sav/$pattern.fail remains!" + fi + ok="$ok $pattern" + elif [ "x$FAIL" = "xOK" ]; then + echo "[fail] $pattern.res" + ok="$ok $pattern" + elif [ "x$SAV" = "xNOK" ]; then + echo "[======= fail $pattern.res sav/$pattern.sav =======]" + nok="$nok $ff" + echo "$ii" >> "$ERRLIST" + elif [ "x$FAIL" = "xNOK" ]; then + echo "[======= changed $pattern.res sav/$pattern.fail ======]" + nok="$nok $ff" + echo "$ii" >> "$ERRLIST" + else + echo "[=== no sav ===] $pattern.res" + nos="$nos $pattern" + fi +} + +find_nitc() +{ + 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 + fi + echo 'Using nitc from: '$recent + NITC=$recent +} + +make_alts0() +{ + 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" +} +make_alts() +{ + 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" +} + +# The default nitc compiler +[ -z "$NITC" ] && find_nitc + +verbose=false +stop=false +while [ $stop = false ]; do + case $1 in + -o) OPT="$OPT $2"; shift; shift;; + -v) verbose=true; shift;; + -h) usage; exit;; + *) stop=true + esac +done + +# 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 - echo "usage: $0 file.nit ..." + usage; + exit fi -if [ -z "$HTM" ]; then - HTM=/dev/null -elif [ ! -f "$HTM" ]; then - echo "" > $HTM - echo "" >> $HTM - for i in "$@"; do - f=`echo $i | cut -f1 -d.` - echo -n "" >> $HTM - done - echo "" >> $HTM +# Initiate new ERRLIST +if [ "x$ERRLIST" = "x" ]; then + ERRLIST=/dev=null +else + ERRLIST=$ERRLIST.tmp + > "$ERRLIST" fi ok="" nok="" -echo "" >> $HTM + for ii in "$@"; do - for alt in "" `sed -n 's/.*#$alt[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" + if [ ! -f $ii ]; then + echo "File '$ii' does not exist." + continue fi - ff="$ff$MARK" - - echo -n "=> $i: " - - rm "$ff.res" "$ff.err" "$ff.write" 2> /dev/null - - # Compile - $NITC $OPT -o "$f.bin" "$i" -I . -I alt -I ../lib/standard 2> "$ff.cmp.err" > "$ff.compile.log" - ERR=$? - mv "$f.bin" "$ff.bin" 2> /dev/null - egrep '^[A-Z0-9_]*$' "$ff.compile.log" > "$ff.res" - echo -n "" >> $HTM - done + done done -echo "ok: " `echo $ok | wc -w` "/ $#" -echo "" >> $HTM +echo "ok: " `echo $ok | wc -w` "/" `echo $ok $nok $nos | wc -w` if [ -n "$nok" ]; then echo "fail: $nok" - echo "There were errors !" + echo "There were $(echo $nok | wc -w) errors ! (see file $ERRLIST)" +fi +if [ -n "$nos" ]; then + echo "no sav: $nos" +fi + +# write $ERRLIST +if [ "x$ERRLIST" != "x" ]; then + if [ -x "$ERRLIST_TARGET" ]; then + mv "$ERRLIST_TARGET" "${ERRLIST_TARGET}.bak" + fi + mv $ERRLIST $ERRLIST_TARGET +fi + +if [ -n "$nok" ]; then + exit 1 +else + exit 0 fi

Mode	$f" >> $HTM - if [ -r "sav/$f.sav" ]; then - echo -n " - sav" >> $HTM - fi - if [ -f "$f.inputs" ]; then - echo -n " - inputs" >> $HTM - fi - echo "	ok	fails
$MARK	compil " >> $HTM - if [ "$ERR" != 0 ]; then - echo -n "! " - echo -n "fail - " >> $HTM - cp "$ff.cmp.err" "$ff.res" + + tmp=${ii/../AA} + if [ "x$tmp" = "x$ii" ]; then + includes="-I . -I ../lib/standard -I ../lib/standard/collection -I alt" else - echo -n ". " - echo -n "ok - " >> $HTM - # Execute - if [ -f "$f.args" ]; then - args=`cat "$f.args"` - else - args="" - fi - if [ -f "$f.inputs" ]; then - "./$ff.bin" $args < "$f.inputs" > "$ff.res" 2>"$ff.err" - else - "./$ff.bin" $args > "$ff.res" 2>"$ff.err" - fi - if [ -f "$ff.write" ]; then - cat "$ff.write" >> "$ff.res" - echo -n "write - " >> $HTM + includes="-I alt" + fi + + f=`basename "$ii" .nit` + for i in `make_alts $ii`; do + ff=`basename $i .nit` + echo -n "=> $ff: " + + rm -rf "$ff.res" "$ff.err" "$ff.write" "$ff.bin" 2> /dev/null + + # Compile + if [ "x$verbose" = "xtrue" ]; then + echo "" + echo $NITC --no-color $OPT -o "$ff.bin" "$i" "$includes" fi - if [ -s "$ff.err" ]; then - cat "$ff.err" >> "$ff.res" - echo -n "err - " >> $HTM + $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" 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 $ff + elif [ -x "./$ff.bin" ]; then + 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" + fi + if [ "x$verbose" = "xtrue" ]; then + cat "$ff.res" + cat >&2 "$ff.err" + fi + if [ -f "$ff.write" ]; then + cat "$ff.write" >> "$ff.res" + elif [ -d "$ff.write" ]; then + ls -F $ff.write >> "$ff.res" + fi + if [ -s "$ff.err" ]; then + cat "$ff.err" >> "$ff.res" + fi + process_result $ff - # Result - if [ -r "sav/$ff.sav" ]; then - diff "$ff.res" "sav/$ff.sav" > "$ff.diff.log" - if [ "$?" == 0 ]; then - echo "[ok] $ff.res" - ok="$ok $ff" - echo -n "res ok" >> $HTM + if [ -f "$f.args" ]; then + fargs=$f.args + cptr=0 + while read line; do + ((cptr=cptr+1)) + args=$line + fff=$ff"_args"$cptr + 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" + fi + if [ "x$verbose" = "xtrue" ]; then + cat "$fff.res" + cat >&2 "$fff.err" + fi + if [ -f "$fff.write" ]; then + cat "$fff.write" >> "$fff.res" + elif [ -d "$fff.write" ]; then + ls -F $fff.write >> "$fff.res" + fi + if [ -s "$fff.err" ]; then + cat "$fff.err" >> "$fff.res" + fi + process_result $fff + done < $fargs + fi else - echo "[======= fail $ff.res sav/$ff.sav =======]" - nok="$nok $ff" - echo -n "res fail - diff*" >> $HTM + echo -n "! " + echo "Compilation error" > "$ff.res" + process_result $ff fi - else - echo "[=== no sav ===] $ff.res" - echo -n "res" >> $HTM - fi - echo "	" `echo $ok \| wc -w` "	" `echo $nok \| wc -w` "