From 1fb391cc620bc296ee900ef2cebf23833ec1b381 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sun, 7 Mar 2021 02:31:20 +0000 Subject: dvipos: tewak a test git-svn-id: svn://tug.org/texlive/trunk@58189 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipos/ChangeLog | 5 +++++ Build/source/texk/dvipos/Makefile.am | 2 +- Build/source/texk/dvipos/Makefile.in | 2 +- Build/source/texk/dvipos/dvipos.test | 8 +++----- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog index 7e7cc3f3700..18e6e71058f 100644 --- a/Build/source/texk/dvipos/ChangeLog +++ b/Build/source/texk/dvipos/ChangeLog @@ -1,3 +1,8 @@ +2021-03-07 TANAKA Takuji + + * dvipos.test, Makefile.am: + Tweak a test. + 2021-02-07 TANAKA Takuji * dvipos.c: diff --git a/Build/source/texk/dvipos/Makefile.am b/Build/source/texk/dvipos/Makefile.am index 0ad1018f2e2..b33e9a4a18a 100644 --- a/Build/source/texk/dvipos/Makefile.am +++ b/Build/source/texk/dvipos/Makefile.am @@ -37,5 +37,5 @@ EXTRA_DIST += $(TESTS) ## dvipos.test EXTRA_DIST += tests/play.dvi tests/play.loc tests/play.pos tests/ptmr.tfm -DISTCLEANFILES = play.dvi play.loc play.pos +DISTCLEANFILES = play.dvi play.loc play*.pos diff --git a/Build/source/texk/dvipos/Makefile.in b/Build/source/texk/dvipos/Makefile.in index 7f10a573f88..b411a6f4467 100644 --- a/Build/source/texk/dvipos/Makefile.in +++ b/Build/source/texk/dvipos/Makefile.in @@ -563,7 +563,7 @@ dist_man1_MANS = dvipos.1 EXTRA_DIST = miktex.mak $(TESTS) tests/play.dvi tests/play.loc \ tests/play.pos tests/ptmr.tfm TESTS = dvipos.test -DISTCLEANFILES = play.dvi play.loc play.pos +DISTCLEANFILES = play.dvi play.loc play*.pos all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/dvipos/dvipos.test b/Build/source/texk/dvipos/dvipos.test index 16036f14c68..d2e17f0cf56 100755 --- a/Build/source/texk/dvipos/dvipos.test +++ b/Build/source/texk/dvipos/dvipos.test @@ -13,9 +13,7 @@ cp $srcdir/tests/play.dvi . ./dvipos -b -o play.loc play.dvi || exit 1 diff play.loc $srcdir/tests/play.loc || exit 2 -if diff --ignore-matching-lines="Processing_data_and_time" play.pos play.pos; then - diff --ignore-matching-lines="Processing_data_and_time" play.pos $srcdir/tests/play.pos || exit 3 -else - echo Do not check difference of "play.pos" -fi +grep -v 'Processing_data_and_time' $srcdir/tests/play.pos > play_0.pos \ + && grep -v 'Processing_data_and_time' play.pos > play_1.pos \ + && diff play_0.pos play_1.pos || exit 3 -- cgit v1.2.3