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"`
remains="$remains $OLD"
else
echo "[fixme] out/$pattern.res $FIXME"
+ echo >>$xml "<skipped/>"
fi
todos="$todos $pattern"
elif [ -n "$SOSO" ]; then
echo "not ok - $description # TODO not yet implemented"
else
echo "[todo] out/$pattern.res -> not yet implemented"
+ echo >>$xml "<skipped/>"
fi
todos="$todos $pattern"
elif [ -n "$SOSOF" ]; then
echo "not ok - $description # TODO SOSO expected failure"
else
echo "[fixme soso] out/$pattern.res $SOSOF"
+ echo >>$xml "<skipped/>"
fi
todos="$todos $pattern"
elif [ -n "$NSAV" ]; then
fi
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"
fi
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
+ elif [ -s out/$pattern.res ]; then
if [ -n "$tap" ]; then
- echo "ok - $description # skip no sav"
+ echo "no ok - $description"
else
- echo "[=== no sav ===] out/$pattern.res"
+ echo "[=== no sav ===] out/$pattern.res is not empty"
fi
- echo >>$xml "<skipped/>"
+ 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
+ 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["
- cat >>$xml out/$pattern.cmp.err
+ cat -v >>$xml out/$pattern.cmp.err
echo >>$xml "]]></system-err>"
fi
echo >>$xml "</testcase>"
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
+ ((tapcount=tapcount+1))
+ if [ -n "$tap" ]; then
+ echo "ok - $2 # skip"
+ else
+ echo "=> $2: [skip exec]"
+ fi
+ 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
}
> "$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"
test -z "$tap" && 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
+ test -z "$tap" && echo -n "nocc "
+ > "$ff.res"
+ process_result $bf $bf $pack
elif [ -x "./$ff.bin" ]; then
test -z "$tap" && echo -n ". "
# Execute
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 ""
test -z "$tap" && 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 "! "
cat "$ff.cmp.err" > "$ff.res"