{,e}{,u}ptex: Update tests for Windows

git-svn-id: svn://tug.org/texlive/trunk@68159 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 94 insertions, 74 deletions

diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index e38a09e7f34..71d93499f2e 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2023-09-03  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* {eptriptest,epver}.test:
+	Update tests for Windows.
+
 2023-08-20  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* {eptriptest,epver,pdfprimitive,wcfname}.test:
diff --git a/Build/source/texk/web2c/eptexdir/eptriptest.test b/Build/source/texk/web2c/eptexdir/eptriptest.test
index e74ba632932..db82a98d1b0 100755
--- a/Build/source/texk/web2c/eptexdir/eptriptest.test
+++ b/Build/source/texk/web2c/eptexdir/eptriptest.test
@@ -5,12 +5,12 @@
 # Copyright 2010 Hironori Kitagawa <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-BinDir=${BinDir:-..}
+W2CDir=${W2CDir:-..}
 ExeExt=${ExeExt:-}
-_eptex=$BinDir/eptex$ExeExt
-_pltotf=$BinDir/pltotf$ExeExt
-_tftopl=$BinDir/tftopl$ExeExt
-_dvitype=$BinDir/dvitype$ExeExt
+_eptex=$W2CDir/eptex$ExeExt
+_pltotf=$W2CDir/pltotf$ExeExt
+_tftopl=$W2CDir/tftopl$ExeExt
+_dvitype=$W2CDir/dvitype$ExeExt
 
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
diff --git a/Build/source/texk/web2c/eptexdir/epver.test b/Build/source/texk/web2c/eptexdir/epver.test
index 6f3e42128ad..9f14d055433 100755
--- a/Build/source/texk/web2c/eptexdir/epver.test
+++ b/Build/source/texk/web2c/eptexdir/epver.test
@@ -15,22 +15,22 @@ 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 -n 's/^This is \([-A-Za-z]*\), Version [^-]*-\([^ ]*\) \(.*\)/\1 \2/p' \
-  epver1-term.log >epver1-term_ed.log || exit 1
+  epver1-term.log >epver1-term_ed.log || exit 2
 sed -n '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
+  epver1-log.log >epver1-log_ed.log || exit 3
+diff epver1-term_ed.log epver1-log_ed.log || exit 4
 
 # check consistency between runtime and version output
-$_eptex -version >epver2-self.log || exit 1
+$_eptex -version >epver2-self.log || exit 5
 sed -n '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
+  epver2-self.log >epver2-self_ed.log || exit 6
+diff epver1-term_ed.log epver2-self_ed.log || exit 7
 
 # check consistency between version output and version primitives
-$_eptex -ini -etex -interaction batchmode -jobname epver2-prim pver2.tex || exit 1
+$_eptex -ini -etex -interaction batchmode -jobname epver2-prim pver2.tex || exit 8
 sed -n '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
+  epver2-prim.log >epver2-prim_ed.log || exit 9
+diff epver2-self_ed.log epver2-prim_ed.log || exit 10
 
 exit 0
 
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index 265a1c1ec61..4b1b80a0838 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2023-09-03  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* {eptriptest,euptriptest,eupver}.test:
+	Update tests for Windows.
+
 2023-08-20  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* am/euptex.am, {eptriptest,euptriptest,eupver,
diff --git a/Build/source/texk/web2c/euptexdir/eptriptest.test b/Build/source/texk/web2c/euptexdir/eptriptest.test
index b737b7e2de7..e99513fdc37 100755
--- a/Build/source/texk/web2c/euptexdir/eptriptest.test
+++ b/Build/source/texk/web2c/euptexdir/eptriptest.test
@@ -6,12 +6,12 @@
 # Copyright 2010 Hironori Kitagawa <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-BinDir=${BinDir:-..}
+W2CDir=${W2CDir:-..}
 ExeExt=${ExeExt:-}
-_euptex=$BinDir/euptex$ExeExt
-_pltotf=$BinDir/pltotf$ExeExt
-_tftopl=$BinDir/tftopl$ExeExt
-_dvitype=$BinDir/dvitype$ExeExt
+_euptex=$W2CDir/euptex$ExeExt
+_pltotf=$W2CDir/pltotf$ExeExt
+_tftopl=$W2CDir/tftopl$ExeExt
+_dvitype=$W2CDir/dvitype$ExeExt
 
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
diff --git a/Build/source/texk/web2c/euptexdir/euptriptest.test b/Build/source/texk/web2c/euptexdir/euptriptest.test
index 91d0a6af7b3..848f6bb425b 100755
--- a/Build/source/texk/web2c/euptexdir/euptriptest.test
+++ b/Build/source/texk/web2c/euptexdir/euptriptest.test
@@ -5,12 +5,12 @@
 # Copyright 2010 Hironori Kitagawa <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-BinDir=${BinDir:-..}
+W2CDir=${W2CDir:-..}
 ExeExt=${ExeExt:-}
-_euptex=$BinDir/euptex$ExeExt
-_pltotf=$BinDir/pltotf$ExeExt
-_tftopl=$BinDir/tftopl$ExeExt
-_dvitype=$BinDir/dvitype$ExeExt
+_euptex=$W2CDir/euptex$ExeExt
+_pltotf=$W2CDir/pltotf$ExeExt
+_tftopl=$W2CDir/tftopl$ExeExt
+_dvitype=$W2CDir/dvitype$ExeExt
 
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
@@ -40,9 +40,9 @@ set -x
 
 echo "*** TRIP test for e-upTeX in compatibility mode ***."
 
-../pltotf $testdir/trip.pl trip.tfm || exit 1
+$_pltotf $testdir/trip.pl trip.tfm || exit 1
 
-../tftopl ./trip.tfm trip.pl || exit 1
+$_tftopl ./trip.tfm trip.pl || exit 1
 
 diff $testdir/trip.pl trip.pl || is_OK=false
 
@@ -50,7 +50,7 @@ diff $testdir/trip.pl trip.pl || is_OK=false
 $LN_S $testdir/trip.tex .
 
 rm -f trip.log
-../euptex --progname=eupinitex --ini <$testdir/trip1.in >cuptripin.fot
+$_euptex --progname=eupinitex --ini <$testdir/trip1.in >cuptripin.fot
 if test ! -s trip.fmt; then
   echo "*** trip.fmt not created by trip1.in, investigate!" >&2
   exit 1
@@ -60,7 +60,7 @@ diff $testdir/tripin.log cuptripin.log
 
 # May as well test non-ini second time through.
 rm -f trip.log
-../euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot
+$_euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot
 sed "$P_SED1;$P_SED2" trip.log > cuptrip.log
 diff $testdir/trip.fot cuptrip.fot
 
@@ -71,7 +71,7 @@ $DIFF $DIFFFLAGS $testdir/trip.log cuptrip.log
 mv tripos.tex cuptripos.tex
 diff $testdir/tripos.tex cuptripos.tex
 
-eval ../dvitype $dvitype_args trip.dvi >cuptrip.typ || exit 1
+eval $_dvitype $dvitype_args trip.dvi >cuptrip.typ || exit 1
 $DIFF $DIFFFLAGS $testdir/trip.typ cuptrip.typ
 
 mv trip.fmt ctrip.fmt
@@ -81,7 +81,7 @@ mv trip.fmt ctrip.fmt
 echo "*** TRIP test for e-upTeX in extended mode ***."
 
 rm -f trip.log
-../euptex --progname=eupinitex --ini <$etestdir/etrip1.in >xuptripin.fot
+$_euptex --progname=eupinitex --ini <$etestdir/etrip1.in >xuptripin.fot
 if test ! -s trip.fmt; then
   echo "*** trip.fmt not created by etrip1.in, investigate!" >&2
   exit 1
@@ -91,7 +91,7 @@ diff $testdir/tripin.log xuptripin.log
 
 # May as well test non-ini second time through.
 rm -f trip.log
-../euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot
+$_euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot
 sed "$P_SED1;$P_SED2" trip.log > xuptrip.log
 diff $testdir/trip.fot xuptrip.fot
 
@@ -102,7 +102,7 @@ $DIFF $DIFFFLAGS $testdir/trip.log xuptrip.log
 mv tripos.tex xuptripos.tex
 diff $testdir/tripos.tex xuptripos.tex
 
-eval ../dvitype $dvitype_args trip.dvi >xuptrip.typ || exit 1
+eval $_dvitype $dvitype_args trip.dvi >xuptrip.typ || exit 1
 $DIFF $DIFFFLAGS $testdir/trip.typ xuptrip.typ
 
 mv trip.fmt xtrip.fmt
diff --git a/Build/source/texk/web2c/euptexdir/eupver.test b/Build/source/texk/web2c/euptexdir/eupver.test
index 30e1d15b864..d7db6cf95af 100755
--- a/Build/source/texk/web2c/euptexdir/eupver.test
+++ b/Build/source/texk/web2c/euptexdir/eupver.test
@@ -15,22 +15,22 @@ 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 -n 's/^This is \([-A-Za-z]*\), Version [^-]*-\([^ ]*\) \(.*\)/\1 \2/p' \
-  eupver1-term.log >eupver1-term_ed.log || exit 1
+  eupver1-term.log >eupver1-term_ed.log || exit 2
 sed -n '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
+  eupver1-log.log >eupver1-log_ed.log || exit 3
+diff eupver1-term_ed.log eupver1-log_ed.log || exit 4
 
 # check consistency between runtime and version output
-$_euptex -version >eupver2-self.log || exit 1
+$_euptex -version >eupver2-self.log || exit 5
 sed -n '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
+  eupver2-self.log >eupver2-self_ed.log || exit 6
+diff eupver1-term_ed.log eupver2-self_ed.log || exit 7
 
 # check consistency between version output and version primitives
-$_euptex -ini -etex -interaction batchmode -jobname eupver2-prim pver2.tex || exit 1
+$_euptex -ini -etex -interaction batchmode -jobname eupver2-prim pver2.tex || exit 8
 sed -n '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
+  eupver2-prim.log >eupver2-prim_ed.log || exit 9
+diff eupver2-self_ed.log eupver2-prim_ed.log || exit 10
 
 exit 0
 
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 718d205d564..8ac9123da96 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2023-09-03  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* {ptriptest,pver}.test:
+	Update tests for Windows.
+
 2023-08-22  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* ptex-base.ch: Clean up unnecessary lines.
diff --git a/Build/source/texk/web2c/ptexdir/ptriptest.test b/Build/source/texk/web2c/ptexdir/ptriptest.test
index 3c0388f960e..35099794b3d 100755
--- a/Build/source/texk/web2c/ptexdir/ptriptest.test
+++ b/Build/source/texk/web2c/ptexdir/ptriptest.test
@@ -4,12 +4,12 @@
 # Copyright 2010-2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-BinDir=${BinDir:-..}
+W2CDir=${W2CDir:-..}
 ExeExt=${ExeExt:-}
-_ptex=$BinDir/ptex$ExeExt
-_pltotf=$BinDir/pltotf$ExeExt
-_tftopl=$BinDir/tftopl$ExeExt
-_dvitype=$BinDir/dvitype$ExeExt
+_ptex=$W2CDir/ptex$ExeExt
+_pltotf=$W2CDir/pltotf$ExeExt
+_tftopl=$W2CDir/tftopl$ExeExt
+_dvitype=$W2CDir/dvitype$ExeExt
 
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
diff --git a/Build/source/texk/web2c/ptexdir/pver.test b/Build/source/texk/web2c/ptexdir/pver.test
index 43e6b608353..0635469a116 100755
--- a/Build/source/texk/web2c/ptexdir/pver.test
+++ b/Build/source/texk/web2c/ptexdir/pver.test
@@ -15,22 +15,22 @@ 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 -n 's/^This is \([-A-Za-z]*\), Version [^-]*-\([^ ]*\) \(.*\)/\1 \2/p' \
-  pver1-term.log >pver1-term_ed.log || exit 1
+  pver1-term.log >pver1-term_ed.log || exit 2
 sed -n '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
+  pver1-log.log >pver1-log_ed.log || exit 3
+diff pver1-term_ed.log pver1-log_ed.log || exit 4
 
 # check consistency between runtime and version output
-$_ptex -version >pver2-self.log || exit 1
+$_ptex -version >pver2-self.log || exit 5
 sed -n '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
+  pver2-self.log >pver2-self_ed.log || exit 6
+diff pver1-term_ed.log pver2-self_ed.log || exit 7
 
 # check consistency between version output and version primitives
-$_ptex -ini -interaction batchmode -jobname pver2-prim pver2.tex || exit 1
+$_ptex -ini -interaction batchmode -jobname pver2-prim pver2.tex || exit 8
 sed -n '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
+  pver2-prim.log >pver2-prim_ed.log || exit 9
+diff pver2-self_ed.log pver2-prim_ed.log || exit 10
 
 exit 0
 
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index f50b7cce456..999b6db6488 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2023-09-03  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* {ptriptest,uptriptest,upver}.test:
+	Update tests for Windows.
+
 2023-09-03  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* uptex-m.ch: Proper support for \kchar in math mode.
diff --git a/Build/source/texk/web2c/uptexdir/ptriptest.test b/Build/source/texk/web2c/uptexdir/ptriptest.test
index 99f6a56ae02..aef48daa3e9 100755
--- a/Build/source/texk/web2c/uptexdir/ptriptest.test
+++ b/Build/source/texk/web2c/uptexdir/ptriptest.test
@@ -5,12 +5,12 @@
 # Copyright 2010-2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-BinDir=${BinDir:-..}
+W2CDir=${W2CDir:-..}
 ExeExt=${ExeExt:-}
-_uptex=$BinDir/uptex$ExeExt
-_pltotf=$BinDir/pltotf$ExeExt
-_tftopl=$BinDir/tftopl$ExeExt
-_dvitype=$BinDir/dvitype$ExeExt
+_uptex=$W2CDir/uptex$ExeExt
+_pltotf=$W2CDir/pltotf$ExeExt
+_tftopl=$W2CDir/tftopl$ExeExt
+_dvitype=$W2CDir/dvitype$ExeExt
 
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
diff --git a/Build/source/texk/web2c/uptexdir/uptriptest.test b/Build/source/texk/web2c/uptexdir/uptriptest.test
index b58cd8a0cf4..85055eb40c8 100755
--- a/Build/source/texk/web2c/uptexdir/uptriptest.test
+++ b/Build/source/texk/web2c/uptexdir/uptriptest.test
@@ -4,12 +4,12 @@
 # Copyright 2011-2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-BinDir=${BinDir:-..}
+W2CDir=${W2CDir:-..}
 ExeExt=${ExeExt:-}
-_uptex=$BinDir/uptex$ExeExt
-_pltotf=$BinDir/pltotf$ExeExt
-_tftopl=$BinDir/tftopl$ExeExt
-_dvitype=$BinDir/dvitype$ExeExt
+_uptex=$W2CDir/uptex$ExeExt
+_pltotf=$W2CDir/pltotf$ExeExt
+_tftopl=$W2CDir/tftopl$ExeExt
+_dvitype=$W2CDir/dvitype$ExeExt
 
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
diff --git a/Build/source/texk/web2c/uptexdir/upver.test b/Build/source/texk/web2c/uptexdir/upver.test
index 812c7efcccc..95ed4e458cd 100755
--- a/Build/source/texk/web2c/uptexdir/upver.test
+++ b/Build/source/texk/web2c/uptexdir/upver.test
@@ -15,22 +15,22 @@ 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 -n 's/^This is \([-A-Za-z]*\), Version [^-]*-\([^ ]*\) \(.*\)/\1 \2/p' \
-  upver1-term.log >upver1-term_ed.log || exit 1
+  upver1-term.log >upver1-term_ed.log || exit 2
 sed -n '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
+  upver1-log.log >upver1-log_ed.log || exit 3
+diff upver1-term_ed.log upver1-log_ed.log || exit 4
 
 # check consistency between runtime and version output
-$_uptex -version >upver2-self.log || exit 1
+$_uptex -version >upver2-self.log || exit 5
 sed -n '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
+  upver2-self.log >upver2-self_ed.log || exit 6
+diff upver1-term_ed.log upver2-self_ed.log || exit 7
 
 # check consistency between version output and version primitives
-$_uptex -ini -interaction batchmode -jobname upver2-prim pver2.tex || exit 1
+$_uptex -ini -interaction batchmode -jobname upver2-prim pver2.tex || exit 8
 sed -n '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
+  upver2-prim.log >upver2-prim_ed.log || exit 9
+diff upver2-self_ed.log upver2-prim_ed.log || exit 10
 
 exit 0