From 0a9a9133e5f47300752413373e12fa9de4fbfbc9 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 8 Dec 2007 11:07:12 +0100 Subject: [PATCH] Modify some tests for absolute trees containing whitespace. * tests/missing.test: Use "./missing" instead of "`pwd`/missing". * tests/missing2.test: Likewise. * tests/mmodely.test: Add `pwd` to $PATH instead of absolute references to myyacc.sh and mylex.sh. * tests/multlib.test: Likewise for mycc. * tests/txinfo26.test: Skip if `pwd` contains whitespace, as an absolute --srcdir does not work there. --- ChangeLog | 9 +++++++++ tests/missing.test | 4 ++-- tests/missing2.test | 4 ++-- tests/mmodely.test | 15 +++++++++++---- tests/multlib.test | 5 +++-- tests/txinfo26.test | 6 ++++++ 6 files changed, 33 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index e65286efa..135fa7c9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2007-12-08 Ralf Wildenhues + Modify some tests for absolute trees containing whitespace. + * tests/missing.test: Use "./missing" instead of "`pwd`/missing". + * tests/missing2.test: Likewise. + * tests/mmodely.test: Add `pwd` to $PATH instead of absolute + references to myyacc.sh and mylex.sh. + * tests/multlib.test: Likewise for mycc. + * tests/txinfo26.test: Skip if `pwd` contains whitespace, as + an absolute --srcdir does not work there. + * INSTALL, lib/INSTALL, lib/config-ml.in, lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from upstream. diff --git a/tests/missing.test b/tests/missing.test index 8f4cc9e66..b425dddb4 100755 --- a/tests/missing.test +++ b/tests/missing.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -37,7 +37,7 @@ $AUTOMAKE --add-missing # Make sure we do use missing, even if the user exported AUTOCONF. # (We cannot export this new value, because it would be used by Automake # when tracing, and missing is no good for this.) -MYAUTOCONF="`pwd`/missing --run $AUTOCONF" +MYAUTOCONF="./missing --run $AUTOCONF" unset AUTOCONF ./configure AUTOCONF="$MYAUTOCONF" diff --git a/tests/missing2.test b/tests/missing2.test index 023627063..c091f8323 100755 --- a/tests/missing2.test +++ b/tests/missing2.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -38,7 +38,7 @@ $AUTOCONF $AUTOMAKE --add-missing # See missing.test for explanations about this. -MYAUTOCONF="`pwd`/missing --run $AUTOCONF" +MYAUTOCONF="./missing --run $AUTOCONF" unset AUTOCONF ./configure AUTOCONF="$MYAUTOCONF" diff --git a/tests/mmodely.test b/tests/mmodely.test index 49b16e1e8..19877b629 100755 --- a/tests/mmodely.test +++ b/tests/mmodely.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -70,14 +70,21 @@ $AUTOMAKE -a ./configure $MAKE -echo 'echo "$@" >y.tab.c' > myyacc.sh -echo 'echo "$@" >lex.yy.c' > mylex.sh +cat >myyacc.sh <<'END' +#! /bin/sh +echo "$@" >y.tab.c +END +cat >mylex.sh <<'END' +echo "$@" >lex.yy.c +END +chmod +x myyacc.sh mylex.sh +PATH="`pwd`:$PATH" # make maintainer-clean; ./configure; make should always work, # per GNU Standard. $MAKE maintainer-clean ./configure -YACC="$SHELL `pwd`/myyacc.sh" LEX="$SHELL `pwd`/mylex.sh" \ +YACC="myyacc.sh" LEX="mylex.sh" \ LEX_OUTPUT_ROOT='lex.yy' $MAKE -e zardoz.c joe.c grep zardoz.y zardoz.c grep joe.l joe.c diff --git a/tests/multlib.test b/tests/multlib.test index 05dd6ee37..b4e406a8b 100755 --- a/tests/multlib.test +++ b/tests/multlib.test @@ -49,6 +49,7 @@ gcc ${1+"$@"} END chmod +x mycc +PATH=`pwd`:$PATH cat >Makefile.am <<'EOF' SUBDIRS = @subdirs@ @@ -130,7 +131,7 @@ cd .. # Check VPATH builds mkdir build cd build -../configure --enable-multilib CC=`pwd`/../mycc +../configure --enable-multilib CC=mycc $MAKE $MAKE install $MAKE distcleancheck @@ -138,5 +139,5 @@ $MAKE distcleancheck # Check standard builds. cd .. # Why to I have to specify --with-target-subdir? -./configure --enable-multilib --with-target-subdir=. CC=`pwd`/mycc +./configure --enable-multilib --with-target-subdir=. CC=mycc $MAKE diff --git a/tests/txinfo26.test b/tests/txinfo26.test index 4d755890b..489998681 100755 --- a/tests/txinfo26.test +++ b/tests/txinfo26.test @@ -51,6 +51,12 @@ $AUTOCONF ./configure $MAKE $MAKE distclean + +# We do not require this to work with a directory that contains white space. +case `pwd` in + *\ * | *\ *) exit 77;; +esac + mkdir build cd build ../configure "--srcdir=`pwd`/.." "--prefix=`pwd`/_inst" "--infodir=`pwd`/_inst/info" -- 2.11.4.GIT