texlive[57697] Build/source/texk/dvipsk: test afm2tfm -p, redo test
commits+karl at tug.org
commits+karl at tug.org
Wed Feb 10 03:02:05 CET 2021
Revision: 57697
http://tug.org/svn/texlive?view=revision&revision=57697
Author: karl
Date: 2021-02-10 03:02:05 +0100 (Wed, 10 Feb 2021)
Log Message:
-----------
test afm2tfm -p, redo test as shell script
Modified Paths:
--------------
trunk/Build/source/texk/dvipsk/ChangeLog
trunk/Build/source/texk/dvipsk/Makefile.am
trunk/Build/source/texk/dvipsk/Makefile.in
trunk/Build/source/texk/dvipsk/test-missing-image.test
Added Paths:
-----------
trunk/Build/source/texk/dvipsk/test-afm2tfm.test
Removed Paths:
-------------
trunk/Build/source/texk/dvipsk/afm2tfm-test.pl
Modified: trunk/Build/source/texk/dvipsk/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipsk/ChangeLog 2021-02-10 00:54:19 UTC (rev 57696)
+++ trunk/Build/source/texk/dvipsk/ChangeLog 2021-02-10 02:02:05 UTC (rev 57697)
@@ -1,3 +1,9 @@
+2021-02-09 Karl Berry <karl at freefriends.org>
+
+ * test-afm2tfm.test: rewrite as shell script.
+ * afm2tfm-test.pl: remove.
+ * Makefile.am (TESTS, etc.): adapt accordingly.
+
2021-02-08 Karl Berry <karl at freefriends.org>
* configure.ac (AC_INIT): TeX Live not TeXLive.
Modified: trunk/Build/source/texk/dvipsk/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvipsk/Makefile.am 2021-02-10 00:54:19 UTC (rev 57696)
+++ trunk/Build/source/texk/dvipsk/Makefile.am 2021-02-10 02:02:05 UTC (rev 57697)
@@ -111,10 +111,10 @@
CLEANFILES = $(prologues) texc.lpro
-## dvips tests
+## dvips/afm2tfm tests
TEST_EXTENSIONS = .pl .test
-TESTS = afm2tfm-test.pl
-afm2tfm-test.log: afm2tfm$(EXEEXT)
+TESTS = test-afm2tfm.test
+test-afm2tfm-test.log: afm2tfm$(EXEEXT)
TESTS += beginfontk1.test eepic-nan.test pfbincl.test \
quotecmd-test.pl same-name.test test-dvips.test \
test-missing-image.test test-overflow-buffers.test uptex-vf.test
@@ -158,8 +158,6 @@
testdata/texc.pro \
testdata/texps.pro
-## afm2tfm-test.pl
-DISTCLEANFILES += afmtest.tfm
## beginfontk1.test
EXTRA_DIST += testdata/beginfontk1.dvi testdata/beginfontk1.eps testdata/beginfontk1.tex
DISTCLEANFILES += beginfontk1.ps
@@ -174,13 +172,15 @@
DISTCLEANFILES += *badnews*
## same-name.test
DISTCLEANFILES += same-name.out
-## test-dvips
+## test-afm2tfm.test
+DISTCLEANFILES += afmtest.tfm
+## test-dvips.test
EXTRA_DIST += testdata/dvipstst.tex testdata/dvipstst.xdv testdata/dvipstst.xps
DISTCLEANFILES += dvipstst.ps missfont.log mtest.ps
-## test-missing-image
+## test-missing-image.test
EXTRA_DIST += testdata/missing-image.tex testdata/missing-image.dvi
DISTCLEANFILES += missing-image.ps
-## test-overflow-buffers
+## test-overflow-buffers.test
EXTRA_DIST += overflow-color-push.dvi overflow-color-push.tex \
overflow-epsfile.dvi overflow-epsfile.tex \
overflow-psbox.dvi overflow-psbox.tex
Modified: trunk/Build/source/texk/dvipsk/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvipsk/Makefile.in 2021-02-10 00:54:19 UTC (rev 57696)
+++ trunk/Build/source/texk/dvipsk/Makefile.in 2021-02-10 02:02:05 UTC (rev 57697)
@@ -719,9 +719,9 @@
dist_man1_MANS = afm2tfm.1 dvips.1
info_TEXINFOS = dvips.texi
dvips_TEXINFOS = contrib/config.proto dvips.help
-DISTCLEANFILES = $(DVIS) $(PSS) afmtest.tfm beginfontk1.ps \
- eepic-nan.ps pfbincl.ps *badnews* same-name.out dvipstst.ps \
- missfont.log mtest.ps missing-image.ps overflow-color-push.ps \
+DISTCLEANFILES = $(DVIS) $(PSS) beginfontk1.ps eepic-nan.ps pfbincl.ps \
+ *badnews* same-name.out afmtest.tfm dvipstst.ps missfont.log \
+ mtest.ps missing-image.ps overflow-color-push.ps \
overflow-epsfile.ps overflow-psbox.ps upjf.vf upjf_full.ps \
upjf_omit.ps
enc_DATA = dvips-all.enc
@@ -771,7 +771,7 @@
vmcms vms
CLEANFILES = $(prologues) texc.lpro
TEST_EXTENSIONS = .pl .test
-TESTS = afm2tfm-test.pl beginfontk1.test eepic-nan.test pfbincl.test \
+TESTS = test-afm2tfm.test beginfontk1.test eepic-nan.test pfbincl.test \
quotecmd-test.pl same-name.test test-dvips.test \
test-missing-image.test test-overflow-buffers.test \
uptex-vf.test
@@ -2004,7 +2004,7 @@
squeeze/stamp-squeeze:
cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze
-afm2tfm-test.log: afm2tfm$(EXEEXT)
+test-afm2tfm-test.log: afm2tfm$(EXEEXT)
beginfontk1.log eepic-nan.log pfbincl.log \
quotecmd-test.log same-name.log test-dvips.log \
test-overflow-buffers.log: dvips$(EXEEXT)
Deleted: trunk/Build/source/texk/dvipsk/afm2tfm-test.pl
===================================================================
--- trunk/Build/source/texk/dvipsk/afm2tfm-test.pl 2021-02-10 00:54:19 UTC (rev 57696)
+++ trunk/Build/source/texk/dvipsk/afm2tfm-test.pl 2021-02-10 02:02:05 UTC (rev 57697)
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-# $Id$
-# Public domain. Originally written 2010, Karl Berry.
-# Check that afm2tfm functions at all.
-
-BEGIN { chomp ($srcdir = $ENV{"srcdir"} || `dirname $0`); }
-require "$srcdir/../tests/common-test.pl";
-
-exit (&main ());
-
-sub main
-{
- my $outfile = "afmtest.tfm";
- my @args = ("afmtest.afm", $outfile); # should be found via kpse
- my $ret = &test_run ("./afm2tfm", @args);
-
- my $bad = ! -f $outfile; # tfm should have been created
- return $bad;
-}
Added: trunk/Build/source/texk/dvipsk/test-afm2tfm.test
===================================================================
--- trunk/Build/source/texk/dvipsk/test-afm2tfm.test (rev 0)
+++ trunk/Build/source/texk/dvipsk/test-afm2tfm.test 2021-02-10 02:02:05 UTC (rev 57697)
@@ -0,0 +1,40 @@
+#! /bin/sh -vx
+# $Id: test-dvips.test 45809 2017-11-15 00:36:56Z karl $
+# Public domain. Originally written 2010, Karl Berry.
+# Check that afm2tfm functions.
+#
+# BTW, to run just this test on its own:
+# make -C $wp TESTS=test-afm2tfm.test check
+# where wp=.../Work/texk/dvipsk
+
+test_file=afmtest.afm
+test_dir=$srcdir/../tests/texmf
+test_input=$test_dir/$test_file
+if test ! -r "$test_input"; then # probably srcdir messed up
+ echo "$0: goodbye, cannot find test input: $test_input" >&2
+ exit 1
+fi
+
+AFMFONTS=$test_dir; export AFMFONTS
+
+# run afm2tfm, assumed on $test_file so we can check the output.
+do_check () {
+ if "$@"; then :; else
+ echo "$0: "$@" "$test_file" failed, goodbye." >&2
+ exit 1
+ fi
+
+ tfm=`basename "$test_file" .afm`.tfm
+ if test ! -s "$tfm"; then
+ echo "$0: tfm empty or not created, goodbye." >&2
+ ls -l "$tfm" >&2
+ exit 1
+ fi
+
+ # could run tftopl, but let's not assume it.
+}
+
+do_check ./afm2tfm "$test_file"
+do_check ./afm2tfm "$test_file" -p $srcdir/testdata/8r.enc # options after
+
+exit 0
Property changes on: trunk/Build/source/texk/dvipsk/test-afm2tfm.test
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: trunk/Build/source/texk/dvipsk/test-missing-image.test
===================================================================
--- trunk/Build/source/texk/dvipsk/test-missing-image.test 2021-02-10 00:54:19 UTC (rev 57696)
+++ trunk/Build/source/texk/dvipsk/test-missing-image.test 2021-02-10 02:02:05 UTC (rev 57697)
@@ -3,7 +3,7 @@
# Public domain. Test that dvips exits with bad status when there is a
# missing image file.
#
-# BTW, to just run this test on its own:
+# BTW, to run just this test on its own:
# make -C $wp TESTS=test-missing-image.test check
# where wp=.../Work/texk/dvipsk
More information about the tex-live-commits
mailing list.