From 275b63e13e2dfb447282e27f14bdd50ec62724ec Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 15 Nov 2017 00:36:56 +0000 Subject: use #!/bin/sh -vx for nontrivial shell *.test files, so .log is more useful git-svn-id: svn://tug.org/texlive/trunk@45809 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/ChangeLog | 4 + Build/source/libs/cairo/cairo.test | 7 +- Build/source/libs/gd/libgd.test | 7 +- Build/source/libs/graphite2/graphite2.test | 7 +- Build/source/libs/harfbuzz/harfbuzz.test | 7 +- Build/source/libs/icu/icu.test | 7 +- Build/source/libs/libpaper/paper.test | 7 +- Build/source/libs/libpng/libpng.test | 7 +- Build/source/libs/lua52/luaerror.test | 6 +- Build/source/libs/luajit/luajiterr.test | 6 +- Build/source/libs/pixman/pixman.test | 7 +- Build/source/libs/potrace/potrace.test | 7 +- Build/source/libs/teckit/teckit.test | 7 +- Build/source/libs/zlib/zlib.test | 7 +- Build/source/libs/zziplib/zziplib.test | 7 +- Build/source/texk/afm2pl/afm2pl.test | 7 +- Build/source/texk/bibtex-x/tests/bibtex8-mem.test | 7 +- Build/source/texk/bibtex-x/tests/bibtex8.test | 7 +- Build/source/texk/bibtex-x/tests/bibtexu.test | 7 +- Build/source/texk/bibtex-x/tests/sort.test | 7 +- Build/source/texk/chktex/chktex.test | 7 +- Build/source/texk/cjkutils/bg5conv.test | 7 +- Build/source/texk/cjkutils/cef5conv.test | 7 +- Build/source/texk/cjkutils/cefconv.test | 7 +- Build/source/texk/cjkutils/cefsconv.test | 7 +- Build/source/texk/cjkutils/extconv.test | 7 +- Build/source/texk/cjkutils/sjisconv.test | 7 +- Build/source/texk/detex/detex.test | 7 +- Build/source/texk/dtl/dtl.test | 7 +- Build/source/texk/dvi2tty/disdvi.test | 7 +- Build/source/texk/dvi2tty/dvi2tty.test | 7 +- Build/source/texk/dvidvi/dvidvi.test | 7 +- Build/source/texk/dvipdfm-x/xdvipdfm-ann.test | 7 +- Build/source/texk/dvipdfm-x/xdvipdfm-bad.test | 7 +- Build/source/texk/dvipdfm-x/xdvipdfm-bb.test | 2 +- Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test | 7 +- Build/source/texk/dvipdfm-x/xdvipdfm-psz.test | 7 +- Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test | 7 +- Build/source/texk/dvipdfm-x/xdvipdfm-res.test | 7 +- Build/source/texk/dvipdfm-x/xdvipdfm-rev.test | 7 +- Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test | 7 +- Build/source/texk/dvipdfm-x/xdvipdfmx.test | 7 +- Build/source/texk/dvipng/dvipng.test | 2 +- Build/source/texk/dvipsk/beginfontk1.test | 4 +- Build/source/texk/dvipsk/eepic-nan.test | 4 +- Build/source/texk/dvipsk/pfbincl.test | 4 +- Build/source/texk/dvipsk/same-name.test | 5 +- Build/source/texk/dvipsk/test-dvips.test | 4 +- Build/source/texk/gregorio/gregorio.test | 4 +- Build/source/texk/kpathsea/tests/cnfnewline.test | 4 +- Build/source/texk/kpathsea/tests/kpseaccess.test | 7 +- Build/source/texk/kpathsea/tests/kpsereadlink.test | 7 +- Build/source/texk/kpathsea/tests/kpsestat.test | 7 +- Build/source/texk/kpathsea/tests/kpsewhich.test | 4 +- Build/source/texk/lcdf-typetools/tests/t1.test | 6 +- Build/source/texk/lcdf-typetools/tests/tfm.test | 6 +- Build/source/texk/lcdf-typetools/tests/ttf.test | 6 +- Build/source/texk/makeindexk/tests/makeindex.test | 7 +- Build/source/texk/makejvf/makejvf.test | 7 +- Build/source/texk/mendexk/tests/mendex.test | 7 +- .../source/texk/musixtnt/musixtnt-src/msxlint.test | 6 +- Build/source/texk/ps2pk/tests/lmmath.test | 7 +- Build/source/texk/ps2pk/tests/ps2pk.test | 7 +- Build/source/texk/psutils/psutils.test | 7 +- Build/source/texk/seetexk/seetexk.test | 7 +- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 238 ++++++++++++++------- Build/source/texk/ttf2pk2/tests/ttf2pk.test | 7 +- Build/source/texk/ttfdump/tests/ttfdump.test | 7 +- Build/source/texk/upmendex/tests/upmendex.test | 7 +- Build/source/texk/web2c/alephdir/aleph.test | 7 +- Build/source/texk/web2c/bibtex.test | 7 +- Build/source/texk/web2c/ctiedir/ctie.test | 7 +- Build/source/texk/web2c/cwebdir/cweave.test | 7 +- Build/source/texk/web2c/dvicopy.test | 7 +- Build/source/texk/web2c/dvitype.test | 7 +- Build/source/texk/web2c/eptexdir/eptriptest.test | 9 +- Build/source/texk/web2c/eptexdir/pdfprimitive.test | 7 +- Build/source/texk/web2c/etexdir/etriptest.test | 7 +- Build/source/texk/web2c/etexdir/wprob.test | 7 +- Build/source/texk/web2c/euptexdir/euptriptest.test | 9 +- .../source/texk/web2c/euptexdir/pdfprimitive.test | 7 +- Build/source/texk/web2c/gftodvi.test | 7 +- Build/source/texk/web2c/gftopk.test | 7 +- Build/source/texk/web2c/gftype.test | 7 +- Build/source/texk/web2c/luatexdir/luaimage.test | 6 +- Build/source/texk/web2c/luatexdir/luajitimage.test | 6 +- .../source/texk/web2c/mfluadir/mfluatraptest.test | 6 +- .../texk/web2c/mfluajitdir/mfluajittraptest.test | 6 +- Build/source/texk/web2c/mft.test | 7 +- Build/source/texk/web2c/mftraptest.test | 6 +- Build/source/texk/web2c/mplibdir/dvitomp.test | 6 +- Build/source/texk/web2c/mplibdir/mptraptest.test | 3 +- Build/source/texk/web2c/omegafonts/bad.test | 7 +- Build/source/texk/web2c/omegafonts/charwd.test | 7 +- Build/source/texk/web2c/omegafonts/check.test | 7 +- Build/source/texk/web2c/omegafonts/help.test | 7 +- Build/source/texk/web2c/omegafonts/level1.test | 7 +- Build/source/texk/web2c/omegafonts/ligkern.test | 7 +- Build/source/texk/web2c/omegafonts/ofonts.test | 7 +- Build/source/texk/web2c/omegafonts/omfonts.test | 7 +- Build/source/texk/web2c/omegafonts/overbmp.test | 7 +- Build/source/texk/web2c/omegafonts/realnum.test | 7 +- Build/source/texk/web2c/omegafonts/repeat.test | 7 +- Build/source/texk/web2c/omegafonts/selectfont.test | 7 +- Build/source/texk/web2c/omegafonts/shorten.test | 7 +- Build/source/texk/web2c/omegafonts/specialhex.test | 7 +- Build/source/texk/web2c/omegafonts/version.test | 7 +- Build/source/texk/web2c/omegafonts/yannis.test | 7 +- Build/source/texk/web2c/omegaware/bad.test | 7 +- Build/source/texk/web2c/omegaware/charwd.test | 7 +- Build/source/texk/web2c/omegaware/check.test | 7 +- Build/source/texk/web2c/omegaware/help.test | 7 +- Build/source/texk/web2c/omegaware/level1.test | 7 +- Build/source/texk/web2c/omegaware/ligkern.test | 7 +- Build/source/texk/web2c/omegaware/odvicopy.test | 7 +- Build/source/texk/web2c/omegaware/odvitype.test | 7 +- Build/source/texk/web2c/omegaware/ofonts.test | 7 +- Build/source/texk/web2c/omegaware/omfonts.test | 7 +- Build/source/texk/web2c/omegaware/otangle.test | 7 +- Build/source/texk/web2c/omegaware/overbmp.test | 7 +- Build/source/texk/web2c/omegaware/realnum.test | 7 +- Build/source/texk/web2c/omegaware/repeat.test | 7 +- Build/source/texk/web2c/omegaware/selectfont.test | 7 +- Build/source/texk/web2c/omegaware/shorten.test | 7 +- Build/source/texk/web2c/omegaware/specialhex.test | 7 +- Build/source/texk/web2c/omegaware/version.test | 7 +- Build/source/texk/web2c/omegaware/vrepeat.test | 7 +- Build/source/texk/web2c/omegaware/yannis.test | 7 +- Build/source/texk/web2c/otps/otp2ocp.test | 4 +- Build/source/texk/web2c/otps/outocp.test | 4 +- Build/source/texk/web2c/patgen.test | 7 +- Build/source/texk/web2c/pdftexdir/pdfimage.test | 9 +- Build/source/texk/web2c/pdftexdir/pdftex.test | 7 +- Build/source/texk/web2c/pdftexdir/pdftosrc.test | 7 +- Build/source/texk/web2c/pdftexdir/ttf2afm.test | 7 +- Build/source/texk/web2c/pdftexdir/wprob.test | 7 +- Build/source/texk/web2c/pktogf.test | 7 +- Build/source/texk/web2c/pktype.test | 7 +- Build/source/texk/web2c/pltotf.test | 7 +- Build/source/texk/web2c/pmpostdir/pmpost.test | 7 +- Build/source/texk/web2c/pmpostdir/pmpsamp.test | 5 +- Build/source/texk/web2c/pmpostdir/upmpost.test | 7 +- Build/source/texk/web2c/pmpostdir/upmpsamp.test | 5 +- Build/source/texk/web2c/pooltype.test | 7 +- Build/source/texk/web2c/ptexdir/nissya.test | 7 +- Build/source/texk/web2c/ptexdir/pbibtex-mem.test | 7 +- Build/source/texk/web2c/ptexdir/pbibtex.test | 7 +- Build/source/texk/web2c/ptexdir/pdvitype.test | 7 +- Build/source/texk/web2c/ptexdir/ppltotf.test | 7 +- Build/source/texk/web2c/ptexdir/ptftopl.test | 7 +- Build/source/texk/web2c/ptexdir/ptriptest.test | 7 +- Build/source/texk/web2c/ptexdir/sample.test | 7 +- Build/source/texk/web2c/ptexdir/yokotate.test | 7 +- Build/source/texk/web2c/synctexdir/synctex.test | 7 +- Build/source/texk/web2c/tangle.test | 7 +- Build/source/texk/web2c/tests/bibtex-mem.test | 7 +- Build/source/texk/web2c/tftopl.test | 7 +- Build/source/texk/web2c/tiedir/tie.test | 7 +- Build/source/texk/web2c/triptest.test | 7 +- Build/source/texk/web2c/uptexdir/upbibtex.test | 7 +- Build/source/texk/web2c/uptexdir/updvitype.test | 7 +- Build/source/texk/web2c/uptexdir/uppltotf.test | 7 +- Build/source/texk/web2c/uptexdir/uptftopl.test | 7 +- Build/source/texk/web2c/uptexdir/uptriptest.test | 7 +- Build/source/texk/web2c/uptexdir/yokotate.test | 7 +- Build/source/texk/web2c/vftovp.test | 7 +- Build/source/texk/web2c/vptovf.test | 7 +- Build/source/texk/web2c/weave.test | 7 +- Build/source/texk/web2c/xetexdir/xetex-bug73.test | 6 +- Build/source/utils/autosp/autosp-src/autosp.test | 5 +- Build/source/utils/autosp/autosp-src/rebar.test | 6 +- Build/source/utils/devnag/tests/devnag.test | 7 +- Build/source/utils/lacheck/lacheck.test | 7 +- Build/source/utils/m-tx/m-tx.test | 6 +- Build/source/utils/m-tx/mtx-src/mtx.test | 6 +- Build/source/utils/pmx/pmx-src/pmx.test | 6 +- Build/source/utils/ps2eps/bbox.test | 7 +- Build/source/utils/t1utils/t1utils.test | 6 +- Build/source/utils/tpic2pdftex/tpic2pdftex.test | 7 +- 179 files changed, 831 insertions(+), 589 deletions(-) (limited to 'Build/source') diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index e4c2f98deaf..01e45708507 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2017-11-15 Karl Berry + + * *.test: use -vx. + 2017-03-21 Karl Berry * everywhere: use EXTRA_DIST=TLpatches instead of -PATCHES. diff --git a/Build/source/libs/cairo/cairo.test b/Build/source/libs/cairo/cairo.test index e1e446e81e8..c7ff490b7ee 100755 --- a/Build/source/libs/cairo/cairo.test +++ b/Build/source/libs/cairo/cairo.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./cairotst || exit 1 diff --git a/Build/source/libs/gd/libgd.test b/Build/source/libs/gd/libgd.test index fa6023398bc..1239729d52d 100755 --- a/Build/source/libs/gd/libgd.test +++ b/Build/source/libs/gd/libgd.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2015 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2015 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./gdtest || exit 1 diff --git a/Build/source/libs/graphite2/graphite2.test b/Build/source/libs/graphite2/graphite2.test index 48cb2dace45..04758e15498 100755 --- a/Build/source/libs/graphite2/graphite2.test +++ b/Build/source/libs/graphite2/graphite2.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./gr2test || exit 1 diff --git a/Build/source/libs/harfbuzz/harfbuzz.test b/Build/source/libs/harfbuzz/harfbuzz.test index edaac7a6326..c7eccbec627 100755 --- a/Build/source/libs/harfbuzz/harfbuzz.test +++ b/Build/source/libs/harfbuzz/harfbuzz.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./hbtest || exit 1 diff --git a/Build/source/libs/icu/icu.test b/Build/source/libs/icu/icu.test index 44ae74a002d..620ddd77a62 100755 --- a/Build/source/libs/icu/icu.test +++ b/Build/source/libs/icu/icu.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./icutest || exit 1 diff --git a/Build/source/libs/libpaper/paper.test b/Build/source/libs/libpaper/paper.test index ea19f41adb2..65a5960e507 100755 --- a/Build/source/libs/libpaper/paper.test +++ b/Build/source/libs/libpaper/paper.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./paperconf -ans || exit 1 diff --git a/Build/source/libs/libpng/libpng.test b/Build/source/libs/libpng/libpng.test index daf59481818..ff79847a0f0 100755 --- a/Build/source/libs/libpng/libpng.test +++ b/Build/source/libs/libpng/libpng.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2009 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2009 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./pngtest $srcdir/$LIBPNG_TREE/pngtest.png \ diff --git a/Build/source/libs/lua52/luaerror.test b/Build/source/libs/lua52/luaerror.test index e313f3694c4..5a26a809aa5 100755 --- a/Build/source/libs/lua52/luaerror.test +++ b/Build/source/libs/lua52/luaerror.test @@ -1,6 +1,6 @@ -#! /bin/sh - -# Copyright (C) 2014 Peter Breitenlohner +#! /bin/sh -vx +# Copyright 2017 Karl Berry +# Copyright 2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./luatry -e "error('test')" 2>error.tmp && exit 1 diff --git a/Build/source/libs/luajit/luajiterr.test b/Build/source/libs/luajit/luajiterr.test index 957c7493088..e70e6a99219 100755 --- a/Build/source/libs/luajit/luajiterr.test +++ b/Build/source/libs/luajit/luajiterr.test @@ -1,6 +1,6 @@ -#! /bin/sh - -# Copyright (C) 2014 Peter Breitenlohner +#! /bin/sh -vx +# Copyright 2017 Karl Berry +# Copyright 2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./luajittry -e "error('test')" 2>jiterr.tmp && exit 1 diff --git a/Build/source/libs/pixman/pixman.test b/Build/source/libs/pixman/pixman.test index 6b75a1c74f4..b41a489d4f5 100755 --- a/Build/source/libs/pixman/pixman.test +++ b/Build/source/libs/pixman/pixman.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./pixtest || exit 1 diff --git a/Build/source/libs/potrace/potrace.test b/Build/source/libs/potrace/potrace.test index b3b34995917..ee5110ba2e5 100755 --- a/Build/source/libs/potrace/potrace.test +++ b/Build/source/libs/potrace/potrace.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./potracetst || exit 1 diff --git a/Build/source/libs/teckit/teckit.test b/Build/source/libs/teckit/teckit.test index 448a6cd1e49..3ae3d40646b 100755 --- a/Build/source/libs/teckit/teckit.test +++ b/Build/source/libs/teckit/teckit.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2009-2015 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2009-2015 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./teckit_compile $srcdir/tex-text.map -o xtex-text.tec || exit 1 diff --git a/Build/source/libs/zlib/zlib.test b/Build/source/libs/zlib/zlib.test index 08e995f92ac..fd92a1da9fe 100755 --- a/Build/source/libs/zlib/zlib.test +++ b/Build/source/libs/zlib/zlib.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2009 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2009 Peter Breitenlohner # You may freely use, modify and/or distribute this file. echo hello world | ./minigzip | ./minigzip -d || { \ diff --git a/Build/source/libs/zziplib/zziplib.test b/Build/source/libs/zziplib/zziplib.test index f39d35645b7..2db34e40428 100755 --- a/Build/source/libs/zziplib/zziplib.test +++ b/Build/source/libs/zziplib/zziplib.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010 Peter Breitenlohner # You may freely use, modify and/or distribute this file. rm -rf test diff --git a/Build/source/texk/afm2pl/afm2pl.test b/Build/source/texk/afm2pl/afm2pl.test index 9453c85baf2..0d168ab2c40 100755 --- a/Build/source/texk/afm2pl/afm2pl.test +++ b/Build/source/texk/afm2pl/afm2pl.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2009, 2011 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2009, 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. rm -f logo10.* diff --git a/Build/source/texk/bibtex-x/tests/bibtex8-mem.test b/Build/source/texk/bibtex-x/tests/bibtex8-mem.test index 01e8874225f..50424af632d 100755 --- a/Build/source/texk/bibtex-x/tests/bibtex8-mem.test +++ b/Build/source/texk/bibtex-x/tests/bibtex8-mem.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010 Peter Breitenlohner # You may freely use, modify and/or distribute this file. # Using test data from Philipp Lehman diff --git a/Build/source/texk/bibtex-x/tests/bibtex8.test b/Build/source/texk/bibtex-x/tests/bibtex8.test index 7673ba1ef56..472705f7157 100755 --- a/Build/source/texk/bibtex-x/tests/bibtex8.test +++ b/Build/source/texk/bibtex-x/tests/bibtex8.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests diff --git a/Build/source/texk/bibtex-x/tests/bibtexu.test b/Build/source/texk/bibtex-x/tests/bibtexu.test index 18299b228eb..d2e4370d551 100755 --- a/Build/source/texk/bibtex-x/tests/bibtexu.test +++ b/Build/source/texk/bibtex-x/tests/bibtexu.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010 Peter Breitenlohner # You may freely use, modify and/or distribute this file. # Not really a test, just making sure the program executes. diff --git a/Build/source/texk/bibtex-x/tests/sort.test b/Build/source/texk/bibtex-x/tests/sort.test index a374eb18e14..ed4ffe6ffad 100755 --- a/Build/source/texk/bibtex-x/tests/sort.test +++ b/Build/source/texk/bibtex-x/tests/sort.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010 Peter Breitenlohner # You may freely use, modify and/or distribute this file. # Using test data from Philipp Lehman diff --git a/Build/source/texk/chktex/chktex.test b/Build/source/texk/chktex/chktex.test index 963f373eb96..a9357dc7951 100755 --- a/Build/source/texk/chktex/chktex.test +++ b/Build/source/texk/chktex/chktex.test @@ -1,6 +1,7 @@ -#! /bin/sh -x - -# Copyright (C) 2009-2015 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2009-2015 Peter Breitenlohner # You may freely use, modify and/or distribute this file. rm -f chktest diff --git a/Build/source/texk/cjkutils/bg5conv.test b/Build/source/texk/cjkutils/bg5conv.test index c24e680a265..845ea70a61b 100755 --- a/Build/source/texk/cjkutils/bg5conv.test +++ b/Build/source/texk/cjkutils/bg5conv.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2011 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./bg5conv <$srcdir/tests/bg5conv.tex >bg5conv.cjk \ diff --git a/Build/source/texk/cjkutils/cef5conv.test b/Build/source/texk/cjkutils/cef5conv.test index ba35a21c08e..453a2b08343 100755 --- a/Build/source/texk/cjkutils/cef5conv.test +++ b/Build/source/texk/cjkutils/cef5conv.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2011 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Peter Breitenlohner +# Copyright 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./cef5conv <$srcdir/tests/cef5conv.tex >cef5conv.cjk \ diff --git a/Build/source/texk/cjkutils/cefconv.test b/Build/source/texk/cjkutils/cefconv.test index fe6aded53d6..a36940b23fc 100755 --- a/Build/source/texk/cjkutils/cefconv.test +++ b/Build/source/texk/cjkutils/cefconv.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2011 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./cefconv <$srcdir/tests/cefconv.tex >cefconv.cjk \ diff --git a/Build/source/texk/cjkutils/cefsconv.test b/Build/source/texk/cjkutils/cefsconv.test index c005f3d2b00..a618902d5c0 100755 --- a/Build/source/texk/cjkutils/cefsconv.test +++ b/Build/source/texk/cjkutils/cefsconv.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2011 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./cefsconv <$srcdir/tests/cefsconv.tex >cefsconv.cjk \ diff --git a/Build/source/texk/cjkutils/extconv.test b/Build/source/texk/cjkutils/extconv.test index 08368b02f81..e6d08e6c464 100755 --- a/Build/source/texk/cjkutils/extconv.test +++ b/Build/source/texk/cjkutils/extconv.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2011 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./extconv <$srcdir/tests/extconv.tex >extconv.cjk \ diff --git a/Build/source/texk/cjkutils/sjisconv.test b/Build/source/texk/cjkutils/sjisconv.test index 2e6e867d5a1..aca7d704b4c 100755 --- a/Build/source/texk/cjkutils/sjisconv.test +++ b/Build/source/texk/cjkutils/sjisconv.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2011 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./sjisconv <$srcdir/tests/sjisconv.tex >sjisconv.cjk \ diff --git a/Build/source/texk/detex/detex.test b/Build/source/texk/detex/detex.test index f6cb545e568..fd3b3f50054 100755 --- a/Build/source/texk/detex/detex.test +++ b/Build/source/texk/detex/detex.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2009 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2009 Peter Breitenlohner # You may freely use, modify and/or distribute this file. echo '#' >texmf.cnf diff --git a/Build/source/texk/dtl/dtl.test b/Build/source/texk/dtl/dtl.test index 2e7c2ad5e4e..4d08d6b5958 100755 --- a/Build/source/texk/dtl/dtl.test +++ b/Build/source/texk/dtl/dtl.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2009 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2009 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./dt2dv $srcdir/edited.txt testfile.dvi || exit 1 diff --git a/Build/source/texk/dvi2tty/disdvi.test b/Build/source/texk/dvi2tty/disdvi.test index 67c8c0b9ab5..13e5d8b7fdf 100755 --- a/Build/source/texk/dvi2tty/disdvi.test +++ b/Build/source/texk/dvi2tty/disdvi.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2012 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test_src=$srcdir/$DVI2TTY_TREE/test diff --git a/Build/source/texk/dvi2tty/dvi2tty.test b/Build/source/texk/dvi2tty/dvi2tty.test index 2bd33f7a0ed..5a5a09873e4 100755 --- a/Build/source/texk/dvi2tty/dvi2tty.test +++ b/Build/source/texk/dvi2tty/dvi2tty.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010-2012 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010-2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test_src=$srcdir/$DVI2TTY_TREE/test diff --git a/Build/source/texk/dvidvi/dvidvi.test b/Build/source/texk/dvidvi/dvidvi.test index 56cf5d48966..fe43da58d55 100755 --- a/Build/source/texk/dvidvi/dvidvi.test +++ b/Build/source/texk/dvidvi/dvidvi.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2011 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. rm -rf play* diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-ann.test b/Build/source/texk/dvipdfm-x/xdvipdfm-ann.test index 24d6e6c1025..c80a06848a2 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-ann.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-ann.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-bad.test b/Build/source/texk/dvipdfm-x/xdvipdfm-bad.test index 7edba2d9c79..c35230a65e9 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-bad.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-bad.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2015 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2015 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test b/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test index 81d5c00b1c7..6b08f7ece1b 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/sh -vx # $Id$ # Copyright 2017 Karl Berry # Copyright 2013, 2014 Peter Breitenlohner diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test b/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test index dd8cb51edf4..5a5e62bdde6 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-psz.test b/Build/source/texk/dvipdfm-x/xdvipdfm-psz.test index d42b3c25aeb..7825a41c4d8 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-psz.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-psz.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test b/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test index 133490feacd..319139bb4a2 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2015 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2015 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-res.test b/Build/source/texk/dvipdfm-x/xdvipdfm-res.test index ab3b87755cd..b249a8af068 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-res.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-res.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test b/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test index 8216efc51be..6aa3d7de55b 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2015 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2015 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test b/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test index a718b30641b..a106d17c205 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2015 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2015 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/dvipdfm-x/xdvipdfmx.test b/Build/source/texk/dvipdfm-x/xdvipdfmx.test index 21b89bcdfc3..a7e4a529704 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfmx.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfmx.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013, 2014 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013, 2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/dvipng/dvipng.test b/Build/source/texk/dvipng/dvipng.test index 8aa8eaba249..f40c793e859 100755 --- a/Build/source/texk/dvipng/dvipng.test +++ b/Build/source/texk/dvipng/dvipng.test @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/sh -vx # $Id$ # Public domain. Originally written by Peter Breitenlohner, 2009. diff --git a/Build/source/texk/dvipsk/beginfontk1.test b/Build/source/texk/dvipsk/beginfontk1.test index 91fe8ae357d..8f9d92349d2 100755 --- a/Build/source/texk/dvipsk/beginfontk1.test +++ b/Build/source/texk/dvipsk/beginfontk1.test @@ -1,4 +1,6 @@ -#! /bin/sh +#! /bin/sh -vx +# $Id$ +# Public domain. # ensure -K1 does not remove newline after %%BeginFont line. # Report from T S, 1 Jan 2010 16:32:16. diff --git a/Build/source/texk/dvipsk/eepic-nan.test b/Build/source/texk/dvipsk/eepic-nan.test index c89044da5aa..fc0713a7338 100755 --- a/Build/source/texk/dvipsk/eepic-nan.test +++ b/Build/source/texk/dvipsk/eepic-nan.test @@ -1,4 +1,6 @@ -#! /bin/sh +#! /bin/sh -vx +# $Id$ +# Public domain. # ensure we don't get nan from eepic doc. # Report from Stefan Moser to mactex-support, 20 Oct 2010 02:37:45. diff --git a/Build/source/texk/dvipsk/pfbincl.test b/Build/source/texk/dvipsk/pfbincl.test index d553c641d7a..6b06c194b8b 100755 --- a/Build/source/texk/dvipsk/pfbincl.test +++ b/Build/source/texk/dvipsk/pfbincl.test @@ -1,4 +1,6 @@ -#! /bin/sh +#! /bin/sh -vx +# $Id$ +# Public domain. ./dvips -D 300 $srcdir/testdata/pfbincl.xdv -o pfbincl.ps || exit 1 diff $srcdir/testdata/pfbincl.xps pfbincl.ps diff --git a/Build/source/texk/dvipsk/same-name.test b/Build/source/texk/dvipsk/same-name.test index 77b8f0fdd66..4459ab3e48e 100755 --- a/Build/source/texk/dvipsk/same-name.test +++ b/Build/source/texk/dvipsk/same-name.test @@ -1,6 +1,7 @@ -#! /bin/sh +#! /bin/sh -vx +# $Id$ +# Public domain. # Test oname == iname. -# Code changed by Akira Kakuto, 2013-03-18. rm -f same-name.dvi same-name.out diff --git a/Build/source/texk/dvipsk/test-dvips.test b/Build/source/texk/dvipsk/test-dvips.test index 253515a5ce7..2ce1dff2b71 100755 --- a/Build/source/texk/dvipsk/test-dvips.test +++ b/Build/source/texk/dvipsk/test-dvips.test @@ -1,4 +1,6 @@ -#! /bin/sh +#! /bin/sh -vx +# $Id$ +# Public domain. rm -f mtest.ps diff --git a/Build/source/texk/gregorio/gregorio.test b/Build/source/texk/gregorio/gregorio.test index f8daa762d22..4aaf4067e11 100755 --- a/Build/source/texk/gregorio/gregorio.test +++ b/Build/source/texk/gregorio/gregorio.test @@ -1,6 +1,6 @@ -#! /bin/sh +#! /bin/sh -vx # $Id$ -# Copyright 2016 Karl Berry +# Copyright 2016-2017 Karl Berry # Copyright 2015 Peter Breitenlohner # You may freely use, modify and/or distribute this file. diff --git a/Build/source/texk/kpathsea/tests/cnfnewline.test b/Build/source/texk/kpathsea/tests/cnfnewline.test index d1e64d7d6ad..9d93984d8f5 100755 --- a/Build/source/texk/kpathsea/tests/cnfnewline.test +++ b/Build/source/texk/kpathsea/tests/cnfnewline.test @@ -1,4 +1,6 @@ -#!/bin/sh +#!/bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry # Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. diff --git a/Build/source/texk/kpathsea/tests/kpseaccess.test b/Build/source/texk/kpathsea/tests/kpseaccess.test index 5006bcf1afa..a1630e6ec8e 100755 --- a/Build/source/texk/kpathsea/tests/kpseaccess.test +++ b/Build/source/texk/kpathsea/tests/kpseaccess.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ret=0 diff --git a/Build/source/texk/kpathsea/tests/kpsereadlink.test b/Build/source/texk/kpathsea/tests/kpsereadlink.test index 7770a00bd03..3b3570aa8d2 100755 --- a/Build/source/texk/kpathsea/tests/kpsereadlink.test +++ b/Build/source/texk/kpathsea/tests/kpsereadlink.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test "x$LN_S" = 'xln -s' || exit 77 diff --git a/Build/source/texk/kpathsea/tests/kpsestat.test b/Build/source/texk/kpathsea/tests/kpsestat.test index 8e1cf8526a4..fa25f5a5968 100755 --- a/Build/source/texk/kpathsea/tests/kpsestat.test +++ b/Build/source/texk/kpathsea/tests/kpsestat.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./kpsestat = nonesuch 2>/dev/null && exit 1 diff --git a/Build/source/texk/kpathsea/tests/kpsewhich.test b/Build/source/texk/kpathsea/tests/kpsewhich.test index b15f2b35400..6f065f0f328 100755 --- a/Build/source/texk/kpathsea/tests/kpsewhich.test +++ b/Build/source/texk/kpathsea/tests/kpsewhich.test @@ -1,4 +1,6 @@ -#! /bin/sh +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry # Copyright 2010-2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. diff --git a/Build/source/texk/lcdf-typetools/tests/t1.test b/Build/source/texk/lcdf-typetools/tests/t1.test index c39ae7ad24d..1c282ef8ccf 100755 --- a/Build/source/texk/lcdf-typetools/tests/t1.test +++ b/Build/source/texk/lcdf-typetools/tests/t1.test @@ -1,6 +1,6 @@ -#! /bin/sh - -# Copyright (C) 2012 Peter Breitenlohner +#! /bin/sh -vx +# Copyright 2017 Karl Berry +# Copyright 2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. failed= diff --git a/Build/source/texk/lcdf-typetools/tests/tfm.test b/Build/source/texk/lcdf-typetools/tests/tfm.test index ca92f263ae2..900556488f5 100755 --- a/Build/source/texk/lcdf-typetools/tests/tfm.test +++ b/Build/source/texk/lcdf-typetools/tests/tfm.test @@ -1,6 +1,6 @@ -#! /bin/sh - -# Copyright (C) 2012 Peter Breitenlohner +#! /bin/sh -vx +# Copyright 2017 Karl Berry +# Copyright 2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. PATH=$LCDF_TYPETOOLS_TREE/cfftot1:$PATH # May need to run cfftot1, ... diff --git a/Build/source/texk/lcdf-typetools/tests/ttf.test b/Build/source/texk/lcdf-typetools/tests/ttf.test index c527d4c683b..a8046474ce3 100755 --- a/Build/source/texk/lcdf-typetools/tests/ttf.test +++ b/Build/source/texk/lcdf-typetools/tests/ttf.test @@ -1,6 +1,6 @@ -#! /bin/sh - -# Copyright (C) 2012 Peter Breitenlohner +#! /bin/sh -vx +# Copyright 2017 Karl Berry +# Copyright 2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. failed= diff --git a/Build/source/texk/makeindexk/tests/makeindex.test b/Build/source/texk/makeindexk/tests/makeindex.test index 808e9f07393..0f266aa778b 100755 --- a/Build/source/texk/makeindexk/tests/makeindex.test +++ b/Build/source/texk/makeindexk/tests/makeindex.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2012 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/makejvf/makejvf.test b/Build/source/texk/makejvf/makejvf.test index 47923fce7cf..a5f6f588724 100755 --- a/Build/source/texk/makejvf/makejvf.test +++ b/Build/source/texk/makejvf/makejvf.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2010-2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2010-2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. ./makejvf $srcdir/tests/min10.tfm rml && \ diff --git a/Build/source/texk/mendexk/tests/mendex.test b/Build/source/texk/mendexk/tests/mendex.test index 53988d1eab5..6c7fe0f42c4 100755 --- a/Build/source/texk/mendexk/tests/mendex.test +++ b/Build/source/texk/mendexk/tests/mendex.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/musixtnt/musixtnt-src/msxlint.test b/Build/source/texk/musixtnt/musixtnt-src/msxlint.test index efdf3620005..d662a1f29d4 100755 --- a/Build/source/texk/musixtnt/musixtnt-src/msxlint.test +++ b/Build/source/texk/musixtnt/musixtnt-src/msxlint.test @@ -1,6 +1,6 @@ -#! /bin/sh - -# Copyright (C) 2015 Peter Breitenlohner +#! /bin/sh -vx +# Copyright 2017 Karl Berry +# Copyright 2015 Peter Breitenlohner # You may freely use, modify and/or distribute this file. echo && echo "*** msxlint --help" diff --git a/Build/source/texk/ps2pk/tests/lmmath.test b/Build/source/texk/ps2pk/tests/lmmath.test index 074abe3c4f0..fe71de68b0d 100755 --- a/Build/source/texk/ps2pk/tests/lmmath.test +++ b/Build/source/texk/ps2pk/tests/lmmath.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2014 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests diff --git a/Build/source/texk/ps2pk/tests/ps2pk.test b/Build/source/texk/ps2pk/tests/ps2pk.test index 53e7bc94875..2ad0df10d17 100755 --- a/Build/source/texk/ps2pk/tests/ps2pk.test +++ b/Build/source/texk/ps2pk/tests/ps2pk.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2012-2014 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2012-2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/psutils/psutils.test b/Build/source/texk/psutils/psutils.test index 1f6dcfe05e0..bb306ca9753 100755 --- a/Build/source/texk/psutils/psutils.test +++ b/Build/source/texk/psutils/psutils.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2011-2014 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2011-2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea diff --git a/Build/source/texk/seetexk/seetexk.test b/Build/source/texk/seetexk/seetexk.test index 0fb9f1b0328..b26b300b916 100755 --- a/Build/source/texk/seetexk/seetexk.test +++ b/Build/source/texk/seetexk/seetexk.test @@ -1,6 +1,7 @@ -#! /bin/sh - -# Copyright (C) 2011-2013 Peter Breitenlohner +#! /bin/sh -vx +# $Id$ +# Copyright 2017 Karl Berry +# Copyright 2011-2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. rm -rf play* diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 22662575cfe..1d94540f5c5 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 45719 2017-11-08 12:19:02Z preining $ +# $Id: tlmgr.pl 45788 2017-11-14 00:49:39Z karl $ # # Copyright 2008-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 45719 $'; -my $datrev = '$Date: 2017-11-08 13:19:02 +0100 (Wed, 08 Nov 2017) $'; +my $svnrev = '$Revision: 45788 $'; +my $datrev = '$Date: 2017-11-14 01:49:39 +0100 (Tue, 14 Nov 2017) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -169,7 +169,7 @@ my %action_specification = ( "function" => \&action_conf }, "dump-tlpdb" => { - "options" => { local => 1, remote => 1, json => 1 }, + "options" => { local => 1, remote => 1 }, "run-post" => 0, "function" => \&action_dumptlpdb }, @@ -212,7 +212,7 @@ my %action_specification = ( "data" => "=s", "all" => 1, "list" => 1, - "only-installed" => 1, + "only-installed" => 1 }, "run-post" => 0, "function" => \&action_info @@ -345,6 +345,29 @@ my %action_specification = ( "version" => { }, # handled separately ); +my %globaloptions = ( + "gui" => 1, + "gui-lang" => "=s", + "debug-json-timing" => 1, + "debug-translation" => 1, + "h|?" => 1, + "help" => 1, + "json" => 1, + "location|repository|repo" => "=s", + "machine-readable" => 1, + "no-execute-actions" => 1, + "package-logfile" => "=s", + "persistent-downloads" => "!", + "pause" => 1, + "pin-file" => "=s", + "print-platform|print-arch" => 1, + "usermode|user-mode" => 1, + "usertree|user-tree" => "=s", + "verify-downloads" => "!", + "require-verification" => "!", + "version" => 1, +); + main() if $ismain; @@ -353,27 +376,6 @@ main() if $ismain; sub main { my %options; # TL options from local tlpdb - my %globaloptions = ( - "gui" => 1, - "gui-lang" => "=s", - "debug-translation" => 1, - "h|?" => 1, - "help" => 1, - "location|repository|repo" => "=s", - "machine-readable" => 1, - "no-execute-actions" => 1, - "package-logfile" => "=s", - "persistent-downloads" => "!", - "pause" => 1, - "pin-file" => "=s", - "print-platform|print-arch" => 1, - "usermode|user-mode" => 1, - "usertree|user-tree" => "=s", - "verify-downloads" => "!", - "require-verification" => "!", - "version" => 1, - ); - my %optarg; for my $k (keys %globaloptions) { if ($globaloptions{$k} eq "1") { @@ -1194,6 +1196,12 @@ sub action_paper { $ENV{"TEXMFCONFIG"} = $texmfconfig; my $action = shift @ARGV; + if (!$action) { + # can only happen in shell mode, because otherwise we push paper onto the stack before + # going into the action_paper + $action = "paper"; + } + if ($action =~ m/^paper$/i) { # generic paper my $newpaper = shift @ARGV; if ($opts{"list"}) { # tlmgr paper --list => complain. @@ -1205,6 +1213,19 @@ sub action_paper { } elsif (!defined($newpaper)) { # tlmgr paper => show all current sizes. my $ret = $F_OK; + if ($opts{'json'}) { + my @foo; + for my $prog (keys %TeXLive::TLPaper::paper) { + my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'}; + if ($localtlpdb->get_package($pkg)) { + my $val = TeXLive::TLPaper::do_paper($prog,$texmfconfig,"--json"); + push @foo, $val; + } + } + my $json = TeXLive::TLUtils::encode_json(\@foo); + print "$json\n"; + return $ret; + } for my $prog (sort keys %TeXLive::TLPaper::paper) { my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'}; if ($localtlpdb->get_package($pkg)) { @@ -1235,8 +1256,12 @@ sub action_paper { } else { # program-specific paper my $prog = $action; # first argument is the program to change my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'}; + if (!$pkg) { + tlwarn("Unknown paper configuration program $prog!\n"); + return ($F_ERROR); + } if (!$localtlpdb->get_package($pkg)) { - tlwarn("$prg: package $pkg is not installed - cannot adjust paper size!\n"); + tlwarn("$prg: package $prog is not installed - cannot adjust paper size!\n"); return ($F_ERROR); } my $arg = shift @ARGV; # get "paper" argument @@ -1412,24 +1437,11 @@ sub action_info { my $ret = $F_OK | $F_NOPOSTACTION; my @datafields; my $fmt = "list"; - if ($opts{'data'} && ($opts{'data'} eq "json")) { - eval { require JSON; }; - if ($@) { - # that didn't work out, give some usefull error message and stop - if ($^O =~ /^MSWin/i) { - # that should not happen, we are shipping Tk!! - require Win32; - my $msg = "Cannot load JSON, that should not happen as we ship it!\n(Error message: $@)\n"; - Win32::MsgBox($msg, 1|Win32::MB_ICONSTOP(), "Warning"); - } else { - printf STDERR " -$prg: Cannot load JSON. -This module is shipped with core Perl unless you have a very old Perl, -in which case you cannot use the json option. -Goodbye. -"; - } - } + if ($opts{'data'} && $opts{'json'}) { + tlwarn("Preferring json output over data output!\n"); + delete($opts{'data'}); + } + if ($opts{'json'}) { $fmt = 'json'; # the 1 is the silent mode! init_tlmedia_or_die(1); @@ -1447,6 +1459,8 @@ Goodbye. $fmt = "csv"; # the 1 is the silent mode! init_tlmedia_or_die(1); + } else { + $fmt = "detail"; } my $tlm; if ($opts{"only-installed"}) { @@ -1480,17 +1494,16 @@ Goodbye. } else { @whattolist = ($what, @todo); } - if ($opts{'data'}) { - if ($opts{'data'} ne "json") { - $fmt = "csv"; - } - } else { - $fmt = "detail"; - } my @adds; if ($opts{'data'}) { @adds = @datafields; } + # TIMING OF JSON IMPLEMENTATIONS + my ($startsec, $startmsec); + if ($opts{'debug-json-timing'}) { + require Time::HiRes; + ($startsec, $startmsec) = Time::HiRes::gettimeofday(); + } print "[" if ($fmt eq "json"); my $first = 1; foreach my $ppp (@whattolist) { @@ -1500,6 +1513,14 @@ Goodbye. $ret |= show_one_package($ppp, $fmt, @adds); } print "]\n" if ($fmt eq "json"); + if ($opts{'debug-json-timing'}) { + my ($endsec, $endmsec) = Time::HiRes::gettimeofday(); + if ($endmsec < $startmsec) { + $endsec -= 1; + $endmsec += 1000000; + } + print STDERR "JSON (", $TeXLive::TLUtils::jsonmode, ") generation took ", $endsec - $startsec, ".", substr($endmsec - $startmsec,0,2), " sec\n"; + } return ($ret); } @@ -1807,9 +1828,13 @@ sub action_restore { # intermediate sub sub report_backup_revdate { my $p = shift; + my $mode = shift; my %revs = @_; my @rs = sort {$b <=> $a} (keys %revs); + my @outarr; for my $rs (@rs) { + my %jsonkeys; + $jsonkeys{'name'} = $p; my $dstr; if ($revs{$rs} == -1) { $dstr = "unknown"; @@ -1820,17 +1845,34 @@ sub action_restore { $dstr = sprintf "%04d-%02d-%02d %02d:%02d", $year+1900, $mon+1, $mday, $hour, $min; } - print "$rs ($dstr) "; + if ($mode eq "json") { + $jsonkeys{'rev'} = "$rs"; + $jsonkeys{'date'} = $dstr; + push @outarr, \%jsonkeys; + } else { + push @outarr, "$rs ($dstr)"; + } + } + if ($mode eq "json") { + return @outarr; + } else { + return ( join(" ", @outarr)); } } # end sub if (!defined($pkg)) { if (keys %backups) { - print "Available backups:\n"; - foreach my $p (sort keys %backups) { - print "$p: "; - report_backup_revdate($p, %{$backups{$p}}); - print "\n"; + if ($opts{'json'}) { + my @bla = map { report_backup_revdate($_, "json", %{$backups{$_}}) } keys %backups; + my $str = TeXLive::TLUtils::encode_json(\@bla); + print "$str\n"; + } else { + print "Available backups:\n"; + foreach my $p (sort keys %backups) { + print "$p: "; + print(report_backup_revdate($p, "text", %{$backups{$p}})); + print "\n"; + } } } else { print "No backups available in $opts{'backupdir'}\n"; @@ -1838,9 +1880,15 @@ sub action_restore { return ($F_OK | $F_NOPOSTACTION); } if (!defined($rev)) { - print "Available backups for $pkg: "; - report_backup_revdate($pkg, %{$backups{$pkg}}); - print "\n"; + if ($opts{'json'}) { + my @bla = report_backup_revdate($pkg, "json", %{$backups{$pkg}}); + my $str = TeXLive::TLUtils::encode_json(\@bla); + print "$str\n"; + } else { + print "Available backups for $pkg: "; + print(report_backup_revdate($pkg, "text", %{$backups{$pkg}})); + print "\n"; + } return ($F_OK | $F_NOPOSTACTION); } # we did arrive here, so we try to restore ... @@ -3647,8 +3695,8 @@ sub show_one_package_json { my $tlp = ($is_installed ? $loctlp : $remtlp); #my $tlp = ($is_available ? $remtlp : $loctlp); # add available, installed, lrev, rrev fields and remove revision field - my $str = $tlp->as_json(available => ($is_available ? $JSON::true : $JSON::false), - installed => ($is_installed ? $JSON::true : $JSON::false), + my $str = $tlp->as_json(available => ($is_available ? TeXLive::TLUtils::True() : TeXLive::TLUtils::False()), + installed => ($is_installed ? TeXLive::TLUtils::True() : TeXLive::TLUtils::False()), lrev => ($is_installed ? $loctlp->revision : 0), rrev => ($is_available ? $remtlp->revision : 0), revision => undef); @@ -6030,6 +6078,12 @@ sub action_key { sub action_shell { my $protocol = 1; my $default_prompt = "tlmgr>"; + # keys which can be set/get and are also settable via global cmdline opts + my @valid_bool_keys + = qw/debug-translation machine-readable no-execute-actions + require-verification verify-downloads json/; + my @valid_string_keys = qw/repository prompt/; + my @valid_keys = (@valid_bool_keys, @valid_string_keys); # set auto flush unconditionally in action shell $| = 1; # we need to do an anonymous sub here otherwise the $default_prompt will get @@ -6129,11 +6183,6 @@ sub action_shell { exec("tlmgr", @::SAVEDARGV); } elsif ($cmd =~ m/^(set|get)$/) { - my @valid_bool_keys - = qw/debug-translation machine-readable no-execute-actions - require-verification verify-downloads/; - my @valid_string_keys = qw/repository prompt/; - my @valid_keys = (@valid_bool_keys, @valid_string_keys); # my $key = shift @args; my $val = shift @args; @@ -6227,6 +6276,13 @@ sub action_shell { } # redo the option parsing my %optarg; + for my $k (@valid_bool_keys) { + if ($globaloptions{$k} eq "1") { + $optarg{$k} = 1; + } else { + $optarg{"$k" . $globaloptions{$k}} = 1; + } + } if (defined($action_specification{$cmd}{'options'})) { my %actopts = %{$action_specification{$cmd}{'options'}}; for my $k (keys %actopts) { @@ -6241,6 +6297,10 @@ sub action_shell { @ARGV = @args; my %savedopts = %opts; %opts = (); + # stuff global options back into the %opts array + for my $k (@valid_keys) { + $opts{$k} = $savedopts{$k} if (exists($savedopts{$k})); + } if (!GetOptions(\%opts, keys(%optarg))) { print "ERROR unsupported arguments\n"; next; @@ -7665,15 +7725,18 @@ locally installed packages, collections, or schemes are listed. If the option C<--data> is given, its argument must be a comma separated list of field names from: C, C, C, C, C, C, C, C, C, C, -C, C, or C. In this case the requested +C, C, or C. In this case the requested packages' information is listed in CSV format one package per line, and the column information is given by the C. The C column contains the name of all dependencies separated by C<:>. -In case the only value passed to C<--data> is C, the output is a +=item B<--json> + +In case C<--json> is specified, the output is a JSON encoded array where each array element is the JSON representation of a single C but with additional information. For details see C, format definition: C. +If both C<--json> and C<--data> are given, C<--json> takes precedence. =back @@ -7872,6 +7935,8 @@ default. =item B|--list]>> +=item B + =back With no arguments (C), shows the default paper size setting @@ -7892,6 +7957,10 @@ With a program given as the first argument and C<--list> given as the last argument (e.g., C), shows all valid paper sizes for that program. The first size shown is the default. +If C<--json> is specified without other options, the paper setup is +dumped in JSON format. For the format of JSON output see +C, format definition C. + Incidentally, this syntax of having a specific program name before the C keyword is unusual. It is inherited from the longstanding C script, which supports other configuration settings for @@ -8115,7 +8184,7 @@ otherwise, all operations will fail! =back -=head2 restore [--backupdir I] [--all | I [I]] +=head2 restore [--json] [--backupdir I] [--all | I [I]] Restore a package from a previously-made backup. @@ -8156,6 +8225,13 @@ written to the terminal. Don't ask questions. +=item B<--json> + +When listing backups, the option C<--json> turn on JSON output. +The format is an array of JSON objects (C, C, C). +For details see C, format definition: C. +If both C<--json> and C<--data> are given, C<--json> takes precedence. + =back =head2 search [I