examples: check the errors

* examples/test (run): Check stderr, unless -noerr is passed.
* examples/calc++/calc++.test, examples/mfcalc/mfcalc.test: Check
errors.
This commit is contained in:
Akim Demaille
2018-10-26 07:36:51 +02:00
parent 18743948b5
commit f3110c9b9a
3 changed files with 25 additions and 11 deletions

View File

@@ -25,7 +25,7 @@ number=1
exit=true
# top_builddir.
cwd=`pwd`
cwd=$(pwd)
# The exercised program.
for p in "$cwd/examples/$medir/$me" "$cwd/examples/$me"
@@ -56,10 +56,16 @@ trap cleanup 0 1 2 13 15
mkdir $$.dir
cd $$.dir
# run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
# ---------------------------------------------------------
# run [-noerr] EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
# ------------------------------------------------------------------
# -noerr: ignore stderr, otherwise merge it into effective output.
run ()
{
local noerr=false
case $1 in
(-noerr) noerr=true; shift;;
esac
# Expected exit status.
local sta_exp="$1"
shift
@@ -68,9 +74,9 @@ run ()
shift
# Effective exit status.
local sta_eff=0
$prog "$@" - <input >out_eff || sta_eff=$?
# Effective output.
local out_eff="`cat out_eff`"
$prog "$@" - <input >out_eff 2>err_eff || sta_eff=$?
# Combine effective output and error streams.
local out_eff="$(cat out_eff && $noerr || sed -e 's/^/err: /g' err_eff)"
if test $sta_eff -eq $sta_exp; then
if test "$out_eff" = "$out_exp"; then
echo "$me: PASS: $number"
@@ -82,7 +88,7 @@ run ()
echo "$me: FAIL: $number (expected status: $sta_exp, effective: $sta_eff)"
exit=false
fi
number=`expr $number + 1`
number=$(expr $number + 1)
}
# We have cd'd one level deeper.