diff options
author | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-08-11 14:25:13 +0000 |
---|---|---|
committer | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-08-11 14:25:13 +0000 |
commit | 5757a53cfcfc259bee001ed4fe1302532159ace6 (patch) | |
tree | 846796bfa4e773832eeef5f7c09ea74bb568af51 /Build/source | |
parent | 37738fa55c1522f3e3214688c153a5168b640fa3 (diff) |
dvipdfm-x: Avoid compiler warning on MinGW
git-svn-id: svn://tug.org/texlive/trunk@67884 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/dpxfile.c | 2 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test | 18 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-ann.test | 8 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-bad.test | 8 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-bb.test | 16 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test | 8 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-psz.test | 12 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test | 12 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-res.test | 8 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-rev.test | 8 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test | 8 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfmx.test | 16 |
13 files changed, 92 insertions, 39 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 4af3f02b65f..a10a1ece76d 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,10 @@ +2023-08-11 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * dpxfile.c: Avoid compiler warning on MinGW. + * xdvipdfm-{ann,bad,bb,bkm,psz,ptx,res,rev,ttc}.test, + xdvipdfmx.test, dvipdfmx-upjf.test: + Make easier to test on Windows. + 2023-07-08 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * cidtype0.c, pdffont.c: diff --git a/Build/source/texk/dvipdfm-x/dpxfile.c b/Build/source/texk/dvipdfm-x/dpxfile.c index 2ffa2460498..895b085f180 100644 --- a/Build/source/texk/dvipdfm-x/dpxfile.c +++ b/Build/source/texk/dvipdfm-x/dpxfile.c @@ -160,6 +160,8 @@ static char _tmpbuf[PATH_MAX+1]; #endif /* MIKTEX */ #if defined(_WIN32) +#undef stat +#define stat _stat extern int utf8name_failed; int fsyscp_stat(const char *path, struct stat *buffer) { diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test b/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test index 88a007a4750..a543d9bbdb1 100755 --- a/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test +++ b/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test @@ -3,6 +3,10 @@ # Copyright 2020-2023 Japanese TeX Development Community <issue@texjp.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TFMFONTS=".;$srcdir/tests;$srcdir/data" T1FONTS="$srcdir/tests;$srcdir/data" @@ -20,7 +24,7 @@ rm -f upjf.vf upjv.vf upjf-g.ofm upjv-g.ofm upjf-r.ofm upjv-r.ofm upjf-r.tfm echo "*** dvipdfmx: test for upjf_full.pdf" && echo \ && cp $srcdir/tests/upjf_full.vf ./upjf.vf \ && cp $srcdir/tests/upjv_full.vf ./upjv.vf \ - && ./xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf.pdf $srcdir/tests/upjf.dvi \ + && $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf.pdf $srcdir/tests/upjf.dvi \ && mv ./upjf.pdf ./upjf_full.pdf \ && echo && echo "dvipdfmx-upjf-vf_full tests OK" && echo \ || failed="$failed dvipdfmx-upjf-vf_full" @@ -30,7 +34,7 @@ echo "*** dvipdfmx: test for upjf_omit.pdf" && echo \ && cp $srcdir/tests/upjv_omit.vf ./upjv.vf \ && cp $srcdir/tests/upjf-g00.ofm ./upjf-g.ofm \ && cp $srcdir/tests/upjv-g00.ofm ./upjv-g.ofm \ - && ./xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf.pdf $srcdir/tests/upjf.dvi \ + && $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf.pdf $srcdir/tests/upjf.dvi \ && mv ./upjf.pdf ./upjf_omit.pdf \ && echo && echo "dvipdfmx-upjf-vf_omit tests OK" && echo \ || failed="$failed dvipdfmx-upjf-vf_omit" @@ -40,7 +44,7 @@ cmp ./upjf_full.pdf ./upjf_omit.pdf || failed="$failed dvipdfmx-upjf-cmp" echo "*** dvipdfmx: test for upjf_omit2.pdf" && echo \ && cp $srcdir/tests/upjf-r00.ofm ./upjf-r.ofm \ && cp $srcdir/tests/upjv-r00.ofm ./upjv-r.ofm \ - && ./xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf.pdf $srcdir/tests/upjf.dvi \ + && $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf.pdf $srcdir/tests/upjf.dvi \ && mv ./upjf.pdf ./upjf_omit2.pdf \ && echo && echo "dvipdfmx-upjf-vf_omit2 tests OK" && echo \ || failed="$failed dvipdfmx-upjf-vf_omit2" @@ -54,7 +58,7 @@ echo "*** dvipdfmx: test for upjf1_full.pdf" && echo \ && cp $srcdir/tests/upjf1_full.vf ./upjf.vf \ && cp $srcdir/tests/upjv_full.vf ./upjv.vf \ && cp $srcdir/tests/upjf1-r.tfm ./upjf-r.tfm \ - && ./xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf1.pdf $srcdir/tests/upjf.dvi \ + && $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf1.pdf $srcdir/tests/upjf.dvi \ && mv ./upjf1.pdf ./upjf1_full.pdf \ && echo && echo "dvipdfmx-upjf1-vf_full tests OK" && echo \ || failed="$failed dvipdfmx-upjf1-vf_full" @@ -62,7 +66,7 @@ echo "*** dvipdfmx: test for upjf1_full.pdf" && echo \ echo "*** dvipdfmx: test for upjf1_omit.pdf" && echo \ && cp $srcdir/tests/upjf1_omit.vf ./upjf.vf \ && cp $srcdir/tests/upjv_omit.vf ./upjv.vf \ - && ./xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf1.pdf $srcdir/tests/upjf.dvi \ + && $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf1.pdf $srcdir/tests/upjf.dvi \ && mv ./upjf1.pdf ./upjf1_omit.pdf \ && echo && echo "dvipdfmx-upjf1-vf_omit tests OK" && echo \ || failed="$failed dvipdfmx-upjf1-vf_omit" @@ -74,12 +78,12 @@ rm -f upjf-r.tfm echo "*** dvipdfmx: test for upjf1_omit2.pdf" && echo \ && cp $srcdir/tests/upjf-r00.ofm ./upjf-r.ofm \ && cp $srcdir/tests/upjv-r00.ofm ./upjv-r.ofm \ - && ./xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf1.pdf $srcdir/tests/upjf.dvi \ + && $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf.map -o upjf1.pdf $srcdir/tests/upjf.dvi \ && mv ./upjf1.pdf ./upjf1_omit2.pdf \ && echo && echo "dvipdfmx-upjf1-vf_omit2 tests OK" && echo \ || failed="$failed dvipdfmx-upjf1-vf_omit2" -cmp ./upjf1_full.pdf ./upjf1_omit2.pdf || failed="$failed dvipdfmx-upjf1-cmp" +cmp ./upjf1_full.pdf ./upjf1_omit2.pdf || failed="$failed dvipdfmx-upjf1-cmp2" test -z "$failed" && exit 0 diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-ann.test b/Build/source/texk/dvipdfm-x/xdvipdfm-ann.test index c80a06848a2..96c033fea98 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-ann.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-ann.test @@ -4,6 +4,10 @@ # Copyright 2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TFMFONTS="$srcdir/tests;$srcdir/data" T1FONTS="$srcdir/tests;$srcdir/data" @@ -15,9 +19,9 @@ export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS failed= echo "*** xdvipdfmx -v -z0 -o annot2.pdf annot" && echo \ - && ./xdvipdfmx -v -z0 -o annot2.pdf $srcdir/tests/annot \ + && $_xdvipdfmx -v -z0 -o annot2.pdf $srcdir/tests/annot \ && echo && echo "xdvipdfmx-ann tests OK" && echo \ - || failed="$failed xdvipdfmx-ann" + || failed="$failed xdvipdfmx-ann" test -z "$failed" && exit 0 echo diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-bad.test b/Build/source/texk/dvipdfm-x/xdvipdfm-bad.test index c35230a65e9..08ed561ffff 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-bad.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-bad.test @@ -4,6 +4,10 @@ # Copyright 2015 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TFMFONTS="$srcdir/tests;$srcdir/data" T1FONTS="$srcdir/tests;$srcdir/data" @@ -20,12 +24,12 @@ for f in $list do echo "*** xdvipdfmx -v -z0 -o bad.pdf $f" && echo \ - && ./xdvipdfmx -v -z0 -o bad.pdf $srcdir/tests/$f \ + && $_xdvipdfmx -v -z0 -o bad.pdf $srcdir/tests/$f \ && failed="$failed xdvipdfmx-$f" \ || { echo && echo "xdvipdfmx-$f tests OK" && echo; } echo "*** xdvipdfmx -v -z0 -o bad.pdf <$f.dvi" && echo \ - && ./xdvipdfmx -v -z0 -o bad.pdf <$srcdir/tests/$f.dvi \ + && $_xdvipdfmx -v -z0 -o bad.pdf <$srcdir/tests/$f.dvi \ && failed="$failed xdvipdfmx-$f (stdin)" \ || { echo && echo "xdvipdfmx-$f (stdin) tests OK" && echo; } diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test b/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test index 3b203eda04e..ab46925c8e4 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test @@ -4,6 +4,10 @@ # Copyright 2013, 2014 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF DVIPDFMXINPUTS=$srcdir/tests:$srcdir/data; export DVIPDFMXINPUTS @@ -22,19 +26,19 @@ for e in $ext; do done echo "*** xdvipdfmx --ebb --version" \ - && ./xdvipdfmx --ebb --version \ + && $_xdvipdfmx --ebb --version \ && echo && echo "ebb-version tests OK" && echo \ || failed="$failed ebb-version" echo "*** xdvipdfmx --ebb --help" \ - && ./xdvipdfmx --ebb --help \ + && $_xdvipdfmx --ebb --help \ && echo && echo "ebb-help tests OK" && echo \ || failed="$failed ebb-help" # get rid of both %%Creator: and %%CreationDate: lines. for e in $ext; do echo "*** xdvipdfmx --ebb pic$e.$e" \ - && ./xdvipdfmx --ebb pic$e.$e \ + && $_xdvipdfmx --ebb pic$e.$e \ && sed '/^%%Creat/d' pic$e.bb >pic$e.bbx \ && diff $testsrc/pic$e.bb pic$e.bbx \ && echo && echo "ebb-$e tests OK" && echo \ @@ -42,18 +46,18 @@ for e in $ext; do done echo "*** xdvipdfmx --xbb --version" \ - && ./xdvipdfmx --xbb --version \ + && $_xdvipdfmx --xbb --version \ && echo && echo "xbb-version tests OK" && echo \ || failed="$failed xbb-version" echo "*** xdvipdfmx --xbb --help" \ - && ./xdvipdfmx --xbb --help \ + && $_xdvipdfmx --xbb --help \ && echo && echo "xbb-help tests OK" && echo \ || failed="$failed xbb-help" for e in $ext; do echo "*** xdvipdfmx --xbb img$e.$e" \ - && ./xdvipdfmx --xbb pic$e.$e \ + && $_xdvipdfmx --xbb pic$e.$e \ && sed '/^%%Creat/d' pic$e.xbb >pic$e.xbbx \ && diff $testsrc/pic$e.xbb pic$e.xbbx \ && echo && echo "xbb-$e tests OK" && echo \ diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test b/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test index 5a5e62bdde6..d14e45a01bb 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test @@ -4,6 +4,10 @@ # Copyright 2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TFMFONTS="$srcdir/tests;$srcdir/data" T1FONTS="$srcdir/tests;$srcdir/data" @@ -15,9 +19,9 @@ export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS failed= echo "*** xdvipdfmx -v -z0 -o bookm2.pdf bookm" && echo \ - && ./xdvipdfmx -v -z0 -o bookm2.pdf $srcdir/tests/bookm \ + && $_xdvipdfmx -v -z0 -o bookm2.pdf $srcdir/tests/bookm \ && echo && echo "xdvipdfmx-bkm tests OK" && echo \ - || failed="$failed xdvipdfmx-bkm" + || failed="$failed xdvipdfmx-bkm" test -z "$failed" && exit 0 echo diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-psz.test b/Build/source/texk/dvipdfm-x/xdvipdfm-psz.test index 7825a41c4d8..06c90cdbae6 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-psz.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-psz.test @@ -4,6 +4,10 @@ # Copyright 2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TFMFONTS="$srcdir/tests;$srcdir/data" T1FONTS="$srcdir/tests;$srcdir/data" @@ -15,14 +19,14 @@ export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS failed= echo "*** xdvipdfmx -v -m 1.0 -o paper2.pdf <paper.dvi" && echo \ - && ./xdvipdfmx -v -m 1.0 -o paper2.pdf <$srcdir/tests/paper.dvi \ + && $_xdvipdfmx -v -m 1.0 -o paper2.pdf <$srcdir/tests/paper.dvi \ && echo && echo "xdvipdfmx-paper tests OK" && echo \ - || failed="$failed xdvipdfmx-paper" + || failed="$failed xdvipdfmx-paper" echo "*** xdvipdfmx -v -m 1.4 -o - paper >paper2m.pdf" && echo \ - && ./xdvipdfmx -v -m 1.4 -o - $srcdir/tests/paper >paper2m.pdf \ + && $_xdvipdfmx -v -m 1.4 -o - $srcdir/tests/paper >paper2m.pdf \ && echo && echo "xdvipdfmx-paper-mag tests OK" && echo \ - || failed="$failed xdvipdfmx-paper-mag" + || failed="$failed xdvipdfmx-paper-mag" test -z "$failed" && exit 0 echo diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test b/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test index 319139bb4a2..1242f9793cb 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test @@ -4,6 +4,10 @@ # Copyright 2015 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TFMFONTS="$srcdir/tests;$srcdir/data" T1FONTS="$srcdir/tests;$srcdir/data" @@ -15,14 +19,14 @@ export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS failed= echo "*** xdvipdfmx -v -z0 -o ptex1.pdf ptex" && echo \ - && ./xdvipdfmx -v -z0 -o ptex1.pdf $srcdir/tests/ptex \ + && $_xdvipdfmx -v -z0 -o ptex1.pdf $srcdir/tests/ptex \ && echo && echo "xdvipdfmx-ptex tests OK" && echo \ - || failed="$failed xdvipdfmx-ptex" + || failed="$failed xdvipdfmx-ptex" echo "*** xdvipdfmx -v -z0 <ptex.dvi >ptex2.pdf" && echo \ - && ./xdvipdfmx -v -z0 <$srcdir/tests/ptex.dvi >ptex2.pdf \ + && $_xdvipdfmx -v -z0 <$srcdir/tests/ptex.dvi >ptex2.pdf \ && echo && echo "xdvipdfmx-ptex (stdin->stdout) tests OK" && echo \ - || failed="$failed xdvipdfmx-ptex (stdin->stdout)" + || failed="$failed xdvipdfmx-ptex (stdin->stdout)" test -z "$failed" && exit 0 echo diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-res.test b/Build/source/texk/dvipdfm-x/xdvipdfm-res.test index b249a8af068..3ca763a2eb4 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-res.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-res.test @@ -4,6 +4,10 @@ # Copyright 2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TFMFONTS="$srcdir/tests;$srcdir/data" T1FONTS="$srcdir/tests;$srcdir/data" @@ -15,9 +19,9 @@ export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS failed= echo "*** xdvipdfmx -v -z0 -o resrc2.pdf resrc" && echo \ - && ./xdvipdfmx -v -z0 -o resrc2.pdf $srcdir/tests/resrc \ + && $_xdvipdfmx -v -z0 -o resrc2.pdf $srcdir/tests/resrc \ && echo && echo "xdvipdfmx-res tests OK" && echo \ - || failed="$failed xdvipdfmx-res" + || failed="$failed xdvipdfmx-res" test -z "$failed" && exit 0 echo diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test b/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test index 6aa3d7de55b..465607ebe12 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test @@ -4,6 +4,10 @@ # Copyright 2015 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TFMFONTS="$srcdir/tests;$srcdir/data" T1FONTS="$srcdir/tests;$srcdir/data" @@ -15,9 +19,9 @@ export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS failed= echo "*** xdvipdfmx -v -z0 -o reverse.pdf reverse" && echo \ - && ./xdvipdfmx -v -z0 -o reverse.pdf $srcdir/tests/reverse \ + && $_xdvipdfmx -v -z0 -o reverse.pdf $srcdir/tests/reverse \ && echo && echo "xdvipdfmx-reverse tests OK" && echo \ - || failed="$failed xdvipdfmx-reverse" + || failed="$failed xdvipdfmx-reverse" test -z "$failed" && exit 0 echo diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test b/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test index a106d17c205..3f6702ece4b 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test @@ -4,6 +4,10 @@ # Copyright 2015 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TFMFONTS="$srcdir/tests;$srcdir/data" T1FONTS="$srcdir/tests;$srcdir/data" @@ -15,9 +19,9 @@ export TEXMFCNF TFMFONTS T1FONTS TTFONTS TEXFONTMAPS DVIPDFMXINPUTS failed= echo "*** xdvipdfmx -v -z0 -o ttc2.pdf ttc" && echo \ - && ./xdvipdfmx -v -z0 -o ttc2.pdf $srcdir/tests/ttc \ + && $_xdvipdfmx -v -z0 -o ttc2.pdf $srcdir/tests/ttc \ && echo && echo "xdvipdfmx-ttc tests OK" && echo \ - || failed="$failed xdvipdfmx-ttc" + || failed="$failed xdvipdfmx-ttc" test -z "$failed" && exit 0 echo diff --git a/Build/source/texk/dvipdfm-x/xdvipdfmx.test b/Build/source/texk/dvipdfm-x/xdvipdfmx.test index 4d6e7cd92ba..5447ff06d48 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfmx.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfmx.test @@ -4,6 +4,10 @@ # Copyright 2013, 2014 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + TEXMFCNF=$srcdir/../kpathsea TEXFONTMAPS="$srcdir/tests;$srcdir/data" DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data" @@ -15,27 +19,27 @@ export TEXMFCNF TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS TEXFONTS PKFONTS failed= echo "*** xdvipdfmx --version" \ - && ./xdvipdfmx --version \ + && $_xdvipdfmx --version \ && echo && echo "xdvipdfmx-version tests OK" && echo \ || failed="$failed xdvipdfmx-version" echo "*** xdvipdfmx --help" \ - && ./xdvipdfmx --help \ + && $_xdvipdfmx --help \ && echo && echo "xdvipdfmx-help tests OK" && echo \ || failed="$failed xdvipdfmx-help" echo "*** xdvipdfmx --showpaper" \ - && ./xdvipdfmx --showpaper \ + && $_xdvipdfmx --showpaper \ && echo && echo "xdvipdfmx-showpaper tests OK" && echo \ || failed="$failed xdvipdfmx-showpaper" echo "*** xdvipdfmx -v -o image2.pdf image" && echo \ - && ./xdvipdfmx -v -o image2.pdf $srcdir/tests/image \ + && $_xdvipdfmx -v -o image2.pdf $srcdir/tests/image \ && echo && echo "xdvipdfmx-image tests OK" && echo \ - || failed="$failed xdvipdfmx-image" + || failed="$failed xdvipdfmx-image" echo "*** xdvipdfmx -v -o xbmc2.pdf xbmc" && echo \ - && ./xdvipdfmx -v -o xbmc2.pdf $srcdir/tests/xbmc \ + && $_xdvipdfmx -v -o xbmc2.pdf $srcdir/tests/xbmc \ && echo && echo "xdvipdfmx-xbmc tests OK" && echo \ || failed="$failed xdvipdfmx-xbmc" |