Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 20:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples: fix the test suites.

Browse Source 
* examples/calc++/test, examples/mfcalc/test (me): Be more
	meaningfull: include the example name.
	(prog): Factor.
	(run): Avoid printf, use echo.
	Add missing parens.
	(cleanup): New.
	Call it on trap.
	Remove the previous "rm" that did the cleanup.
	Move into a private directory to avoid concurrency issues.
	Reported by Jim Meyering.
This commit is contained in:
Akim Demaille
2012-02-17 10:12:06 +01:00
parent dfd31acea7
commit c3a2e0e6dd
2 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
examples/calc++/test
View File

@@ -15,7 +15,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
me=`basename $0`
me=`dirname $0`
me=`basename $me`
# Number of the current test.
number=1
@@ -24,31 +25,47 @@ number=1
exit=true
# The exercised program.
prog=./examples/calc++/calc++
prog=../examples/$me/$me
# cleanup
# -------
cleanup ()
{
local status=$?
if test -z "$DEBUG"; then
cd ..
rm -rf $$.dir
fi
exit $status
}
trap cleanup 0 1 2 13 15
mkdir $$.dir
cd $$.dir
# run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
# ---------------------------------------------------------
run ()
{
# Effective and expected exit status.
# Expected exit status.
local sta_exp=$1
shift
# Expected output.
local out_exp=$1
shift
$prog "$@" - <input >out_eff
# Effective exit status.
local sta_eff=$?
# Effective output.
local out_eff=`cat out_eff`
if test $sta_eff -eq $sta_exp; then
if test "$out_eff" = "$out_exp"; then
printf "$me: PASS: %2d\n" $number
echo "$me: PASS: $number"
else
printf "$me: FAIL: %2d (expected output: %s, effective: %s\n" \
$number "$out_exp" "$out_eff"
echo "$me: FAIL: $number (expected output: $out_exp, effective: $out_eff)"
exit=false
fi
else
printf "$me: FAIL: %2d (expected status: %d, effective: %d\n" \
$number $sta_exp $sta_eff
echo "$me: FAIL: $number (expected status: $sta_exp, effective: $sta_eff)"
exit=false
fi
number=`expr $number + 1`
@@ -89,5 +106,4 @@ d := a + b * c
EOF
run 1 ''
rm input out_eff
$exit

38
examples/mfcalc/test
View File

@@ -15,7 +15,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
me=`basename $0`
me=`dirname $0`
me=`basename $me`
# Number of the current test.
number=1
@@ -24,36 +25,53 @@ number=1
exit=true
# The exercised program.
prog=./examples/mfcalc/mfcalc
prog=../examples/$me/$me
# cleanup
# -------
cleanup ()
{
local status=$?
if test -z "$DEBUG"; then
cd ..
rm -rf $$.dir
fi
exit $status
}
trap cleanup 0 1 2 13 15
mkdir $$.dir
cd $$.dir
# run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
# ---------------------------------------------------------
run ()
{
# Effective and expected exit status.
# Expected exit status.
local sta_exp=$1
shift
# Expected output.
local out_exp=$1
shift
$prog "$@" - < input >out_eff
$prog "$@" - <input >out_eff
# Effective exit status.
local sta_eff=$?
# Effective output.
local out_eff=`cat out_eff`
if test $sta_eff -eq $sta_exp; then
if test "$out_eff" = "$out_exp"; then
printf "$me: PASS: %2d\n" $number
echo "$me: PASS: $number"
else
printf "$me: FAIL: %2d (expected output: %s, effective: %s\n" \
$number "$out_exp" "$out_eff"
echo "$me: FAIL: $number (expected output: $out_exp, effective: $out_eff)"
exit=false
fi
else
printf "$me: FAIL: %2d (expected status: %d, effective: %d\n" \
$number $sta_exp $sta_eff
echo "$me: FAIL: $number (expected status: $sta_exp, effective: $sta_eff)"
exit=false
fi
number=`expr $number + 1`
}
cat >input <<EOF
1+2*3
EOF
@@ -65,6 +83,4 @@ cat >input <<EOF
EOF
run 0 9
rm input out_eff
$exit