makeindex: Make easier to test on Windows

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

2 files changed, 17 insertions, 9 deletions

diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog
index 4a87e0759d5..382de5cb8f3 100644
--- a/Build/source/texk/makeindexk/ChangeLog
+++ b/Build/source/texk/makeindexk/ChangeLog
@@ -1,3 +1,7 @@
+2023-08-27  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* tests/makeindex.test: Make easier to test on Windows.
+
 2022-05-22  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* scanid.c:
diff --git a/Build/source/texk/makeindexk/tests/makeindex.test b/Build/source/texk/makeindexk/tests/makeindex.test
index 5df437c638c..cbf951c0bbe 100755
--- a/Build/source/texk/makeindexk/tests/makeindex.test
+++ b/Build/source/texk/makeindexk/tests/makeindex.test
@@ -4,23 +4,27 @@
 # Copyright 2012 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_makeindex=$BinDir/makeindex$ExeExt
+
 TEXMFCNF=$srcdir/../kpathsea
 export TEXMFCNF
 
 rm -f sample.* range*.* pprec*.* romalp*.*
 rc=0
 
-./makeindex $srcdir/tests/sample.idx -o sample.ind1 -t sample.ilg1 \
+$_makeindex $srcdir/tests/sample.idx -o sample.ind1 -t sample.ilg1 \
 	&& diff $srcdir/tests/sample.ind sample.ind1 || rc=1
 
-cat $srcdir/tests/sample.idx | ./makeindex >sample.ind2 2>sample.ilg2 \
+cat $srcdir/tests/sample.idx | $_makeindex >sample.ind2 2>sample.ilg2 \
 	&& diff $srcdir/tests/sample.ind sample.ind2 || rc=2
 
 
 # test for range suffix_2p, suffix_3p, suffix_mp
 
 for num in 1 2 3; do
-./makeindex -s $srcdir/tests/range$num.ist $srcdir/tests/range.idx \
+$_makeindex -s $srcdir/tests/range$num.ist $srcdir/tests/range.idx \
 	-o range$num.ind1 -t range$num.ilg \
 	&& diff $srcdir/tests/range$num.ind range$num.ind1 || rc=3
 done
@@ -30,13 +34,13 @@ done
 
 sfx=A
 for num in 0 1 2; do
-./makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/pprec$sfx.idx \
+$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/pprec$sfx.idx \
 	-o pprec$sfx-$num.ind1 -t pprec$sfx-$num.ilg \
 	&& diff $srcdir/tests/pprec$sfx-$num.ind pprec$sfx-$num.ind1 || rc=4
 done
 sfx=B
 for num in 0 3 4; do
-./makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/pprec$sfx.idx \
+$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/pprec$sfx.idx \
 	-o pprec$sfx-$num.ind1 -t pprec$sfx-$num.ilg \
 	&& diff $srcdir/tests/pprec$sfx-$num.ind pprec$sfx-$num.ind1 || rc=5
 done
@@ -46,25 +50,25 @@ done
 
 sfx=A
 for num in 5 6; do
-./makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
+$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
 	-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
 	&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=6
 done
 sfx=B
 for num in 5 6 7; do
-./makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
+$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
 	-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
 	&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=7
 done
 sfx=C
 for num in 5; do
-./makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
+$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
 	-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
 	&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=8
 done
 sfx=D
 for num in 5 6 7; do
-./makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
+$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
 	-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
 	&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=9
 done