X-Git-Url: http://nitlanguage.org diff --git a/tests/tests.sh b/tests/tests.sh index faed626..ead5484 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -29,11 +29,9 @@ unset NIT_DIR 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]} -echo $JAVA_HOME -echo $JNI_LIB_PATH +paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/libjvm.so` +paths=($paths) +JNI_LIB_PATH=`dirname ${paths[0]}` shopt -u nullglob outdir="out" @@ -47,7 +45,7 @@ Usage: $e [options] modulenames -o option Pass option to the engine -v Verbose (show tests steps) -h This help ---engine Use a specific engine (default=nitg) +--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) @@ -65,13 +63,15 @@ saferun() local o= local a= while [ $stop = false ]; do - case $1 in + case "$1" in -o) o="$2"; shift; shift;; -a) a="-a"; shift;; *) stop=true esac done - if test -n "$TIME"; then + 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 @@ -129,8 +129,8 @@ 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" + test "`cat -- "$sav"`" = "UNDEFINED" && return 1 + diff -u -- "$sav" "$outdir/$pattern.res" > "$outdir/$pattern.diff.sav.log" if [ "$?" == 0 ]; then return 1 fi @@ -146,6 +146,13 @@ function compare_to_result() fi } +function xmlesc() +{ + sed 's/&/\&/g; s//\>/g; s/"/\"/g; s/'"'"'/\'/g'<>$xml "" + echo >>$xml "" #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 @@ -225,7 +232,7 @@ function process_result() if [ -n "$SAV" ]; then if [ -n "$OLD" ]; then echo "[*ok*] $outdir/$pattern.res $SAV - but $OLD remains!" - echo >>$xml "" + echo >>$xml "" remains="$remains $OLD" else echo "[ok] $outdir/$pattern.res $SAV" @@ -234,7 +241,7 @@ function process_result() elif [ -n "$FIXME" ]; then if [ -n "$OLD" ]; then echo "[*fixme*] $outdir/$pattern.res $FIXME - but $OLD remains!" - echo >>$xml "" + echo >>$xml "" remains="$remains $OLD" else echo "[fixme] $outdir/$pattern.res $FIXME" @@ -247,41 +254,41 @@ function process_result() todos="$todos $pattern" elif [ -n "$SOSO" ]; then echo "[======= soso $outdir/$pattern.res $SOSO =======]" - echo >>$xml "" + echo >>$xml "" echo >>$xml ">$xml -n 50 + cat -v -- "$outdir/$pattern.diff.sav.log" | head >>$xml -n 50 echo >>$xml "]]>" nok="$nok $pattern" echo "$ii" >> "$ERRLIST" elif [ -n "$SOSOF" ]; then echo "[======= fixme soso $outdir/$pattern.res $SOSOF =======]" - echo >>$xml "" + echo >>$xml "" echo >>$xml ">$xml -n 50 + cat -v -- "$outdir/$pattern.diff.sav.log" | head >>$xml -n 50 echo >>$xml "]]>" nok="$nok $pattern" echo "$ii" >> "$ERRLIST" elif [ -n "$NSAV" ]; then echo "[======= fail $outdir/$pattern.res $NSAV =======]" - echo >>$xml "" + echo >>$xml "" echo >>$xml ">$xml -n 50 + cat -v -- "$outdir/$pattern.diff.sav.log" | head >>$xml -n 50 echo >>$xml "]]>" nok="$nok $pattern" echo "$ii" >> "$ERRLIST" elif [ -n "$NFIXME" ]; then echo "[======= changed $outdir/$pattern.res $NFIXME ======]" - echo >>$xml "" + echo >>$xml "" echo >>$xml ">$xml -n 50 + cat -v -- "$outdir/$pattern.diff.sav.log" | head >>$xml -n 50 echo >>$xml "]]>" nok="$nok $pattern" echo "$ii" >> "$ERRLIST" - elif [ -s $outdir/$pattern.res ]; then + elif [ -s "$outdir/$pattern.res" ]; then echo "[=== no sav ===] $outdir/$pattern.res is not empty" echo >>$xml "" echo >>$xml ">$xml $outdir/$pattern.res + cat -v >>$xml -- "$outdir/$pattern.res" echo >>$xml "]]>" nos="$nos $pattern" echo "$ii" >> "$ERRLIST" @@ -290,9 +297,9 @@ function process_result() echo "[0k] $outdir/$pattern.res is empty" ok="$ok $pattern" fi - if test -s $outdir/$pattern.cmp.err; then + if test -s "$outdir/$pattern.cmp.err"; then echo >>$xml ">$xml $outdir/$pattern.cmp.err + cat -v >>$xml -- "$outdir/$pattern.cmp.err" echo >>$xml "]]>" fi echo >>$xml "" @@ -303,12 +310,20 @@ need_skip() test "$noskip" = true && return 1 if echo "$1" | grep -f "$engine.skip" >/dev/null 2>&1; then echo "=> $2: [skip]" - echo >>$xml "" + echo >>$xml "" return 0 fi if test -n "$isinterpret" && echo "$1" | grep -f "exec.skip" >/dev/null 2>&1; then echo "=> $2: [skip exec]" - echo >>$xml "" + echo >>$xml "" + return 0 + fi + + # Skip by OS + 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 "" return 0 fi return 1 @@ -350,7 +365,7 @@ find_nitc() verbose=false isnode=false stop=false -engine=nitg +engine=nitc noskip= savdirs= while [ $stop = false ]; do @@ -369,29 +384,29 @@ done enginebinname=$engine isinterpret= case $engine in - nitg) + nitc|nitg) engine=nitg-s; - enginebinname=nitg; + enginebinname=nitc; OPT="--separate $OPT --compile-dir $compdir" savdirs="sav/nitg-common/" ;; - nitg-s) - enginebinname=nitg; + nitcs|nitg-s) + enginebinname=nitc; OPT="--separate $OPT --compile-dir $compdir" savdirs="sav/nitg-common/" ;; - nitg-e) - enginebinname=nitg; + nitce|nitg-e) + enginebinname=nitc; OPT="--erasure $OPT --compile-dir $compdir" savdirs="sav/nitg-common/" ;; - nitg-sg) - enginebinname=nitg; + nitcsg|nitg-sg) + enginebinname=nitc; OPT="--semi-global $OPT --compile-dir $compdir" savdirs="sav/nitg-common/" ;; - nitg-g) - enginebinname=nitg; + nitcg|nitg-g) + enginebinname=nitc; OPT="--global $OPT --compile-dir $compdir" savdirs="sav/nitg-common/" ;; @@ -405,10 +420,12 @@ case $engine in ;; nitvm) isinterpret=true + enginebinname=nit + OPT="--vm $OPT" savdirs="sav/niti/" ;; emscripten) - enginebinname=nitg + enginebinname=nitc OPT="-m emscripten_nodejs.nit --semi-global $OPT --compile-dir $compdir" savdirs="sav/nitg-sg/" ;; @@ -470,16 +487,16 @@ fi echo >$xml "" for ii in "$@"; do - if [ ! -f $ii ]; then + if [ ! -f "$ii" ]; then echo "File '$ii' does not exist." continue fi - f=`basename "$ii" .nit` + 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 + need_skip "$f" "$f" "$pack" && continue tmp=${ii/../AA} if [ "x$tmp" = "x$ii" ]; then @@ -488,12 +505,12 @@ for ii in "$@"; do includes="-I alt" fi - for i in "$ii" `./alterner.pl --start '#' --altsep '_' $ii`; do - bf=`basename $i .nit` + for i in "$ii" `./alterner.pl --start '#' --altsep '_' -- "$ii"`; do + bf=`basename -- "$i" .nit` ff="$outdir/$bf" # Sould we skip the alternative for this engine? - need_skip $bf $bf $pack && continue + need_skip "$bf" "$bf" "$pack" && continue echo -n "=> $bf: " @@ -512,7 +529,7 @@ for ii in "$@"; do if [ -n "$isinterpret" ]; then cat > "$ff.bin" < "$ff.cmp.err" @@ -534,8 +551,8 @@ END 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" + cat -- "$ff.compile.log" + cat >&2 -- "$ff.cmp.err" fi fi if [ "$engine" = "emscripten" ]; then @@ -543,24 +560,24 @@ END 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 "" + echo >>$xml "" continue fi fi if [ "$ERR" != 0 ]; then echo -n "! " - cat "$ff.compile.log" "$ff.cmp.err" > "$ff.res" - process_result $bf $bf $pack + 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 + process_result "$bf" "$bf" "$pack" elif [ -x "$ff.bin" ]; then if skip_exec "$bf"; then # No exec > "$ff.res" - process_result $bf $bf $pack + process_result "$bf" "$bf" "$pack" break fi echo -n ". " @@ -572,21 +589,21 @@ END 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 + 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" + cat -- "$ff.res" + cat >&2 -- "$ff.err" fi if [ -f "$ff.write" ]; then - cat "$ff.write" >> "$ff.res" + cat -- "$ff.write" >> "$ff.res" elif [ -d "$ff.write" ]; then - LANG=C /bin/ls -F $ff.write >> "$ff.res" + LANG=C /bin/ls -F "$ff.write" >> "$ff.res" fi - cp "$ff.res" "$ff.res2" - cat "$ff.cmp.err" "$ff.err" "$ff.res2" > "$ff.res" - process_result $bf $bf $pack + 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 @@ -599,13 +616,13 @@ END name="$bf args $cptr" # Sould we skip the input for this engine? - need_skip $bff " $name" $pack && continue + need_skip "$bff" " $name" "$pack" && continue # use a specific inputs file, if required if [ -f "$bff.inputs" ]; then ffinputs="$bff.inputs" else - ffinputs=$inputs + ffinputs="$inputs" fi rm -rf "$fff.res" "$fff.err" "$fff.write" 2> /dev/null @@ -618,30 +635,30 @@ END 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" + cat -- "$fff.res" + cat >&2 -- "$fff.err" fi if [ -f "$fff.write" ]; then - cat "$fff.write" >> "$fff.res" + cat -- "$fff.write" >> "$fff.res" elif [ -d "$fff.write" ]; then - LANG=C /bin/ls -F $fff.write >> "$fff.res" + LANG=C /bin/ls -F -- "$fff.write" >> "$fff.res" fi if [ -s "$fff.err" ]; then - cp "$fff.res" "$fff.res2" - cat "$fff.err" "$fff.res2" > "$fff.res" + cp -- "$fff.res" "$fff.res2" + cat -- "$fff.err" "$fff.res2" > "$fff.res" fi - process_result $bff " $name" $pack - done < $fargs + process_result "$bff" " $name" "$pack" + done < "$fargs" fi elif [ -f "$ff.bin" ]; then #Not executable (platform?)" > "$ff.res" - process_result $bf "$bf" $pack + process_result "$bf" "$bf" "$pack" else echo -n "! " - cat "$ff.cmp.err" > "$ff.res" + cat -- "$ff.cmp.err" > "$ff.res" echo "Compilation error" > "$ff.res" - process_result $bf "$bf" $pack + process_result "$bf" "$bf" "$pack" fi done done