texlive[67983] Build/source/texk/web2c: mplib, {,u}pmpost: Make

commits+takuji at tug.org commits+takuji at tug.org
Sat Aug 19 17:10:30 CEST 2023


Revision: 67983
          http://tug.org/svn/texlive?view=revision&revision=67983
Author:   takuji
Date:     2023-08-19 17:10:30 +0200 (Sat, 19 Aug 2023)
Log Message:
-----------
mplib, {,u}pmpost: Make easier to test on Windows

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/mplibdir/ChangeLog
    trunk/Build/source/texk/web2c/mplibdir/dvitomp.test
    trunk/Build/source/texk/web2c/mplibdir/mptraptest.test
    trunk/Build/source/texk/web2c/pmpostdir/ChangeLog
    trunk/Build/source/texk/web2c/pmpostdir/pmpost.test
    trunk/Build/source/texk/web2c/pmpostdir/pmpsamp.test
    trunk/Build/source/texk/web2c/pmpostdir/upmpost.test
    trunk/Build/source/texk/web2c/pmpostdir/upmpsamp.test

Modified: trunk/Build/source/texk/web2c/mplibdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/ChangeLog	2023-08-19 15:10:25 UTC (rev 67982)
+++ trunk/Build/source/texk/web2c/mplibdir/ChangeLog	2023-08-19 15:10:30 UTC (rev 67983)
@@ -1,3 +1,8 @@
+2023-08-20  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* {dvitomp,mptraptest}.test:
+	Make easier to test on Windows.
+
 2023-03-09  Karl Berry  <karl at tug.org>
 	* TL'23 release.
 

Modified: trunk/Build/source/texk/web2c/mplibdir/dvitomp.test
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/dvitomp.test	2023-08-19 15:10:25 UTC (rev 67982)
+++ trunk/Build/source/texk/web2c/mplibdir/dvitomp.test	2023-08-19 15:10:30 UTC (rev 67983)
@@ -3,6 +3,10 @@
 # Copyright 2009-2012 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_mpost=$BinDir/mpost$ExeExt
+
 test -d tests || mkdir -p tests
 
 if tfmpath=`$KPSEWHICH cmbx10.tfm`; then
@@ -9,7 +13,7 @@
 
   TEXMFCNF=$srcdir/../kpathsea \
     TFMFONTS=`dirname "$tfmpath"` \
-    ./mpost --dvitomp $srcdir/tests/story.dvi tests/xstory.mpx || exit 1
+    $_mpost --dvitomp $srcdir/tests/story.dvi tests/xstory.mpx || exit 1
 
 fi
 
@@ -16,6 +20,6 @@
 TEXMFCNF=$srcdir/../kpathsea \
   TFMFONTS=$srcdir/tests \
   VFFONTS=$srcdir/tests: \
-  ./mpost --dvitomp $srcdir/tests/ptmr ptmr.mpx && \
+  $_mpost --dvitomp $srcdir/tests/ptmr ptmr.mpx && \
   mv ptmr.mpx tests/xptmr.mpx || exit 1
 

Modified: trunk/Build/source/texk/web2c/mplibdir/mptraptest.test
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/mptraptest.test	2023-08-19 15:10:25 UTC (rev 67982)
+++ trunk/Build/source/texk/web2c/mplibdir/mptraptest.test	2023-08-19 15:10:30 UTC (rev 67983)
@@ -1,6 +1,11 @@
 #! /bin/sh -vx
 # Public domain.
 
+BinDir=${BinDir:-..}
+ExeExt=${ExeExt:-}
+_mpost=$BinDir/mpost$ExeExt
+_pltotf=$BinDir/pltotf$ExeExt
+
 testdir=$abs_srcdir/triptrap
 
 TEXMFCNF=$testdir; export TEXMFCNF
@@ -16,12 +21,12 @@
 
 set -x
 
-../pltotf $testdir/trapf.pl trapf.tfm
+$_pltotf $testdir/trapf.pl trapf.tfm
 
 # get same filename in log
 $LN_S $testdir/mtrap.mp . || exit 1
 
-../mpost --ini mtrap
+$_mpost --ini mtrap
 diff $testdir/mtrap.log mtrap.log
 diff $testdir/mtrap.0 mtrap.0
 diff $testdir/mtrap.1 mtrap.1
@@ -32,7 +37,7 @@
 $LN_S $testdir/trap.mpx . || exit 1
 
 ## Why is --jobname required? And why --ini?
-../mpost --ini --jobname=trap <$testdir/mptrap1.in >mptrapin.fot
+$_mpost --ini --jobname=trap <$testdir/mptrap1.in >mptrapin.fot
 mv trap.log mptrapin.log || exit 1
 diff $testdir/mptrapin.log mptrapin.log
 

Modified: trunk/Build/source/texk/web2c/pmpostdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pmpostdir/ChangeLog	2023-08-19 15:10:25 UTC (rev 67982)
+++ trunk/Build/source/texk/web2c/pmpostdir/ChangeLog	2023-08-19 15:10:30 UTC (rev 67983)
@@ -1,3 +1,8 @@
+2023-08-20  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* {,u}{pmpost,pmpsamp}.test:
+	Make easier to test on Windows.
+
 2023-03-09  Karl Berry  <karl at tug.org>
 
 	* TL'23 release.

Modified: trunk/Build/source/texk/web2c/pmpostdir/pmpost.test
===================================================================
--- trunk/Build/source/texk/web2c/pmpostdir/pmpost.test	2023-08-19 15:10:25 UTC (rev 67982)
+++ trunk/Build/source/texk/web2c/pmpostdir/pmpost.test	2023-08-19 15:10:30 UTC (rev 67983)
@@ -4,11 +4,15 @@
 # Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
-./pmpost -version || exit 1
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_pmpost=$BinDir/pmpost$ExeExt
 
-./pmpost -help || exit 1
+$_pmpost -version || exit 1
 
-./pmpost -dvitomp -version || exit 1
+$_pmpost -help || exit 2
 
-./pmpost -dvitomp -help || exit 1
+$_pmpost -dvitomp -version || exit 3
 
+$_pmpost -dvitomp -help || exit 4
+

Modified: trunk/Build/source/texk/web2c/pmpostdir/pmpsamp.test
===================================================================
--- trunk/Build/source/texk/web2c/pmpostdir/pmpsamp.test	2023-08-19 15:10:25 UTC (rev 67982)
+++ trunk/Build/source/texk/web2c/pmpostdir/pmpsamp.test	2023-08-19 15:10:30 UTC (rev 67983)
@@ -4,6 +4,11 @@
 # Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_pmpost=$BinDir/pmpost$ExeExt
+_eptex=$BinDir/eptex$ExeExt
+
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
 tests=pmpostdir/tests
@@ -30,13 +35,13 @@
 export TEXMFCNF TFMFONTS MPINPUTS TEXFONTMAPS T1FONTS VFFONTS
 
 # check that we have eptex at all.
-eptex -version >/dev/null 2>&1 || exit 77
+$_eptex -version >/dev/null 2>&1 || exit 77
 
 # ensure that eptex.fmt exists and can be read.
-eptex \\end >/dev/null 2>&1 || exit 77
+$_eptex \\end >/dev/null 2>&1 || exit 77
 
 echo 'input plain;' >pmpsamp.mp
 cat "$srcdir/$tests/psample.mp" >>pmpsamp.mp
 
-./pmpost -ini -kanji=utf8 -tex=eptex pmpsamp || exit 1
+$_pmpost -ini -kanji=utf8 -tex=eptex pmpsamp || exit 1
 

Modified: trunk/Build/source/texk/web2c/pmpostdir/upmpost.test
===================================================================
--- trunk/Build/source/texk/web2c/pmpostdir/upmpost.test	2023-08-19 15:10:25 UTC (rev 67982)
+++ trunk/Build/source/texk/web2c/pmpostdir/upmpost.test	2023-08-19 15:10:30 UTC (rev 67983)
@@ -4,11 +4,15 @@
 # Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
-./upmpost -version || exit 1
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_upmpost=$BinDir/upmpost$ExeExt
 
-./upmpost -help || exit 1
+$_upmpost -version || exit 1
 
-./upmpost -dvitomp -version || exit 1
+$_upmpost -help || exit 2
 
-./upmpost -dvitomp -help || exit 1
+$_upmpost -dvitomp -version || exit 3
 
+$_upmpost -dvitomp -help || exit 4
+

Modified: trunk/Build/source/texk/web2c/pmpostdir/upmpsamp.test
===================================================================
--- trunk/Build/source/texk/web2c/pmpostdir/upmpsamp.test	2023-08-19 15:10:25 UTC (rev 67982)
+++ trunk/Build/source/texk/web2c/pmpostdir/upmpsamp.test	2023-08-19 15:10:30 UTC (rev 67983)
@@ -4,6 +4,11 @@
 # Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_upmpost=$BinDir/upmpost$ExeExt
+_euptex=$BinDir/euptex$ExeExt
+
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
 tests=pmpostdir/tests
@@ -29,14 +34,14 @@
 
 export TEXMFCNF TFMFONTS MPINPUTS TEXFONTMAPS T1FONTS VFFONTS
 
-# check that we have euptex at all. 
-euptex -version >/dev/null 2>&1 || exit 77
+# check that we have euptex at all.
+$_euptex -version >/dev/null 2>&1 || exit 77
 
-# ensure that euptex.fmt exists and can be read. 
-euptex \\end >/dev/null 2>&1 || exit 77 
+# ensure that euptex.fmt exists and can be read.
+$_euptex \\end >/dev/null 2>&1 || exit 77
 
 echo 'input plain;' >upmpsamp.mp
 cat "$srcdir/$tests/psample.mp" >>upmpsamp.mp
 
-./upmpost -ini -tex=euptex upmpsamp || exit 1
+$_upmpost -ini -tex=euptex upmpsamp || exit 1
 



More information about the tex-live-commits mailing list.