From 9282f5f8a619b9de16344136016956414e9f1afc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 29 Jun 1998 20:32:36 +0000 Subject: [PATCH] . --- tests/pr/Makefile.am | 4 ++-- tests/pr/Makefile.in | 4 ++-- tests/pr/pr-tests | 36 +++++++++++++++++++++++++++++++++++- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am index 54f5018..e520480 100644 --- a/tests/pr/Makefile.am +++ b/tests/pr/Makefile.am @@ -21,7 +21,7 @@ tFFt-bl tFFt-lm tFnFt ta3-0FF ta3-FF tb3-0FF tb3-FF tn tt-0FF tt-FF tt-bl \ tt-t tta3-0FF tta3-FF ttb3-0FF ttb3-FF w20l17f-lm w25l17f-lm w26l17f-lm \ w35a3l17f-lm w35b3l17f-lm w35ja3l17f-lm w35jb3l17f-lm w35jml17f-lmlo \ w35ml17f-lm-lo w48l17f-lm w72j-0FF -maint_gen = margin-0.I margin-0.X +maint_gen = margin-0.I margin-0.X dbl-sp-a.I dbl-sp-a.X dbl-sp-b.I dbl-sp-b.X run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \ 1g.E 1h.O 1h.E 1i.O 1i.E 1j.O 1j.E 1k.O 1k.E 1l.O 1l.E 2a.O 2a.E 2b.O 2b.E \ 2c.O 2c.E 2d.O 2d.E 2e.O 2e.E 2f.O 2f.E 2g.O 2g.E 2h.O 2h.E 2i.O 2i.E 2j.O \ @@ -56,7 +56,7 @@ run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \ 10bd.E 11a.O 11a.E 11b.O 11b.E 11e.O 11e.E 11f.O 11f.E 11g.O 11g.E 11h.O \ 11h.E 12aa.O 12aa.E 12ab.O 12ab.E 12ac.O 12ac.E 12ba.O 12ba.E 12bb.O 12bb.E \ 12bc.O 12bc.E 12ma.O 12ma.E 12mb.O 12mb.E 12mc.O 12mc.E 12md.O 12md.E \ -margin-0.O margin-0.E +margin-0.O margin-0.E dbl-sp-a.O dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E ##test-files-end EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in index 774cdbb..4bcbea9 100644 --- a/tests/pr/Makefile.in +++ b/tests/pr/Makefile.in @@ -107,7 +107,7 @@ tFFt-bl tFFt-lm tFnFt ta3-0FF ta3-FF tb3-0FF tb3-FF tn tt-0FF tt-FF tt-bl \ tt-t tta3-0FF tta3-FF ttb3-0FF ttb3-FF w20l17f-lm w25l17f-lm w26l17f-lm \ w35a3l17f-lm w35b3l17f-lm w35ja3l17f-lm w35jb3l17f-lm w35jml17f-lmlo \ w35ml17f-lm-lo w48l17f-lm w72j-0FF -maint_gen = margin-0.I margin-0.X +maint_gen = margin-0.I margin-0.X dbl-sp-a.I dbl-sp-a.X dbl-sp-b.I dbl-sp-b.X run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \ 1g.E 1h.O 1h.E 1i.O 1i.E 1j.O 1j.E 1k.O 1k.E 1l.O 1l.E 2a.O 2a.E 2b.O 2b.E \ 2c.O 2c.E 2d.O 2d.E 2e.O 2e.E 2f.O 2f.E 2g.O 2g.E 2h.O 2h.E 2i.O 2i.E 2j.O \ @@ -142,7 +142,7 @@ run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \ 10bd.E 11a.O 11a.E 11b.O 11b.E 11e.O 11e.E 11f.O 11f.E 11g.O 11g.E 11h.O \ 11h.E 12aa.O 12aa.E 12ab.O 12ab.E 12ac.O 12ac.E 12ba.O 12ba.E 12bb.O 12bb.E \ 12bc.O 12bc.E 12ma.O 12ma.E 12mb.O 12mb.E 12mc.O 12mc.E 12md.O 12md.E \ -margin-0.O margin-0.E +margin-0.O margin-0.E dbl-sp-a.O dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests index 5100534..91f0d22 100755 --- a/tests/pr/pr-tests +++ b/tests/pr/pr-tests @@ -3707,8 +3707,42 @@ else esac fi test -s margin-0.E || rm -f margin-0.E +$xx --test -h x -d -l 14 -h "" $srcdir/dbl-sp-a.I > dbl-sp-a.O 2> dbl-sp-a.E +code=$? +if test $code != 0 ; then + $echo "Test dbl-sp-a failed: ../../src/pr return code $code differs from expected value 0" 1>&2 + errors=`expr $errors + 1` +else + cmp dbl-sp-a.O $srcdir/dbl-sp-a.X > /dev/null 2>&1 + case $? in + 0) if test "$VERBOSE" ; then $echo "passed dbl-sp-a"; fi ;; + 1) $echo "Test dbl-sp-a failed: files dbl-sp-a.O and $srcdir/dbl-sp-a.X differ" 1>&2; + errors=`expr $errors + 1` ;; + 2) $echo "Test dbl-sp-a may have failed." 1>&2; + $echo The command "cmp dbl-sp-a.O $srcdir/dbl-sp-a.X" failed. 1>&2 ; + errors=`expr $errors + 1` ;; + esac +fi +test -s dbl-sp-a.E || rm -f dbl-sp-a.E +$xx --test -h x -d -t $srcdir/dbl-sp-b.I > dbl-sp-b.O 2> dbl-sp-b.E +code=$? +if test $code != 0 ; then + $echo "Test dbl-sp-b failed: ../../src/pr return code $code differs from expected value 0" 1>&2 + errors=`expr $errors + 1` +else + cmp dbl-sp-b.O $srcdir/dbl-sp-b.X > /dev/null 2>&1 + case $? in + 0) if test "$VERBOSE" ; then $echo "passed dbl-sp-b"; fi ;; + 1) $echo "Test dbl-sp-b failed: files dbl-sp-b.O and $srcdir/dbl-sp-b.X differ" 1>&2; + errors=`expr $errors + 1` ;; + 2) $echo "Test dbl-sp-b may have failed." 1>&2; + $echo The command "cmp dbl-sp-b.O $srcdir/dbl-sp-b.X" failed. 1>&2 ; + errors=`expr $errors + 1` ;; + esac +fi +test -s dbl-sp-b.E || rm -f dbl-sp-b.E if test $errors = 0 ; then - $echo Passed all 217 tests. 1>&2 + $echo Passed all 219 tests. 1>&2 else $echo Failed $errors tests. 1>&2 fi -- 2.7.4