From 485246e6f59ed4ae22aec163a5a4970bd6fbbf5d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 19 Feb 2021 16:45:39 +0000 Subject: eliminate changing version number from comparison git-svn-id: svn://tug.org/texlive/trunk@57800 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvidvi/ChangeLog | 6 ++++++ Build/source/texk/dvidvi/dvidvi.test | 21 ++++++++++++--------- Build/source/texk/dvidvi/tests/playout.2 | 1 - Build/source/texk/dvidvi/tests/playout.3 | 1 - 4 files changed, 18 insertions(+), 11 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/dvidvi/ChangeLog b/Build/source/texk/dvidvi/ChangeLog index 94e4ebdc0bc..59f4f4ac786 100644 --- a/Build/source/texk/dvidvi/ChangeLog +++ b/Build/source/texk/dvidvi/ChangeLog @@ -1,3 +1,9 @@ +2021-02-19 Karl Berry + + * dvidvi.test, + * tests/playout.2, + * tests/playout.3: eliminate version number from comparison. + 2020-12-09 Akira Kakuto * dvidvi.c: Remove definition of a function win32_fprintf() diff --git a/Build/source/texk/dvidvi/dvidvi.test b/Build/source/texk/dvidvi/dvidvi.test index fe43da58d55..22aafae5753 100755 --- a/Build/source/texk/dvidvi/dvidvi.test +++ b/Build/source/texk/dvidvi/dvidvi.test @@ -1,20 +1,23 @@ #! /bin/sh -vx # $Id$ -# Copyright 2017 Karl Berry +# Copyright 2017-2021 Karl Berry # Copyright 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. rm -rf play* cp $srcdir/tests/play.dvi . -./dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' play playout \ - 2>playout.2 \ - && diff playout.2 $srcdir/tests/playout.2 \ - || exit 1 +./dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' play playout 2>playout.2 +# +# Eliminate version number for the comparison. +grep -v '^This is dvidvi' playout.2 \ +| diff - $srcdir/tests/playout.2 \ +|| exit 1 rm -rf play* cp $srcdir/tests/playtate.dvi . -./dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' playtate playout \ - 2>playout.3 \ - && diff playout.3 $srcdir/tests/playout.3 \ - || exit 1 +./dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' playtate playout 2>playout.3 +# +grep -v '^This is dvidvi' playout.3 \ +| diff - $srcdir/tests/playout.3 \ +|| exit 1 diff --git a/Build/source/texk/dvidvi/tests/playout.2 b/Build/source/texk/dvidvi/tests/playout.2 index 19d1c7886cb..f944dc3f3ca 100644 --- a/Build/source/texk/dvidvi/tests/playout.2 +++ b/Build/source/texk/dvidvi/tests/playout.2 @@ -1,5 +1,4 @@ -This is dvidvi 1.1 (TeX Live 2021), Copyright 1988-1991 Radical Eye Software Improved from 1.0 to 1.1, 1994, Markus Kohm play.dvi -> playout.dvi [5] [12] [9] [8] [13] diff --git a/Build/source/texk/dvidvi/tests/playout.3 b/Build/source/texk/dvidvi/tests/playout.3 index 4d26a991230..17718ff12dc 100644 --- a/Build/source/texk/dvidvi/tests/playout.3 +++ b/Build/source/texk/dvidvi/tests/playout.3 @@ -1,5 +1,4 @@ -This is dvidvi 1.1 (TeX Live 2021), Copyright 1988-1991 Radical Eye Software Improved from 1.0 to 1.1, 1994, Markus Kohm playtate.dvi -> playout.dvi [5] [12] [9] [8] [13] -- cgit v1.2.3