From c152ce30a8f230e9761f17c4737c98822686a644 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 29 Sep 2011 12:02:05 +0000 Subject: reorganize the test data git-svn-id: svn://tug.org/texlive/trunk@24125 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/afm2pl/ChangeLog | 6 +++ Build/source/texk/afm2pl/Makefile.am | 19 ++++++---- Build/source/texk/afm2pl/Makefile.in | 8 ++-- Build/source/texk/afm2pl/afm2pl.test | 14 +++---- Build/source/texk/afm2pl/logo10.afm | 44 --------------------- Build/source/texk/afm2pl/tests/logo10.afm | 44 +++++++++++++++++++++ Build/source/texk/afm2pl/tests/logo10.map | 1 + Build/source/texk/afm2pl/tests/logo10.pl | 63 +++++++++++++++++++++++++++++++ Build/source/texk/afm2pl/xlogo10.map | 1 - Build/source/texk/afm2pl/xlogo10.pl | 63 ------------------------------- 10 files changed, 134 insertions(+), 129 deletions(-) delete mode 100644 Build/source/texk/afm2pl/logo10.afm create mode 100644 Build/source/texk/afm2pl/tests/logo10.afm create mode 100644 Build/source/texk/afm2pl/tests/logo10.map create mode 100644 Build/source/texk/afm2pl/tests/logo10.pl delete mode 100644 Build/source/texk/afm2pl/xlogo10.map delete mode 100644 Build/source/texk/afm2pl/xlogo10.pl diff --git a/Build/source/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog index dde61398f94..7502fff7de0 100644 --- a/Build/source/texk/afm2pl/ChangeLog +++ b/Build/source/texk/afm2pl/ChangeLog @@ -1,3 +1,9 @@ +2011-09-27 Peter Breitenlohner + + * logo10.afm, xlogo10.{pl,map} (removed): Moved from here ... + * tests/logo10.{afm,pl,mps} (new): ... to here. + * afm2pl.test: Test input and expected output now in tests/. + 2011-06-16 Peter Breitenlohner * afm2pl.c (find_suffix, !KPATHSEA): Declare result as const. diff --git a/Build/source/texk/afm2pl/Makefile.am b/Build/source/texk/afm2pl/Makefile.am index ab3e45ec256..93e246a0249 100644 --- a/Build/source/texk/afm2pl/Makefile.am +++ b/Build/source/texk/afm2pl/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/afm2pl/ ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009, 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -27,14 +27,17 @@ LDADD = $(KPATHSEA_LIBS) dist_man1_MANS = afm2pl.1 -TESTS = afm2pl.test - -EXTRA_DIST = afm2pl.test logo10.afm xlogo10.map xlogo10.pl - -CLEANFILES = logo10.map logo10.pl - ## Not used ## -EXTRA_DIST += \ +EXTRA_DIST = \ afm2pl.xml README.DOCS +## Tests +## +TESTS = afm2pl.test +EXTRA_DIST += $(TESTS) + +## afm2pl.test +EXTRA_DIST += tests/logo10.afm tests/logo10.map tests/logo10.pl +DISTCLEANFILES += logo10.* + diff --git a/Build/source/texk/afm2pl/Makefile.in b/Build/source/texk/afm2pl/Makefile.in index 321602a0930..ff116db4905 100644 --- a/Build/source/texk/afm2pl/Makefile.in +++ b/Build/source/texk/afm2pl/Makefile.in @@ -251,13 +251,12 @@ ACLOCAL_AMFLAGS = -I ../../m4 INCLUDES = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) afm2pl_SOURCES = afm2pl.c -DISTCLEANFILES = config.force +DISTCLEANFILES = config.force logo10.* LDADD = $(KPATHSEA_LIBS) dist_man1_MANS = afm2pl.1 +EXTRA_DIST = afm2pl.xml README.DOCS $(TESTS) tests/logo10.afm \ + tests/logo10.map tests/logo10.pl TESTS = afm2pl.test -EXTRA_DIST = afm2pl.test logo10.afm xlogo10.map xlogo10.pl afm2pl.xml \ - README.DOCS -CLEANFILES = logo10.map logo10.pl all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -762,7 +761,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) diff --git a/Build/source/texk/afm2pl/afm2pl.test b/Build/source/texk/afm2pl/afm2pl.test index c0a76ad1852..9453c85baf2 100755 --- a/Build/source/texk/afm2pl/afm2pl.test +++ b/Build/source/texk/afm2pl/afm2pl.test @@ -1,14 +1,12 @@ #! /bin/sh -# Copyright (C) 2009 Peter Breitenlohner +# Copyright (C) 2009, 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. -rm -f logo10.pl logo10.map - +rm -f logo10.* TEXMFCNF=$srcdir/../kpathsea \ - ./afm2pl -l 0 $srcdir/logo10 ./logo10.pl || exit 1 - -diff $srcdir/xlogo10.pl logo10.pl || exit 1 - -diff $srcdir/xlogo10.map logo10.map || exit 1 + ./afm2pl -l 0 $srcdir/tests/logo10 ./logo10.pl \ + && diff $srcdir/tests/logo10.pl logo10.pl \ + && diff $srcdir/tests/logo10.map logo10.map \ + || exit 1 diff --git a/Build/source/texk/afm2pl/logo10.afm b/Build/source/texk/afm2pl/logo10.afm deleted file mode 100644 index 6c5759a4504..00000000000 --- a/Build/source/texk/afm2pl/logo10.afm +++ /dev/null @@ -1,44 +0,0 @@ -StartFontMetrics 2.0 -Comment Panose 2 0 0 6 2 0 0 2 0 0 -FullName LOGO10 -FontName LOGO10 -FamilyName LOGO10 -Weight Medium -Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved. -Version 001.002 -IsFixedPitch false -ItalicAngle 0.00 -FontBBox 0 -11 722 611 -Ascender 700 -Descender -200 -XHeight 0 -CapHeight 600 -UnderlinePosition -100 -UnderlineThickness 50 -StdHW 60 -StdVW 66 -EncodingScheme FontSpecific -StartCharMetrics 10 -C 69 ; WX 622 ; N E ; B 78 0 556 600 ; -C 70 ; WX 622 ; N F ; B 78 -11 556 600 ; -C 77 ; WX 800 ; N M ; B 78 -11 722 611 ; -C 78 ; WX 667 ; N N ; B 78 -11 588 611 ; -C 79 ; WX 667 ; N O ; B 33 -11 633 611 ; -C 80 ; WX 622 ; N P ; B 78 -11 583 600 ; -C 83 ; WX 622 ; N S ; B 78 0 583 600 ; -C 84 ; WX 578 ; N T ; B 0 -11 578 600 ; -C 65 ; WX 667 ; N A ; B 78 -11 589 611 ; -C 32 ; WX 267 ; N space ; B 0 0 0 0 ; -EndCharMetrics -StartKernData -StartKernPairs 3 -KPX F O -44 - -KPX P O 44 - -KPX T A -22 - -EndKernPairs -EndKernData -EndFontMetrics - \ No newline at end of file diff --git a/Build/source/texk/afm2pl/tests/logo10.afm b/Build/source/texk/afm2pl/tests/logo10.afm new file mode 100644 index 00000000000..6c5759a4504 --- /dev/null +++ b/Build/source/texk/afm2pl/tests/logo10.afm @@ -0,0 +1,44 @@ +StartFontMetrics 2.0 +Comment Panose 2 0 0 6 2 0 0 2 0 0 +FullName LOGO10 +FontName LOGO10 +FamilyName LOGO10 +Weight Medium +Notice Copyright (c) Taco Hoekwater, 1998. All rights reserved. +Version 001.002 +IsFixedPitch false +ItalicAngle 0.00 +FontBBox 0 -11 722 611 +Ascender 700 +Descender -200 +XHeight 0 +CapHeight 600 +UnderlinePosition -100 +UnderlineThickness 50 +StdHW 60 +StdVW 66 +EncodingScheme FontSpecific +StartCharMetrics 10 +C 69 ; WX 622 ; N E ; B 78 0 556 600 ; +C 70 ; WX 622 ; N F ; B 78 -11 556 600 ; +C 77 ; WX 800 ; N M ; B 78 -11 722 611 ; +C 78 ; WX 667 ; N N ; B 78 -11 588 611 ; +C 79 ; WX 667 ; N O ; B 33 -11 633 611 ; +C 80 ; WX 622 ; N P ; B 78 -11 583 600 ; +C 83 ; WX 622 ; N S ; B 78 0 583 600 ; +C 84 ; WX 578 ; N T ; B 0 -11 578 600 ; +C 65 ; WX 667 ; N A ; B 78 -11 589 611 ; +C 32 ; WX 267 ; N space ; B 0 0 0 0 ; +EndCharMetrics +StartKernData +StartKernPairs 3 +KPX F O -44 + +KPX P O 44 + +KPX T A -22 + +EndKernPairs +EndKernData +EndFontMetrics + \ No newline at end of file diff --git a/Build/source/texk/afm2pl/tests/logo10.map b/Build/source/texk/afm2pl/tests/logo10.map new file mode 100644 index 00000000000..6e73c7d73af --- /dev/null +++ b/Build/source/texk/afm2pl/tests/logo10.map @@ -0,0 +1 @@ +logo10 LOGO10