From 287a8aba69a5e806a7b0f04caa037daf2c0a2db3 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sun, 20 Aug 2023 14:27:19 +0000 Subject: bibtex: Make easier to test on Windows git-svn-id: svn://tug.org/texlive/trunk@67993 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 6 ++++-- Build/source/texk/web2c/bibtex.test | 8 ++++++-- Build/source/texk/web2c/tests/bibtex-auxinclude.test | 6 +++++- Build/source/texk/web2c/tests/bibtex-bigauth.test | 6 +++++- Build/source/texk/web2c/tests/bibtex-mem.test | 6 +++++- Build/source/texk/web2c/tests/tex-closeout.test | 6 +++++- 6 files changed, 30 insertions(+), 8 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index f0e34b42b85..27cb798947a 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,7 +1,9 @@ 2023-08-20 TANAKA Takuji - * mftraptest.test, - * triptest.test: Filter Web2C year in banner. + * {mftraptest,triptest}.test: + Filter Web2C year in banner. + * {mftraptest,triptest,bibtex}.test, + tests/{bibtex-{auxinclude,bibauth,mem},tex-closeout}.test: Make easier to test on Windows. * Makefile.in: Add tests {,e}uptexdir/wcfname0.test. diff --git a/Build/source/texk/web2c/bibtex.test b/Build/source/texk/web2c/bibtex.test index 53e80435d69..7698ec245df 100755 --- a/Build/source/texk/web2c/bibtex.test +++ b/Build/source/texk/web2c/bibtex.test @@ -4,16 +4,20 @@ # Copyright 2009 Peter Breitenlohner # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_bibtex=$BinDir/bibtex$ExeExt + test -d tests || mkdir -p tests rm -f tests/xexampl.* -./bibtex -version || exit 100 +$_bibtex -version || exit 100 cp $srcdir/tests/exampl.aux tests/xexampl.aux TEXMFCNF=$srcdir/../kpathsea \ BSTINPUTS=$srcdir/tests \ BIBINPUTS=$srcdir/tests \ - ./bibtex tests/xexampl || exit 1 + $_bibtex tests/xexampl || exit 1 diff $srcdir/tests/exampl.bbl tests/xexampl.bbl || exit 2 diff --git a/Build/source/texk/web2c/tests/bibtex-auxinclude.test b/Build/source/texk/web2c/tests/bibtex-auxinclude.test index 39e004b6a85..961f4b0a659 100755 --- a/Build/source/texk/web2c/tests/bibtex-auxinclude.test +++ b/Build/source/texk/web2c/tests/bibtex-auxinclude.test @@ -3,6 +3,10 @@ # Copyright 2018 Karl Berry # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_bibtex=$BinDir/bibtex$ExeExt + test -d tests || mkdir -p tests # in case we're invoked standalone instead of from make. @@ -19,4 +23,4 @@ cp $srcdir/tests/auxinclude2.aux tests/auxinclude2.aux || exit 1 TEXMFCNF=$srcdir/../kpathsea \ BSTINPUTS=$srcdir/tests \ BIBINPUTS=$srcdir/tests \ - ./bibtex tests/xauxinclude || exit 1 + $_bibtex tests/xauxinclude || exit 1 diff --git a/Build/source/texk/web2c/tests/bibtex-bigauth.test b/Build/source/texk/web2c/tests/bibtex-bigauth.test index 7e7dc06f36e..e3dc3a8b806 100755 --- a/Build/source/texk/web2c/tests/bibtex-bigauth.test +++ b/Build/source/texk/web2c/tests/bibtex-bigauth.test @@ -3,6 +3,10 @@ # Copyright 2019 Karl Berry # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_bibtex=$BinDir/bibtex$ExeExt + test -d tests || mkdir -p tests # in case we're invoked standalone instead of from make. @@ -21,7 +25,7 @@ cp $srcdir/tests/bibtex-bigauth.aux tests/xbigauth.aux || exit 1 TEXMFCNF=$srcdir/../kpathsea \ BSTINPUTS=$srcdir/../tests/texmf \ BIBINPUTS=$srcdir/tests \ - ./bibtex tests/xbigauth || exit 1 + $_bibtex tests/xbigauth || exit 1 # the final author, in case glob_str_size is insufficient. grep MeerKAT tests/xbigauth.bbl >/dev/null || exit 1 diff --git a/Build/source/texk/web2c/tests/bibtex-mem.test b/Build/source/texk/web2c/tests/bibtex-mem.test index 2b07162cae7..7f33c81c1dc 100755 --- a/Build/source/texk/web2c/tests/bibtex-mem.test +++ b/Build/source/texk/web2c/tests/bibtex-mem.test @@ -6,6 +6,10 @@ # Using test data from Philipp Lehman +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_bibtex=$BinDir/bibtex$ExeExt + test -d tests || mkdir -p tests # Create bib data @@ -64,7 +68,7 @@ for t in 1 2 3; do TEXMFCNF=$srcdir/../kpathsea \ BSTINPUTS=$srcdir/tests \ BIBINPUTS=./tests \ - ./bibtex tests/memtest$t || exit 1 + $_bibtex tests/memtest$t || exit $t done diff --git a/Build/source/texk/web2c/tests/tex-closeout.test b/Build/source/texk/web2c/tests/tex-closeout.test index c510313fa61..a29e8a6467d 100755 --- a/Build/source/texk/web2c/tests/tex-closeout.test +++ b/Build/source/texk/web2c/tests/tex-closeout.test @@ -3,13 +3,17 @@ # Copyright 2019 Karl Berry # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_tex=$BinDir/tex$ExeExt + # in case we're invoked standalone instead of from make. test -z "$srcdir" && srcdir=`cd \`dirname $0\`/.. && pwd` # web2c/ TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF # Resulted in a double free with glibc on x86_64-linux. fail=2 -./tex -ini '\batchmode \immediate\openout1=b \openout1=/tmp/a \end' +$_tex -ini '\batchmode \immediate\openout1=b \openout1=/tmp/a \end' # If TeX crashed, we won't get here. The exit status will be something # like 134 on GNU/Linux, but we don't want to rely on that. -- cgit v1.2.3