2 files changed, 17 insertions, 8 deletions
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index 6ff8ab668de..7c9fcec281b 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-11  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* makejvf.test:
+	Make easier to test on Windows.
+
 2023-02-01  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* uniblock.c: Tweak Unicode blocks.
diff --git a/Build/source/texk/makejvf/makejvf.test b/Build/source/texk/makejvf/makejvf.test
index 7a27e4e5031..e2bb6ab9485 100755
--- a/Build/source/texk/makejvf/makejvf.test
+++ b/Build/source/texk/makejvf/makejvf.test
@@ -4,35 +4,39 @@
 # Copyright 2010-2013 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-./makejvf $srcdir/tests/min10.tfm rml && \
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_makejvf=$BinDir/makejvf$ExeExt
+
+$_makejvf $srcdir/tests/min10.tfm rml && \
   cmp $srcdir/tests/min10.vf min10.vf && \
   cmp $srcdir/tests/rml.tfm rml.tfm || exit 1
 
-./makejvf -m $srcdir/tests/tmin10 rmlv && \
+$_makejvf -m $srcdir/tests/tmin10 rmlv && \
   cmp $srcdir/tests/tmin10.vf tmin10.vf && \
   cmp $srcdir/tests/rmlv.tfm rmlv.tfm || exit 2
 
 # followings are supported in texjporg version
-./makejvf -e -i -u custom -t $srcdir/tests/uni10.cnf $srcdir/tests/testnewu urml && \
+$_makejvf -e -i -u custom -t $srcdir/tests/uni10.cnf $srcdir/tests/testnewu urml && \
   cmp $srcdir/tests/testnewu.vf testnewu.vf && \
   cmp $srcdir/tests/rml.tfm urml.tfm || exit 3
 
-./makejvf -e -i -u custom -t $srcdir/tests/uni10.cnf $srcdir/tests/gkhugeok urml && \
+$_makejvf -e -i -u custom -t $srcdir/tests/uni10.cnf $srcdir/tests/gkhugeok urml && \
   cmp $srcdir/tests/gkhugeok.vf gkhugeok.vf && \
   cmp $srcdir/tests/rml.tfm urml.tfm || exit 4
 
-./makejvf -e $srcdir/tests/skipjfmp rml && \
+$_makejvf -e $srcdir/tests/skipjfmp rml && \
   cmp $srcdir/tests/skipjfmp.vf skipjfmp.vf && \
   cmp $srcdir/tests/rml.tfm rml.tfm || exit 5
 
-./makejvf -e -O $srcdir/tests/skipjfmp rml && \
+$_makejvf -e -O $srcdir/tests/skipjfmp rml && \
   cmp $srcdir/tests/skipjfmp_omit.vf skipjfmp.vf && \
   cmp $srcdir/tests/rml.tfm rml.tfm || exit 6
 
 TEXMFCNF=$srcdir/../kpathsea \
-	./makejvf -k0 -a abc && exit 100
+	$_makejvf -k0 -a abc && exit 100
 
-./makejvf -t $srcdir/tests/uni10.cnf -O $srcdir/tests/skipjfmp rml && \
+$_makejvf -t $srcdir/tests/uni10.cnf -O $srcdir/tests/skipjfmp rml && \
  exit 101
 
 exit 0