From 31f20969be169a7d43a27ed9f108b4113ddf2b1a Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 27 Jan 2024 01:50:18 +0000 Subject: dvisvgm: split tests for upTeX DVIs git-svn-id: svn://tug.org/texlive/trunk@69608 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvisvgm/ChangeLog | 6 ++ Build/source/texk/dvisvgm/Makefile.am | 5 +- Build/source/texk/dvisvgm/Makefile.in | 3 +- Build/source/texk/dvisvgm/tests/dvisvgm-hara.test | 85 ++++++++++++++++++++++ Build/source/texk/dvisvgm/tests/dvisvgm-uptex.test | 63 +--------------- 5 files changed, 98 insertions(+), 64 deletions(-) create mode 100755 Build/source/texk/dvisvgm/tests/dvisvgm-hara.test (limited to 'Build') diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index 98f93051a06..4c178262e94 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,9 @@ +2024-01-27 TANAKA Takuji + + * tests/dvisvgm-{uptex,hara}.test: + Split tests for upTeX DVIs into two. + * Makefile.am: Adjusted. + 2024-01-20 Karl Berry * dvisvgm-src/src/Makefile.am (dvisvgm_LDADD) [TEXLIVE_BUILD]: diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am index 20771bd18d3..aa35f8dc0fa 100644 --- a/Build/source/texk/dvisvgm/Makefile.am +++ b/Build/source/texk/dvisvgm/Makefile.am @@ -36,10 +36,11 @@ DISTCLEANFILES = config.force CXXLD.sh ## Tests (our trivial one and additions, not the original full test suite). ## -TESTS = tests/dvisvgm.test tests/dvisvgm-sample.test tests/dvisvgm-uptex.test +TESTS = tests/dvisvgm.test tests/dvisvgm-sample.test tests/dvisvgm-uptex.test tests/dvisvgm-hara.test tests/dvisvgm.log: $(DVISVGM_TREE)/src/dvisvgm$(EXEEXT) tests/dvisvgm-sample.log: $(DVISVGM_TREE)/src/dvisvgm$(EXEEXT) tests/dvisvgm-uptex.log: $(DVISVGM_TREE)/src/dvisvgm$(EXEEXT) +tests/dvisvgm-hara.log: $(DVISVGM_TREE)/src/dvisvgm$(EXEEXT) EXTRA_DIST += $(TESTS) ## dvisvgm-sample.test @@ -47,7 +48,7 @@ EXTRA_DIST += tests/sample_v2-nf.svg tests/sample_v2-wf.svg \ tests/sample_v3-nf.svg tests/sample_v3-wf.svg DISTCLEANFILES += sample*.svg -## dvisvgm-uptex.test +## dvisvgm-uptex.test, dvisvgm-hara.test EXTRA_DIST += tests/upjf.dvi tests/upjf.tfm tests/upjv.tfm \ tests/upjf-r.tfm tests/upjf-g.tfm tests/upjv-r.tfm tests/upjv-g.tfm \ tests/upjf-r00.ofm tests/upjf-g00.ofm tests/upjv-r00.ofm tests/upjv-g00.ofm \ diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in index 9ab5f3e6140..2e77bb43fe1 100644 --- a/Build/source/texk/dvisvgm/Makefile.in +++ b/Build/source/texk/dvisvgm/Makefile.in @@ -624,7 +624,7 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' dvisvgm_dependencies = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND) $(POTRACE_DEPEND) # DISTCLEANFILES = config.force CXXLD.sh sample*.svg upjf*.svg -TESTS = tests/dvisvgm.test tests/dvisvgm-sample.test tests/dvisvgm-uptex.test +TESTS = tests/dvisvgm.test tests/dvisvgm-sample.test tests/dvisvgm-uptex.test tests/dvisvgm-hara.test all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1339,6 +1339,7 @@ config.force: $(dvisvgm_dependencies) tests/dvisvgm.log: $(DVISVGM_TREE)/src/dvisvgm$(EXEEXT) tests/dvisvgm-sample.log: $(DVISVGM_TREE)/src/dvisvgm$(EXEEXT) tests/dvisvgm-uptex.log: $(DVISVGM_TREE)/src/dvisvgm$(EXEEXT) +tests/dvisvgm-hara.log: $(DVISVGM_TREE)/src/dvisvgm$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/dvisvgm/tests/dvisvgm-hara.test b/Build/source/texk/dvisvgm/tests/dvisvgm-hara.test new file mode 100755 index 00000000000..906614fb97c --- /dev/null +++ b/Build/source/texk/dvisvgm/tests/dvisvgm-hara.test @@ -0,0 +1,85 @@ +#! /bin/sh -vx +# $Id$ +# Copyright 2024 Japanese TeX Development Community +# You may freely use, modify and/or distribute this file. + +# most imput files were copied from ../../dvipsk/testdata/ + +KpsDir=${KpsDir:-../kpathsea} +BinDir=${BinDir:-./dvisvgm-src/src} +ExeExt=${ExeExt:-} +_kpsewhich=$KpsDir/kpsewhich$ExeExt +_dvisvgm=$BinDir/dvisvgm$ExeExt + +TEXMFCNF=$srcdir/../kpathsea +TFMFONTS=".;$srcdir/dvisvgm-src/tests/data;$srcdir/tests" +VFFONTS=".;$srcdir/tests" +T1FONTS="$srcdir/dvisvgm-src/tests/data" +TEXFONTMAPS="$srcdir/dvisvgm-src/tests/data;$srcdir/tests" + +export TEXMFCNF TFMFONTS VFFONTS T1FONTS TEXFONTMAPS + +rm -f ./upjf*full1.svg ./upjf*omit*.svg +failed= + +##### following tests require Haranoaji fonts ##### + +$_kpsewhich HaranoAjiMincho-Regular.otf +otfpath=`$_kpsewhich HaranoAjiMincho-Regular.otf` || exit 77 +OPENTYPEFONTS=`echo $otfpath | sed -e 's,HaranoAjiMincho-Regular\.otf,,' -e 's,/fonts/opentype/.*$,/fonts/opentype//,'` +export OPENTYPEFONTS + + +echo "*** dvisvgm: test for upjf_full" && echo \ + && cp $srcdir/tests/upjf_full.vf ./upjf.vf \ + && cp $srcdir/tests/upjv_full.vf ./upjv.vf \ + && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf_full1.svg $srcdir/tests/upjf.dvi \ + && echo || failed="$failed upjf_full1" + +echo "*** dvisvgm: test for upjf1_full" && echo \ + && cp $srcdir/tests/upjf1_full.vf ./upjf.vf \ + && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf1_full1.svg $srcdir/tests/upjf.dvi \ + && echo || failed="$failed upjf1_full1" + + +echo "*** dvisvgm: test for upjf_omit" && echo \ + && cp $srcdir/tests/upjf_omit.vf ./upjf.vf \ + && cp $srcdir/tests/upjv_omit.vf ./upjv.vf \ + && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf_omit.svg $srcdir/tests/upjf.dvi \ + && echo || failed="$failed upjf_omit" + +diff ./upjf_omit.svg ./upjf_full1.svg || failed="$failed upjf_omit-cmp" + + +echo "*** dvisvgm: test for upjf1_omit" && echo \ + && cp $srcdir/tests/upjf1_omit.vf ./upjf.vf \ + && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf1_omit.svg $srcdir/tests/upjf.dvi \ + && echo || failed="$failed upjf1_omit" + +diff ./upjf1_omit.svg ./upjf1_full1.svg || failed="$failed upjf1_omit-cmp" + + +echo "*** dvisvgm: test for upjf_omit2" && echo \ + && cp $srcdir/tests/upjf_omit.vf ./upjf.vf \ + && cp $srcdir/tests/upjf-r00.ofm ./upjf-r.ofm \ + && cp $srcdir/tests/upjv-r00.ofm ./upjv-r.ofm \ + && cp $srcdir/tests/upjf-g00.ofm ./upjf-g.ofm \ + && cp $srcdir/tests/upjv-g00.ofm ./upjv-g.ofm \ + && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf_omit2.svg $srcdir/tests/upjf.dvi \ + && echo || failed="$failed upjf_omit2" + +diff ./upjf_omit2.svg ./upjf_full1.svg || failed="$failed upjf_omit2-cmp" + + +echo "*** dvisvgm: test for upjf1_omit2" && echo \ + && cp $srcdir/tests/upjf1_omit.vf ./upjf.vf \ + && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf1_omit2.svg $srcdir/tests/upjf.dvi \ + && echo || failed="$failed upjf1_omit2" + +diff ./upjf1_omit2.svg ./upjf1_full1.svg || failed="$failed upjf1_omit2-cmp" + + +test -z "$failed" && exit 0 +echo +echo "failed tests:$failed" +exit 1 diff --git a/Build/source/texk/dvisvgm/tests/dvisvgm-uptex.test b/Build/source/texk/dvisvgm/tests/dvisvgm-uptex.test index 3b3105f06f5..949b815da56 100755 --- a/Build/source/texk/dvisvgm/tests/dvisvgm-uptex.test +++ b/Build/source/texk/dvisvgm/tests/dvisvgm-uptex.test @@ -19,7 +19,7 @@ TEXFONTMAPS="$srcdir/dvisvgm-src/tests/data;$srcdir/tests" export TEXMFCNF TFMFONTS VFFONTS T1FONTS TEXFONTMAPS -rm -f ./upjf*.svg +rm -f ./upjf*full.svg failed= echo "*** dvisvgm: test for upjf_full" && echo \ @@ -38,67 +38,8 @@ echo "*** dvisvgm: test for upjf1_full" && echo \ diff ./upjf1_full.svg $srcdir/tests/upjf1.svg || failed="$failed upjf1_full-cmp" -test -n "$failed" && { echo; echo "failed tests:$failed"; exit 1; } - - -##### following tests require Haranoaji fonts ##### - -$_kpsewhich HaranoAjiMincho-Regular.otf -otfpath=`$_kpsewhich HaranoAjiMincho-Regular.otf` || exit 77 -OPENTYPEFONTS=`echo $otfpath | sed -e 's,HaranoAjiMincho-Regular\.otf,,' -e 's,/fonts/opentype/.*$,/fonts/opentype//,'` -export OPENTYPEFONTS - - -echo "*** dvisvgm: test for upjf_full" && echo \ - && cp $srcdir/tests/upjf_full.vf ./upjf.vf \ - && cp $srcdir/tests/upjv_full.vf ./upjv.vf \ - && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf_full1.svg $srcdir/tests/upjf.dvi \ - && echo || failed="$failed upjf_full1" - -echo "*** dvisvgm: test for upjf1_full" && echo \ - && cp $srcdir/tests/upjf1_full.vf ./upjf.vf \ - && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf1_full1.svg $srcdir/tests/upjf.dvi \ - && echo || failed="$failed upjf1_full1" - - -echo "*** dvisvgm: test for upjf_omit" && echo \ - && cp $srcdir/tests/upjf_omit.vf ./upjf.vf \ - && cp $srcdir/tests/upjv_omit.vf ./upjv.vf \ - && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf_omit.svg $srcdir/tests/upjf.dvi \ - && echo || failed="$failed upjf_omit" - -diff ./upjf_omit.svg ./upjf_full1.svg || failed="$failed upjf_omit-cmp" - - -echo "*** dvisvgm: test for upjf1_omit" && echo \ - && cp $srcdir/tests/upjf1_omit.vf ./upjf.vf \ - && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf1_omit.svg $srcdir/tests/upjf.dvi \ - && echo || failed="$failed upjf1_omit" - -diff ./upjf1_omit.svg ./upjf1_full1.svg || failed="$failed upjf1_omit-cmp" - - -echo "*** dvisvgm: test for upjf_omit2" && echo \ - && cp $srcdir/tests/upjf_omit.vf ./upjf.vf \ - && cp $srcdir/tests/upjf-r00.ofm ./upjf-r.ofm \ - && cp $srcdir/tests/upjv-r00.ofm ./upjv-r.ofm \ - && cp $srcdir/tests/upjf-g00.ofm ./upjf-g.ofm \ - && cp $srcdir/tests/upjv-g00.ofm ./upjv-g.ofm \ - && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf_omit2.svg $srcdir/tests/upjf.dvi \ - && echo || failed="$failed upjf_omit2" - -diff ./upjf_omit2.svg ./upjf_full1.svg || failed="$failed upjf_omit2-cmp" - - -echo "*** dvisvgm: test for upjf1_omit2" && echo \ - && cp $srcdir/tests/upjf1_omit.vf ./upjf.vf \ - && $_dvisvgm --verbosity=7 -m upjf-hara.map -o upjf1_omit2.svg $srcdir/tests/upjf.dvi \ - && echo || failed="$failed upjf1_omit2" - -diff ./upjf1_omit2.svg ./upjf1_full1.svg || failed="$failed upjf1_omit2-cmp" - test -z "$failed" && exit 0 echo echo "failed tests:$failed" -exit 2 +exit 1 -- cgit v1.2.3