From 0572dd7e487908f56a5aa755f90bbbf134387d0d Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 23 May 2012 07:16:33 +0000 Subject: self test (make check): Cope with spaces in paths returned by kpathsea git-svn-id: svn://tug.org/texlive/trunk@26589 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipng/ChangeLog | 4 ++++ Build/source/texk/dvipng/dvipng.test | 8 +++++--- Build/source/texk/web2c/ChangeLog | 5 +++++ Build/source/texk/web2c/dvicopy.test | 4 ++-- Build/source/texk/web2c/dvitype.test | 4 ++-- Build/source/texk/web2c/mplibdir/ChangeLog | 4 ++++ Build/source/texk/web2c/mplibdir/dvitomp.test | 4 ++-- Build/source/texk/web2c/ptexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/ptexdir/pdvitype.test | 4 ++-- Build/source/texk/web2c/ptexdir/sample.test | 7 +++++-- Build/source/texk/web2c/uptexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/uptexdir/updvitype.test | 4 ++-- 12 files changed, 43 insertions(+), 15 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 86e774ddc14..770116db05d 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2012-05-22 Peter Breitenlohner + + * dvipng.test: Cope with spaces in paths returned by kpsewhich. + 2011-10-04 Peter Breitenlohner * Makefile.am (CLEANFILES): Adapt to 'new' test script. diff --git a/Build/source/texk/dvipng/dvipng.test b/Build/source/texk/dvipng/dvipng.test index 52fd376b6be..baaba3c8b77 100755 --- a/Build/source/texk/dvipng/dvipng.test +++ b/Build/source/texk/dvipng/dvipng.test @@ -7,11 +7,13 @@ get_val () { } get_val mktex.cnf -TEXMFCNF=`dirname $res` +TEXMFCNF=`dirname "$res"` get_val psfonts.map -TEXFONTMAPS=`dirname \`dirname $res\``// +par=`dirname "$res"` +TEXFONTMAPS=`dirname "$par"`// get_val 8r.enc -ENCFONTS=`dirname \`dirname $res\``// +par=`dirname "$res"` +ENCFONTS=`dirname "$par"`// get_val --expand-var='$TEXMFMAIN' TEXMFMAIN=$res get_val --expand-var='$TEXMFDIST' diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index d083ba3ec58..78125df7e8c 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2012-05-22 Peter Breitenlohner + + * dvicopy.test, dvitype.test: Cope with spaces in paths returned + by kpsewhich. + 2012-05-12 Werner Lemberg * patgen.ch: Fixed a typo causing weave to fail. diff --git a/Build/source/texk/web2c/dvicopy.test b/Build/source/texk/web2c/dvicopy.test index 67825f804ad..272146802b2 100755 --- a/Build/source/texk/web2c/dvicopy.test +++ b/Build/source/texk/web2c/dvicopy.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2009 Peter Breitenlohner +# Copyright (C) 2009-2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests @@ -8,7 +8,7 @@ test -d tests || mkdir -p tests if tfmpath=`$KPSEWHICH cmbx10.tfm`; then TEXMFCNF=$srcdir/../kpathsea \ - TFMFONTS=`dirname $tfmpath` \ + TFMFONTS=`dirname "$tfmpath"` \ ./dvicopy $srcdir/tests/story tests/xstory.dvi || exit 1 fi diff --git a/Build/source/texk/web2c/dvitype.test b/Build/source/texk/web2c/dvitype.test index c6a6ced5540..be079c5c8b7 100755 --- a/Build/source/texk/web2c/dvitype.test +++ b/Build/source/texk/web2c/dvitype.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2009, 2010 Peter Breitenlohner +# Copyright (C) 2009-2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests @@ -8,7 +8,7 @@ test -d tests || mkdir -p tests if tfmpath=`$KPSEWHICH cmbx10.tfm`; then TEXMFCNF=$srcdir/../kpathsea \ - TFMFONTS=`dirname $tfmpath` \ + TFMFONTS=`dirname "$tfmpath"` \ ./dvitype -show-opcodes $srcdir/tests/story >tests/xstory.dvityp || exit 1 fi diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 9f4da35fb28..0f7225b05e8 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,7 @@ +2012-05-22 Peter Breitenlohner + + * dvitomp.test: Cope with spaces in paths returned by kpsewhich. + 2012-05-20 Peter Breitenlohner * am/mplib.am (mpost_LDADD): Drop explicit '-lm'. diff --git a/Build/source/texk/web2c/mplibdir/dvitomp.test b/Build/source/texk/web2c/mplibdir/dvitomp.test index c2f91463f96..66acda45488 100755 --- a/Build/source/texk/web2c/mplibdir/dvitomp.test +++ b/Build/source/texk/web2c/mplibdir/dvitomp.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2009 Peter Breitenlohner +# Copyright (C) 2009-2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests @@ -8,7 +8,7 @@ test -d tests || mkdir -p tests if tfmpath=`$KPSEWHICH cmbx10.tfm`; then TEXMFCNF=$srcdir/../kpathsea \ - TFMFONTS=`dirname $tfmpath` \ + TFMFONTS=`dirname "$tfmpath"` \ ./mpost --dvitomp $srcdir/tests/story.dvi tests/xstory.mpx || exit 1 fi diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index a7df7f65e05..c025b9843a7 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-05-22 Peter Breitenlohner + + * pdvitype.test, sample.test: Cope with spaces in paths returned + by kpsewhich. + 2012-05-12 Peter Breitenlohner * ptex-base.ch: Restore the 'unnecessary and seemingly wrong' diff --git a/Build/source/texk/web2c/ptexdir/pdvitype.test b/Build/source/texk/web2c/ptexdir/pdvitype.test index 602ed66ea96..86066c2b23e 100755 --- a/Build/source/texk/web2c/ptexdir/pdvitype.test +++ b/Build/source/texk/web2c/ptexdir/pdvitype.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2010 Peter Breitenlohner +# Copyright (C) 2010-2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests @@ -8,7 +8,7 @@ test -d tests || mkdir -p tests if tfmpath=`$KPSEWHICH cmbx10.tfm`; then TEXMFCNF=$srcdir/../kpathsea \ - TFMFONTS=`dirname $tfmpath` \ + TFMFONTS=`dirname "$tfmpath"` \ ./pdvitype -show-opcodes $srcdir/tests/story >tests/xstory.dvityp || exit 1 fi diff --git a/Build/source/texk/web2c/ptexdir/sample.test b/Build/source/texk/web2c/ptexdir/sample.test index 9a377607cba..97cde057e01 100755 --- a/Build/source/texk/web2c/ptexdir/sample.test +++ b/Build/source/texk/web2c/ptexdir/sample.test @@ -1,16 +1,19 @@ #! /bin/sh -# Copyright (C) 2010 Peter Breitenlohner +# Copyright (C) 2010-2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests tfmpath=`$KPSEWHICH cmbx10.tfm` || exit 77 +tfmparent=`dirname "$tfmpath"` +tfmgrandparent=`dirname "$tfmparent"` + # Test inputs testdir=$srcdir/ptexdir/tests TEXMFCNF=$srcdir/../kpathsea \ - TFMFONTS=$testdir:`dirname \`dirname \\\`dirname $tfmpath\\\`\``// \ + TFMFONTS=$testdir:`dirname "$tfmgrandparent"`// \ ./pdvitype -show-opcodes $testdir/sample >tests/xsample.typ || exit 1 diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 8dabb72557d..f6d734438d3 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-05-22 Peter Breitenlohner + + * updvitype.test: Cope with spaces in paths returned by + kpsewhich. + 2012-05-12 Peter Breitenlohner * uptex-m.ch: Restore the 'unnecessary and seemingly wrong' diff --git a/Build/source/texk/web2c/uptexdir/updvitype.test b/Build/source/texk/web2c/uptexdir/updvitype.test index 4931fbdbe33..f5e970ed9e1 100755 --- a/Build/source/texk/web2c/uptexdir/updvitype.test +++ b/Build/source/texk/web2c/uptexdir/updvitype.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2011 Peter Breitenlohner +# Copyright (C) 2011-2012 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests @@ -8,7 +8,7 @@ test -d tests || mkdir -p tests if tfmpath=`$KPSEWHICH cmbx10.tfm`; then TEXMFCNF=$srcdir/../kpathsea \ - TFMFONTS=`dirname $tfmpath` \ + TFMFONTS=`dirname "$tfmpath"` \ ./updvitype -show-opcodes $srcdir/tests/story >tests/xstory.dvityp || exit 1 fi -- cgit v1.2.3