From 39e57fffe3040b97f7083b85656052bed5074ce1 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 4 Nov 2011 11:18:24 +0000 Subject: Update psutils and t1utils test scripts: perform all sub-tests and report failed ones git-svn-id: svn://tug.org/texlive/trunk@24488 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/psutils/ChangeLog | 4 ++++ Build/source/utils/psutils/psutils.test | 42 +++++++++++++++------------------ Build/source/utils/t1utils/ChangeLog | 4 ++++ Build/source/utils/t1utils/t1utils.test | 17 ++++++++----- 4 files changed, 38 insertions(+), 29 deletions(-) (limited to 'Build/source/utils') diff --git a/Build/source/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog index 6ec46eab7b1..7a3c8bd79af 100644 --- a/Build/source/utils/psutils/ChangeLog +++ b/Build/source/utils/psutils/ChangeLog @@ -1,3 +1,7 @@ +2011-11-04 Peter Breitenlohner + + * psutils.test: Perform all sub-tests and report failed ones. + 2011-09-25 Peter Breitenlohner * psutils.test: New shell script for tests. diff --git a/Build/source/utils/psutils/psutils.test b/Build/source/utils/psutils/psutils.test index a54d9f9434b..636f85273af 100755 --- a/Build/source/utils/psutils/psutils.test +++ b/Build/source/utils/psutils/psutils.test @@ -3,54 +3,50 @@ # Copyright (C) 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. +failed= + rm -rf play* ./psselect 5:15 $srcdir/tests/play.ps playsel.ps \ 2>playsel.2 \ && diff playsel.2 $srcdir/tests/playsel.2 \ - || exit 1 - -echo psselect tests OK + && echo "psselect tests OK" \ + || failed="$failed psselect" ./psbook -s4 playsel.ps playbook.ps \ 2>playbook.2 \ && diff playbook.2 $srcdir/tests/playbook.2 \ - || exit 1 - -echo psbook tests OK + && echo "psbook tests OK" \ + || failed="$failed psbook" ./psresize -Pa4 -pa5 playsel.ps playres.ps \ 2>playres.2 \ && diff playres.2 $srcdir/tests/playres.2 \ - || exit 1 - -echo psresize tests OK + && echo "psresize tests OK" \ + || failed="$failed psresize" ./psnup -2 playsel.ps playnup.ps \ 2>playnup.2 \ && diff playnup.2 $srcdir/tests/playnup.2 \ - || exit 1 - -echo psnup tests OK + && echo "psnup tests OK" \ + || failed="$failed psnup" ./pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' playsel.ps playps.ps \ 2>playps.2 \ && diff playps.2 $srcdir/tests/playps.2 \ - || exit 1 - -echo pstops tests OK + && echo "pstops tests OK" \ + || failed="$failed pstops" rm -rf plot* ./epsffit -c 0 0 600 368 $srcdir/tests/plot.eps ploth.eps \ && diff ploth.eps $srcdir/tests/ploth.eps \ - || exit 1 - -./epsffit -c 0 0 500 400 $srcdir/tests/plot.eps plotv.eps \ + && ./epsffit -c 0 0 500 400 $srcdir/tests/plot.eps plotv.eps \ && diff plotv.eps $srcdir/tests/plotv.eps \ - || exit 1 - -./epsffit -m 0 0 368 500 $srcdir/tests/plot.eps plotm.eps \ + && ./epsffit -m 0 0 368 500 $srcdir/tests/plot.eps plotm.eps \ && diff plotm.eps $srcdir/tests/plotm.eps \ - || exit 1 + && echo "epsffit tests OK" \ + || failed="$failed epsffit" -echo epsffit tests OK +test -z "$failed" && exit 0 +echo "failed tests:$failed" +exit 1 diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog index 97e71f171cc..d1f6d7843b8 100644 --- a/Build/source/utils/t1utils/ChangeLog +++ b/Build/source/utils/t1utils/ChangeLog @@ -1,3 +1,7 @@ +2011-11-04 Peter Breitenlohner + + * t1utils.test: Perform all sub-tests and report failed ones. + 2011-09-25 Peter Breitenlohner * t1utils.test: New shell script for tests. diff --git a/Build/source/utils/t1utils/t1utils.test b/Build/source/utils/t1utils/t1utils.test index 23de351dad4..99dd99635b6 100755 --- a/Build/source/utils/t1utils/t1utils.test +++ b/Build/source/utils/t1utils/t1utils.test @@ -3,20 +3,22 @@ # Copyright (C) 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. +failed= + rm -rf Symbol.* ./t1binary $srcdir/tests/Symbol.pfa Symbol.pfb \ && ./t1ascii Symbol.pfb Symbol.pfa \ && diff Symbol.pfa $srcdir/tests/Symbol.pfa \ - || exit 1 - -echo t1ascii and t1binary test OK + && echo "t1ascii/t1binary tests OK" \ + || failed="$failed t1ascii/t1binary" rm -rf Symbol.* ./t1disasm $srcdir/tests/Symbol.pfa Symbol.raw \ && ./t1asm -a Symbol.raw Symbol.pfa \ && diff Symbol.raw $srcdir/tests/Symbol.raw \ && diff Symbol.pfa $srcdir/tests/Symbol.pfa \ - || exit 1 + && echo "t1asm/t1disasm-ascii tests OK" \ + || failed="$failed t1asm/t1disasm-ascii" rm -rf Symbol.* ./t1disasm $srcdir/tests/Symbol.pfb Symbol.raw \ @@ -24,7 +26,10 @@ rm -rf Symbol.* && ./t1ascii Symbol.pfb Symbol.pfa \ && diff Symbol.raw $srcdir/tests/Symbol.raw \ && diff Symbol.pfa $srcdir/tests/Symbol.pfa \ - || exit 1 + && echo "t1asm/t1disasm-binary tests OK" \ + || failed="$failed t1asm/t1disasm-binary" -echo t1asm and t1disasm test OK +test -z "$failed" && exit 0 +echo "failed tests:$failed" +exit 1 -- cgit v1.2.3