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
+
usage()
{
e=`basename "$0"`
-o option Pass option to the engine
-v Verbose (show tests steps)
-h This help
---tap Produce TAP output
---engine Use a specific engine (default=nitc)
+--engine Use a specific engine (default=nitg)
--noskip Do not skip a test even if the .skip file matches
--[no]soso Force enable (or disable) SOSO
END
# As argument: the pattern used for the file
function process_result()
{
- ((tapcount=tapcount+1))
# Result
pattern=$1
description=$2
NSOSO=""
SOSOF=""
NSOSOF=""
+ OLD=""
+ LIST=""
+ FIRST=""
echo >>$xml "<testcase classname='$pack' name='$description'>"
- for sav in "sav/$engine/$pattern.res" "sav/$pattern.res" "sav/$pattern.sav"; do
- compare_to_result "$pattern" "$sav"
- case "$?" in
- 0)
- ;; # no file
- 1)
- SAV="$sav" ;;
- 2)
- SOSO="$sav" ;;
- 3)
- NSAV="$sav";;
- esac
- done
- for sav in "sav/$engine/fixme/$pattern.res" "sav/fixme/$pattern.res" "sav/$pattern.fail"; do
+ #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/$pattern.res
compare_to_result "$pattern" "$sav"
- case "$?" in
- 0)
- ;; # no file
- 1)
- FIXME="$sav" ;;
- 2)
+
+ case "$? $sav" in
+ 0*)
+ continue;; # no file
+ 1*/fixme/*)
+ OLD="$LIST"
+ FIXME="$sav"
+ ;;
+ 1*)
+ OLD="$LIST"
+ SAV="$sav"
+ ;;
+ 2*/fixme/*)
SOSOF="$sav" ;;
- 3)
- NFIXME="$sav";;
+ 2*)
+ SOSO="$sav" ;;
+ 3*/fixme/*)
+ if [ -z "$FIRST" ]; then
+ NFIXME="$sav"
+ FIRST="$sav"
+ fi
+ ;;
+ 3*)
+ if [ -z "$FIRST" ]; then
+ NSAV="$sav"
+ FIRST="$sav"
+ fi
+ ;;
esac
+ LIST="$LIST $sav"
done
+ OLD=`echo "$OLD" | sed -e 's/ */ /g' -e 's/^ //' -e 's/ $//'`
grep 'NOT YET IMPLEMENTED' "out/$pattern.res" >/dev/null
NYI="$?"
if [ -n "$SAV" ]; then
- if [ -n "$tap" ]; then
- echo "ok - $description"
- elif [ -z "$FIXME" ]; then
- echo "[ok] out/$pattern.res $SAV"
+ if [ -n "$OLD" ]; then
+ echo "[*ok*] out/$pattern.res $SAV - but $OLD remains!"
+ echo >>$xml "<error message='ok out/$pattern.res - but $OLD remains'/>"
+ remains="$remains $OLD"
else
- echo "[ok] out/$pattern.res $SAV - but $FIXME remains!"
+ echo "[ok] out/$pattern.res $SAV"
fi
ok="$ok $pattern"
elif [ -n "$FIXME" ]; then
- if [ -n "$tap" ]; then
- echo "not ok - $description # TODO expected failure"
+ if [ -n "$OLD" ]; then
+ echo "[*fixme*] out/$pattern.res $FIXME - but $OLD remains!"
+ echo >>$xml "<error message='ok out/$pattern.res - but $OLD remains'/>"
+ remains="$remains $OLD"
else
echo "[fixme] out/$pattern.res $FIXME"
+ echo >>$xml "<skipped/>"
fi
todos="$todos $pattern"
elif [ -n "$SOSO" ]; then
- if [ -n "$tap" ]; then
- echo "ok - $description # SOSO"
- else
- echo "[soso] out/$pattern.res $SOSO"
- fi
+ echo "[soso] out/$pattern.res $SOSO"
ok="$ok $pattern"
elif [ "x$NYI" = "x0" ]; then
- if [ -n "$tap" ]; then
- echo "not ok - $description # TODO not yet implemented"
- else
- echo "[todo] out/$pattern.res -> not yet implemented"
- fi
+ echo "[todo] out/$pattern.res -> not yet implemented"
+ echo >>$xml "<skipped/>"
todos="$todos $pattern"
elif [ -n "$SOSOF" ]; then
- if [ -n "$tap" ]; then
- echo "not ok - $description # TODO SOSO expected failure"
- else
- echo "[fixme soso] out/$pattern.res $SOSOF"
- fi
+ echo "[fixme soso] out/$pattern.res $SOSOF"
+ echo >>$xml "<skipped/>"
todos="$todos $pattern"
elif [ -n "$NSAV" ]; then
- if [ -n "$tap" ]; then
- echo "not ok - $description"
- else
- echo "[======= fail out/$pattern.res $NSAV =======]"
- fi
+ echo "[======= fail out/$pattern.res $NSAV =======]"
echo >>$xml "<error message='fail out/$pattern.res $NSAV'/>"
echo >>$xml "<system-out><![CDATA["
- head >>$xml -n 50 out/$pattern.diff.sav.log
+ cat -v out/$pattern.diff.sav.log | head >>$xml -n 50
echo >>$xml "]]></system-out>"
nok="$nok $pattern"
echo "$ii" >> "$ERRLIST"
elif [ -n "$NFIXME" ]; then
- if [ -n "$tap" ]; then
- echo "not ok - $description"
- else
- echo "[======= changed out/$pattern.res $NFIXME ======]"
- fi
+ echo "[======= changed out/$pattern.res $NFIXME ======]"
echo >>$xml "<error message='changed out/$pattern.res $NFIXME'/>"
echo >>$xml "<system-out><![CDATA["
- head >>$xml -n 50 out/$pattern.diff.sav.log
+ cat -v out/$pattern.diff.sav.log | head >>$xml -n 50
echo >>$xml "]]></system-out>"
nok="$nok $pattern"
echo "$ii" >> "$ERRLIST"
- else
- if [ -n "$tap" ]; then
- echo "ok - $description # skip no sav"
- else
- echo "[=== no sav ===] out/$pattern.res"
- fi
- echo >>$xml "<skipped/>"
+ elif [ -s out/$pattern.res ]; then
+ echo "[=== no sav ===] out/$pattern.res is not empty"
+ echo >>$xml "<error message='no sav and not empty'/>"
echo >>$xml "<system-out><![CDATA["
- cat >>$xml out/$pattern.res
+ cat -v >>$xml out/$pattern.res
echo >>$xml "]]></system-out>"
nos="$nos $pattern"
+ else
+ # no sav but empty res
+ echo "[0k] out/$pattern.res is empty"
+ ok="$ok $pattern"
fi
if test -s out/$pattern.cmp.err; then
echo >>$xml "<system-err><![CDATA["
- cat >>$xml out/$pattern.cmp.err
+ cat -v >>$xml out/$pattern.cmp.err
echo >>$xml "]]></system-err>"
fi
echo >>$xml "</testcase>"
{
test "$noskip" = true && return 1
if echo "$1" | grep -f "$engine.skip" >/dev/null 2>&1; then
- ((tapcount=tapcount+1))
- if [ -n "$tap" ]; then
- echo "ok - $2 # skip"
- else
- echo "=> $2: [skip]"
- fi
+ echo "=> $2: [skip]"
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
+ echo "=> $2: [skip exec]"
+ echo >>$xml "<testcase classname='$3' name='$2'><skipped/></testcase>"
+ return 0
+ fi
+ return 1
+}
+
+skip_exec()
+{
+ test "$noskip" = true && return 1
+ if echo "$1" | grep -f "exec.skip" >/dev/null 2>&1; then
+ echo -n "_ "
+ return 0
+ fi
+ return 1
+}
+
+skip_cc()
+{
+ test "$noskip" = true && return 1
+ if echo "$1" | grep -f "cc.skip" >/dev/null 2>&1; then
+ return 0
+ fi
return 1
}
find_nitc()
{
- ((tapcount=tapcount+1))
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
- if [ -n "$tap" ]; then
- echo "not ok - find engine $name"
- echo "Bail out! Could not find engine $name, aborting"
- else
- echo "Could not find engine $name, aborting"
- fi
+ echo "Could not find binary for engine $engine, aborting"
exit 1
fi
- if [ -n "$tap" ]; then
- echo "ok - find engine $name: $recent"
- else
- echo "Using engine $name from: $recent"
- fi
+ echo "Find binary for engine $engine: $recent $OPT"
NITC=$recent
}
verbose=false
stop=false
-tapcount=0
-engine=nitc
+engine=nitg
noskip=
while [ $stop = false ]; do
case $1 in
-o) OPT="$OPT $2"; shift; shift;;
-v) verbose=true; shift;;
-h) usage; exit;;
- --tap) tap=true; shift;;
--engine) engine="$2"; shift; shift;;
--noskip) noskip=true; shift;;
--soso) soso=true; shift;;
done
enginebinname=$engine
case $engine in
- nitc) ;;
- nitg) OPT="--global $OPT";;
- nitg-s) enginebinname=nitg; OPT="--separate $OPT";;
- nitg-e) enginebinname=nitg; OPT="--erasure $OPT";;
- nit) engine=niti ;;
- niti) enginebinname=nit ;;
+ nitg)
+ engine=nitg-s;
+ enginebinname=nitg;
+ savdirs="sav/$engine/fixme/ sav/$engine/ sav/fixme/ sav/"
+ OPT="--separate $OPT"
+ ;;
+ nitg-s)
+ enginebinname=nitg;
+ savdirs="sav/$engine/fixme/ sav/$engine/ sav/fixme/ sav/"
+ OPT="--separate $OPT"
+ ;;
+ nitg-e)
+ enginebinname=nitg;
+ savdirs="sav/$engine/fixme/ sav/$engine/ sav/fixme/ sav/"
+ OPT="--erasure $OPT"
+ ;;
+ nitg-g)
+ enginebinname=nitg;
+ savdirs="sav/$engine/fixme/ sav/$engine/ sav/fixme/ sav/"
+ OPT="--global $OPT"
+ ;;
+ nit)
+ engine=niti
+ savdirs="sav/$engine/fixme/ sav/$engine/ sav/fixme/ sav/"
+ ;;
+ niti)
+ enginebinname=nit
+ savdirs="sav/$engine/fixme/ sav/$engine/ sav/fixme/ sav/"
+ ;;
+ nitc)
+ echo "disabled engine $engine"
+ exit 0
+ ;;
+ *)
+ echo "unknown engine $engine"
+ exit 1
+ ;;
esac
# The default nitc compiler
# Sould we skip the alternative for this engine?
need_skip $bf $bf $pack && continue
- test -z "$tap" && echo -n "=> $bf: "
+ echo -n "=> $bf: "
if [ -f "$f.inputs" ]; then
inputs="$f.inputs"
> "$ff.compile.log"
ERR=0
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 "$ff.bin" "$i" "$includes"
+ echo $NITC --no-color $OPT -o "$ff.bin" "$i" "$includes" $nocc
fi
- NIT_NO_STACK=1 $TIMEOUT $NITC --no-color $OPT -o "$ff.bin" "$i" $includes 2> "$ff.cmp.err" > "$ff.compile.log"
+ NIT_NO_STACK=1 JNI_LIB_PATH=$JNI_LIB_PATH JAVA_HOME=$JAVA_HOME \
+ $TIMEOUT $NITC --no-color $OPT -o "$ff.bin" "$i" $includes $nocc 2> "$ff.cmp.err" > "$ff.compile.log"
ERR=$?
if [ "x$verbose" = "xtrue" ]; then
cat "$ff.compile.log"
fi
fi
if [ "$ERR" != 0 ]; then
- test -z "$tap" && echo -n "! "
+ 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
- test -z "$tap" && echo -n ". "
+ echo -n ". "
# Execute
args=""
if [ "x$verbose" = "xtrue" ]; then
echo ""
echo "NIT_NO_STACK=1 ./$ff.bin" $args
- fi
- NIT_NO_STACK=1 $TIMEOUT "./$ff.bin" $args < "$inputs" > "$ff.res" 2>"$ff.err"
+ fi
+ NIT_NO_STACK=1 LD_LIBRARY_PATH=$JNI_LIB_PATH \
+ $TIMEOUT "./$ff.bin" $args < "$inputs" > "$ff.res" 2>"$ff.err"
if [ "x$verbose" = "xtrue" ]; then
cat "$ff.res"
cat >&2 "$ff.err"
# 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
- test -z "$tap" && echo -n "==> $name "
+ echo -n "==> $name "
echo "./$ff.bin $args" > "./$fff.bin"
chmod +x "./$fff.bin"
- sh -c "NIT_NO_STACK=1 $TIMEOUT ./$fff.bin < $inputs > $fff.res 2>$fff.err"
+ WRITE="$fff.write" sh -c "NIT_NO_STACK=1 $TIMEOUT ./$fff.bin < $ffinputs > $fff.res 2>$fff.err"
if [ "x$verbose" = "xtrue" ]; then
cat "$fff.res"
cat >&2 "$fff.err"
process_result $bff " $name" $pack
done < $fargs
fi
+ elif [ -f "./$ff.bin" ]; then
+ echo "Not executable (platform?)" > "$ff.res"
+ process_result $bf "$bf" $pack
else
- test -z "$tap" && echo -n "! "
+ echo -n "! "
cat "$ff.cmp.err" > "$ff.res"
echo "Compilation error" > "$ff.res"
process_result $bf "$bf" $pack
done
done
-if [ -n "$tap" ]; then
- echo "1..$tapcount"
- echo "# ok:" `echo $ok | wc -w`
- echo "# not ok:" `echo $nok | wc -w`
- echo "# no sav:" `echo $nos | wc -w`
- echo "# todo/fixme:" `echo $todos | wc -w`
- exit
-fi
-
-echo "engine: $engine"
+echo "engine: $engine ($enginebinname $OPT)"
echo "ok: " `echo $ok | wc -w` "/" `echo $ok $nok $nos $todos | wc -w`
if [ -n "$nok" ]; then
if [ -n "$todos" ]; then
echo "todo/fixme: $todos"
fi
+if [ -n "$remains" ]; then
+ echo "sav that remains: $remains"
+fi
# write $ERRLIST
if [ "x$ERRLIST" != "x" ]; then
nitlanguage / nit.git / blobdiff