nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/standard/ropes: Adapted == method for Ropes since the == method from Collection...
[nit.git]
/
tests
/
tests.sh
diff --git
a/tests/tests.sh
b/tests/tests.sh
index
733eb1f
..
956c0ab
100755
(executable)
--- a/
tests/tests.sh
+++ b/
tests/tests.sh
@@
-206,17
+206,25
@@
function process_result()
echo >>$xml "]]></system-out>"
nok="$nok $pattern"
echo "$ii" >> "$ERRLIST"
echo >>$xml "]]></system-out>"
nok="$nok $pattern"
echo "$ii" >> "$ERRLIST"
- else
+ elif [ -s out/$pattern.res ]; then
if [ -n "$tap" ]; then
if [ -n "$tap" ]; then
- echo "ok - $description # skip no sav"
+ echo "no ok - $description"
else
else
- echo "[=== no sav ===] out/$pattern.res"
+ echo "[=== no sav ===] out/$pattern.res is not empty"
fi
fi
- echo >>$xml "<skipped/>"
+ echo >>$xml "<error message='no sav and not empty'/>"
echo >>$xml "<system-out><![CDATA["
cat -v >>$xml out/$pattern.res
echo >>$xml "]]></system-out>"
nos="$nos $pattern"
echo >>$xml "<system-out><![CDATA["
cat -v >>$xml out/$pattern.res
echo >>$xml "]]></system-out>"
nos="$nos $pattern"
+ else
+ # no sav but empty res
+ if [ -n "$tap" ]; then
+ echo "ok - $description"
+ else
+ echo "[0k] out/$pattern.res is empty"
+ fi
+ ok="$ok $pattern"
fi
if test -s out/$pattern.cmp.err; then
echo >>$xml "<system-err><![CDATA["
fi
if test -s out/$pattern.cmp.err; then
echo >>$xml "<system-err><![CDATA["
@@
-262,6
+270,15
@@
skip_exec()
return 1
}
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))
find_nitc()
{
((tapcount=tapcount+1))
@@
-431,13
+448,18
@@
END
> "$ff.compile.log"
ERR=0
else
> "$ff.compile.log"
ERR=0
else
+ if skip_cc "$bf"; then
+ nocc="--no-cc"
+ else
+ nocc=
+ fi
# Compile
if [ "x$verbose" = "xtrue" ]; then
echo ""
# 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 JNI_LIB_PATH=$JNI_LIB_PATH JAVA_HOME=$JAVA_HOME \
fi
NIT_NO_STACK=1 JNI_LIB_PATH=$JNI_LIB_PATH JAVA_HOME=$JAVA_HOME \
- $TIMEOUT $NITC --no-color $OPT -o "$ff.bin" "$i" $includes 2> "$ff.cmp.err" > "$ff.compile.log"
+ $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"
ERR=$?
if [ "x$verbose" = "xtrue" ]; then
cat "$ff.compile.log"
@@
-452,6
+474,11
@@
END
# No exec
> "$ff.res"
process_result $bf $bf $pack
# No exec
> "$ff.res"
process_result $bf $bf $pack
+ elif [ -n "$nocc" ]; then
+ # not compiled
+ test -z "$tap" && echo -n "nocc "
+ > "$ff.res"
+ process_result $bf $bf $pack
elif [ -x "./$ff.bin" ]; then
test -z "$tap" && echo -n ". "
# Execute
elif [ -x "./$ff.bin" ]; then
test -z "$tap" && echo -n ". "
# Execute