summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2019-05-28 14:59:37 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2019-05-28 14:59:37 +0000
commit580e66220eb45ed1e114a3796e4a39d1e35f748b (patch)
tree3369127497d64411641983b834e7d12fdbdc145f
parent903916a54c01500b9bf64254ce26c186b49a2475 (diff)
[e][u]ptexdir: add new tests.
git-svn-id: svn://tug.org/texlive/trunk@51243 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/Makefile.in12
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/eptexdir/am/eptex.am3
-rwxr-xr-xBuild/source/texk/web2c/eptexdir/epver.test32
-rw-r--r--Build/source/texk/web2c/euptexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/euptexdir/am/euptex.am3
-rwxr-xr-xBuild/source/texk/web2c/euptexdir/eupver.test32
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am3
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/pver.test32
-rw-r--r--Build/source/texk/web2c/ptexdir/tests/pver1.tex2
-rw-r--r--Build/source/texk/web2c/ptexdir/tests/pver2.tex13
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/uptexdir/am/uptex.am3
-rwxr-xr-xBuild/source/texk/web2c/uptexdir/upver.test32
15 files changed, 180 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index f6b0a744902..e3a6044d00f 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -3676,7 +3676,7 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies)
# pTeX Tests
#
-ptex_tests = ptexdir/ptriptest.test
+ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test
pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
ptexdir/ppltotf.test ptexdir/ptftopl.test \
ptexdir/pbibtex-openout-test.pl \
@@ -3721,7 +3721,7 @@ eptex_ch_srcs = \
# e-pTeX Tests
#
-eptex_tests = eptexdir/eptriptest.test eptexdir/pdfprimitive.test
+eptex_tests = eptexdir/eptriptest.test eptexdir/pdfprimitive.test eptexdir/epver.test
uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
@@ -3776,7 +3776,7 @@ uptftopl_LDADD = $(uptex_ldadd)
uptftopl_DEPENDENCIES = $(uptex_dependencies)
# upTeX Tests
-uptex_tests = uptexdir/uptriptest.test
+uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test
upweb_tests = \
uptexdir/upbibtex.test \
uptexdir/updvitype.test \
@@ -3830,7 +3830,7 @@ euptex_ch_srcs = \
# e-upTeX Tests
#
-euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test
+euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags)
libpdftex_a_CXXFLAGS = $(WARNING_CXXFLAGS)
libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
@@ -18494,6 +18494,7 @@ ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
$(tie_m) tftopl.web tftopl.ch
ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+ptexdir/pver.log: ptex$(EXEEXT)
ptexdir/pbibtex.log ptexdir/pbibtex-openout-test.log ptexdir/pbibtex-longline-test.log \
ptexdir/pbibtex-mem.log ptexdir/nissya.log: pbibtex$(EXEEXT)
ptexdir/pdvitype.log ptexdir/sample.log: pdvitype$(EXEEXT)
@@ -18536,6 +18537,7 @@ eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
$(tie_c) eptex.web $(eptex_ch_srcs)
eptexdir/eptriptest.log: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
eptexdir/pdfprimitive.log: eptex$(EXEEXT)
+eptexdir/epver.log: eptex$(EXEEXT)
eptrip.diffs: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: eptrip-clean
@@ -18602,6 +18604,7 @@ uptftopl.p: tangle$(EXEEXT) uptftopl.web uptexdir/uptftopl.ch
uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch
$(tie_m) tftopl.web tftopl.ch ptexdir/ptftopl.ch
uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+uptexdir/upver.log: uptex$(EXEEXT)
uptexdir/upbibtex.log: upbibtex$(EXEEXT)
uptexdir/updvitype.log: updvitype$(EXEEXT)
uptexdir/uppltotf.log: uppltotf$(EXEEXT)
@@ -18640,6 +18643,7 @@ euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
$(tie_c) euptex.web $(euptex_ch_srcs)
euptexdir/euptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
euptexdir/pdfprimitive.log: euptex$(EXEEXT)
+euptexdir/eupver.log: euptex$(EXEEXT)
euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: euptrip-clean
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index d3f6e422ba6..a3fdd4378b8 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-28 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * am/eptex.am: Add a new test.
+ * epver.test: New test file for version number consistency.
+
2019-04-02 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
* eptex.ech: \fontcharwd etc. for Japanese fonts correctly
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index 7428c9b4e88..6ce9d1a601b 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -81,9 +81,10 @@ EXTRA_DIST += \
# e-pTeX Tests
#
-eptex_tests = eptexdir/eptriptest.test eptexdir/pdfprimitive.test
+eptex_tests = eptexdir/eptriptest.test eptexdir/pdfprimitive.test eptexdir/epver.test
eptexdir/eptriptest.log: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
eptexdir/pdfprimitive.log: eptex$(EXEEXT)
+eptexdir/epver.log: eptex$(EXEEXT)
EXTRA_DIST += $(eptex_tests)
diff --git a/Build/source/texk/web2c/eptexdir/epver.test b/Build/source/texk/web2c/eptexdir/epver.test
new file mode 100755
index 00000000000..0a232cf1392
--- /dev/null
+++ b/Build/source/texk/web2c/eptexdir/epver.test
@@ -0,0 +1,32 @@
+#! /bin/sh -vx
+# $Id$
+# Copyright 2019 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+# You may freely use, modify and/or distribute this file.
+
+LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
+
+TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
+TEXINPUTS=$srcdir/ptexdir/tests:.; export TEXINPUTS
+
+# check consistency between runtime terminal and log
+./eptex -ini -etex -interaction batchmode -jobname epver1-log pver1.tex >epver1-term.log || exit 1
+sed -nE 's/^This is ([-A-Za-z]+), Version [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ epver1-term.log >epver1-term_ed.log || exit 1
+sed -nE 's/^This is ([-A-Za-z]+), Version [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ epver1-log.log >epver1-log_ed.log || exit 1
+diff epver1-term_ed.log epver1-log_ed.log || exit 2
+
+# check consistency between runtime and version output
+./eptex -version >epver2-self.log || exit 1
+sed -nE '1 s/^([-A-Za-z]+) [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ epver2-self.log >epver2-self_ed.log || exit 1
+diff epver1-term_ed.log epver2-self_ed.log || exit 4
+
+# check consistency between version output and version primitives
+./eptex -ini -etex -interaction batchmode -jobname epver2-prim pver2.tex || exit 1
+sed -nE 's/^Engine ([-A-Za-z]+) ([^ ]+) (.*)/\1 \2/p' \
+ epver2-prim.log >epver2-prim_ed.log || exit 1
+diff epver2-self_ed.log epver2-prim_ed.log || exit 8
+
+exit 0
+
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index ed76b4e9c58..cd0d73d57c6 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-28 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * am/euptex.am: Add a new test.
+ * eupver.test: New test file for version number consistency.
+
2018-09-09 Karl Berry <karl@tug.org>
* euptriptest.test,
diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am
index 21ab6a9a739..b77ac522412 100644
--- a/Build/source/texk/web2c/euptexdir/am/euptex.am
+++ b/Build/source/texk/web2c/euptexdir/am/euptex.am
@@ -82,9 +82,10 @@ EXTRA_DIST += \
# e-upTeX Tests
#
-euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test
+euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
euptexdir/euptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
euptexdir/pdfprimitive.log: euptex$(EXEEXT)
+euptexdir/eupver.log: euptex$(EXEEXT)
EXTRA_DIST += $(euptex_tests)
diff --git a/Build/source/texk/web2c/euptexdir/eupver.test b/Build/source/texk/web2c/euptexdir/eupver.test
new file mode 100755
index 00000000000..227f65bdc0b
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/eupver.test
@@ -0,0 +1,32 @@
+#! /bin/sh -vx
+# $Id$
+# Copyright 2019 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+# You may freely use, modify and/or distribute this file.
+
+LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
+
+TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
+TEXINPUTS=$srcdir/ptexdir/tests:.; export TEXINPUTS
+
+# check consistency between runtime terminal and log
+./euptex -ini -etex -interaction batchmode -jobname eupver1-log pver1.tex >eupver1-term.log || exit 1
+sed -nE 's/^This is ([-A-Za-z]+), Version [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ eupver1-term.log >eupver1-term_ed.log || exit 1
+sed -nE 's/^This is ([-A-Za-z]+), Version [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ eupver1-log.log >eupver1-log_ed.log || exit 1
+diff eupver1-term_ed.log eupver1-log_ed.log || exit 2
+
+# check consistency between runtime and version output
+./euptex -version >eupver2-self.log || exit 1
+sed -nE '1 s/^([-A-Za-z]+) [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ eupver2-self.log >eupver2-self_ed.log || exit 1
+diff eupver1-term_ed.log eupver2-self_ed.log || exit 4
+
+# check consistency between version output and version primitives
+./euptex -ini -etex -interaction batchmode -jobname eupver2-prim pver2.tex || exit 1
+sed -nE 's/^Engine ([-A-Za-z]+) ([^ ]+) (.*)/\1 \2/p' \
+ eupver2-prim.log >eupver2-prim_ed.log || exit 1
+diff eupver2-self_ed.log eupver2-prim_ed.log || exit 8
+
+exit 0
+
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 88e5e002d99..779b6f2f2ee 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-28 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * am/ptex.am: Add a new test.
+ * pver.test: New test file for version number consistency.
+ * tests/pver1.tex, ptexdir/tests/pver2.tex: New.
+
2019-05-06 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* ptex-base.ch:
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index d8485ff1ca5..a2e35888aed 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -167,8 +167,9 @@ EXTRA_DIST += \
# pTeX Tests
#
-ptex_tests = ptexdir/ptriptest.test
+ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test
ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+ptexdir/pver.log: ptex$(EXEEXT)
pweb_tests = \
ptexdir/pbibtex.test \
ptexdir/pdvitype.test \
diff --git a/Build/source/texk/web2c/ptexdir/pver.test b/Build/source/texk/web2c/ptexdir/pver.test
new file mode 100755
index 00000000000..519d560e319
--- /dev/null
+++ b/Build/source/texk/web2c/ptexdir/pver.test
@@ -0,0 +1,32 @@
+#! /bin/sh -vx
+# $Id$
+# Copyright 2019 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+# You may freely use, modify and/or distribute this file.
+
+LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
+
+TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
+TEXINPUTS=$srcdir/ptexdir/tests:.; export TEXINPUTS
+
+# check consistency between runtime terminal and log
+./ptex -ini -interaction batchmode -jobname pver1-log pver1.tex >pver1-term.log || exit 1
+sed -nE 's/^This is ([-A-Za-z]+), Version [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ pver1-term.log >pver1-term_ed.log || exit 1
+sed -nE 's/^This is ([-A-Za-z]+), Version [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ pver1-log.log >pver1-log_ed.log || exit 1
+diff pver1-term_ed.log pver1-log_ed.log || exit 2
+
+# check consistency between runtime and version output
+./ptex -version >pver2-self.log || exit 1
+sed -nE '1 s/^([-A-Za-z]+) [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ pver2-self.log >pver2-self_ed.log || exit 1
+diff pver1-term_ed.log pver2-self_ed.log || exit 4
+
+# check consistency between version output and version primitives
+./ptex -ini -interaction batchmode -jobname pver2-prim pver2.tex || exit 1
+sed -nE 's/^Engine ([-A-Za-z]+) ([^ ]+) (.*)/\1 \2/p' \
+ pver2-prim.log >pver2-prim_ed.log || exit 1
+diff pver2-self_ed.log pver2-prim_ed.log || exit 8
+
+exit 0
+
diff --git a/Build/source/texk/web2c/ptexdir/tests/pver1.tex b/Build/source/texk/web2c/ptexdir/tests/pver1.tex
new file mode 100644
index 00000000000..c891f1f6609
--- /dev/null
+++ b/Build/source/texk/web2c/ptexdir/tests/pver1.tex
@@ -0,0 +1,2 @@
+% for INITEX
+\relax\end
diff --git a/Build/source/texk/web2c/ptexdir/tests/pver2.tex b/Build/source/texk/web2c/ptexdir/tests/pver2.tex
new file mode 100644
index 00000000000..fdbc3e5055a
--- /dev/null
+++ b/Build/source/texk/web2c/ptexdir/tests/pver2.tex
@@ -0,0 +1,13 @@
+% for INITEX
+\catcode`\{=1
+\catcode`\}=2
+\def\space{ }
+\edef\NAME{Engine \ifx\eTeXversion\undefined\else e-\fi
+ \ifx\enablecjktoken\undefined\else u\fi
+ pTeX p\the\ptexversion.\the\ptexminorversion\ptexrevision
+ \ifx\enablecjktoken\undefined\else -u\the\uptexversion\uptexrevision\fi
+ \ifx\epTeXversion\undefined\else -\the\epTeXversion
+ -\the\eTeXversion\eTeXrevision\fi
+ \space (dummy)}
+\write16{\NAME}
+\relax\end
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 355170372b5..a08660abef2 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-28 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * am/uptex.am: Add a new test.
+ * upver.test: New test file for version number consistency.
+
2019-05-25 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* uptex-m.ch:
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index 6980b637e7e..ed9c00e431f 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -157,8 +157,9 @@ EXTRA_DIST += \
uptexdir/ChangeLog
# upTeX Tests
-uptex_tests = uptexdir/uptriptest.test
+uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test
uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+uptexdir/upver.log: uptex$(EXEEXT)
upweb_tests = \
uptexdir/upbibtex.test \
uptexdir/updvitype.test \
diff --git a/Build/source/texk/web2c/uptexdir/upver.test b/Build/source/texk/web2c/uptexdir/upver.test
new file mode 100755
index 00000000000..3aca618a467
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/upver.test
@@ -0,0 +1,32 @@
+#! /bin/sh -vx
+# $Id$
+# Copyright 2019 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+# You may freely use, modify and/or distribute this file.
+
+LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
+
+TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
+TEXINPUTS=$srcdir/ptexdir/tests:.; export TEXINPUTS
+
+# check consistency between runtime terminal and log
+./uptex -ini -interaction batchmode -jobname upver1-log pver1.tex >upver1-term.log || exit 1
+sed -nE 's/^This is ([-A-Za-z]+), Version [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ upver1-term.log >upver1-term_ed.log || exit 1
+sed -nE 's/^This is ([-A-Za-z]+), Version [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ upver1-log.log >upver1-log_ed.log || exit 1
+diff upver1-term_ed.log upver1-log_ed.log || exit 2
+
+# check consistency between runtime and version output
+./uptex -version >upver2-self.log || exit 1
+sed -nE '1 s/^([-A-Za-z]+) [^-]+-([^ ]+) (.*)/\1 \2/p' \
+ upver2-self.log >upver2-self_ed.log || exit 1
+diff upver1-term_ed.log upver2-self_ed.log || exit 4
+
+# check consistency between version output and version primitives
+./uptex -ini -interaction batchmode -jobname upver2-prim pver2.tex || exit 1
+sed -nE 's/^Engine ([-A-Za-z]+) ([^ ]+) (.*)/\1 \2/p' \
+ upver2-prim.log >upver2-prim_ed.log || exit 1
+diff upver2-self_ed.log upver2-prim_ed.log || exit 8
+
+exit 0
+