When editing a pre-existent 'configure.ac' file in a test script, name the temporary file 'configure.tmp' rather than 'configure.int'; the latter was a relict of the times when we used 'configure.in' as the default name for the Autoconf input files throughout the testsuite.
* t/cond43.sh: Adjust. * t/depcomp8a.sh: Likewise. * t/depcomp8b.sh: Likewise. * t/gettext.sh: Likewise. * t/mmode.sh: Likewise. * t/pr401.sh: Likewise. * t/pr401b.sh: Likewise. * t/pr401c.sh: Likewise. * t/python11.sh: Likewise. * t/cond42.sh: Likewise. Also, while at it, rename ... (edit_configure_in): ... this function ... (edit_configure_ac): ... like this. Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- t/cond42.sh | 13 +++++++------ t/cond43.sh | 4 ++-- t/depcomp8a.sh | 4 ++-- t/depcomp8b.sh | 4 ++-- t/gettext.sh | 4 ++-- t/mmode.sh | 12 ++++++------ t/pr401.sh | 12 ++++++------ t/pr401b.sh | 12 ++++++------ t/pr401c.sh | 12 ++++++------ t/python11.sh | 4 ++-- 10 files changed, 41 insertions(+), 40 deletions(-) diff --git a/t/cond42.sh b/t/cond42.sh index b3d0305..f90341d 100755 --- a/t/cond42.sh +++ b/t/cond42.sh @@ -1,4 +1,5 @@ #!/bin/sh +nfig # Copyright (C) 2008-2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -28,10 +29,10 @@ _AM_COND_IF([COND]) AC_OUTPUT END -edit_configure_in () +edit_configure_ac () { - sed "$@" < configure.ac >configure.int - mv -f configure.int configure.ac + sed "$@" < configure.ac >configure.tmp + mv -f configure.tmp configure.ac rm -rf autom4te*.cache } @@ -41,15 +42,15 @@ $ACLOCAL AUTOMAKE_fails grep '^configure\.ac:8:.* condition stack' stderr -edit_configure_in 's/_AM_COND_IF/_AM_COND_ELSE/' +edit_configure_ac 's/_AM_COND_IF/_AM_COND_ELSE/' AUTOMAKE_fails grep '^configure\.ac:7:.* else without if' stderr -edit_configure_in 's/_AM_COND_ELSE/_AM_COND_ENDIF/' +edit_configure_ac 's/_AM_COND_ELSE/_AM_COND_ENDIF/' AUTOMAKE_fails grep '^configure\.ac:7:.* endif without if' stderr -edit_configure_in 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\ +edit_configure_ac 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\ _AM_COND_ENDIF/' AUTOMAKE_fails grep '^configure\.ac:7:.* not enough arguments.* _AM_COND_IF' stderr diff --git a/t/cond43.sh b/t/cond43.sh index ff33675..c5da21c 100755 --- a/t/cond43.sh +++ b/t/cond43.sh @@ -36,8 +36,8 @@ $EGREP '^configure\.ac:7:.* missing m4 quoting.*macro depth 2( |$)' stderr sed '/.AM_COND_IF/{ s/^/[/ s/$/]/ - }' < configure.ac > configure.int -mv -f configure.int configure.ac + }' < configure.ac > configure.tmp +mv -f configure.tmp configure.ac rm -rf autom4te*.cache $AUTOMAKE diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh index 3d58a3e..bc0c276 100755 --- a/t/depcomp8a.sh +++ b/t/depcomp8a.sh @@ -64,8 +64,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck # Try again with subdir-objects option. -sed 's/#x //' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/#x //' configure.ac >configure.tmp +mv -f configure.tmp configure.ac echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am $ACLOCAL diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh index 6fed215..54834d6 100755 --- a/t/depcomp8b.sh +++ b/t/depcomp8b.sh @@ -56,8 +56,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck # Try again with subdir-objects option. -sed 's/#x //' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/#x //' configure.ac >configure.tmp +mv -f configure.tmp configure.ac echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am $ACLOCAL diff --git a/t/gettext.sh b/t/gettext.sh index 7cf62ef..88c6138 100755 --- a/t/gettext.sh +++ b/t/gettext.sh @@ -46,8 +46,8 @@ if $ACLOCAL; then fi : >config.rpath -sed '/AM_GNU_GETTEXT_VERSION/d' configure.ac >configure.int -mv -f configure.int configure.ac +sed '/AM_GNU_GETTEXT_VERSION/d' configure.ac >configure.tmp +mv -f configure.tmp configure.ac $ACLOCAL diff --git a/t/mmode.sh b/t/mmode.sh index ea26c02..9475130 100755 --- a/t/mmode.sh +++ b/t/mmode.sh @@ -38,14 +38,14 @@ grep '^MAINT.*#' Makefile ./configure --enable-maintainer-mode grep '^MAINT.*#' Makefile && exit 1 -sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.ac > configure.int -mv -f configure.int configure.ac +sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.ac > configure.tmp +mv -f configure.tmp configure.ac mv configure configure1 $AUTOCONF --force diff configure configure1 -sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.ac > configure.int -mv -f configure.int configure.ac +sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.ac > configure.tmp +mv -f configure.tmp configure.ac $AUTOCONF --force ./configure @@ -57,8 +57,8 @@ grep '^MAINT.*#' Makefile && exit 1 ./configure --disable-maintainer-mode grep '^MAINT.*#' Makefile -sed 's/\(AM_MAINTAINER_MODE\).*/\1([foo])/' configure.ac > configure.int -mv -f configure.int configure.ac +sed 's/\(AM_MAINTAINER_MODE\).*/\1([foo])/' configure.ac > configure.tmp +mv -f configure.tmp configure.ac $AUTOCONF --force -Werror && exit 1 : diff --git a/t/pr401.sh b/t/pr401.sh index 3e73b0d..36ca5a3 100755 --- a/t/pr401.sh +++ b/t/pr401.sh @@ -93,8 +93,8 @@ $MAKE distcheck # Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons # unrelated to Automake or Makefile.am layout. -sed 's/#: //' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/#: //' configure.ac >configure.tmp +mv -f configure.tmp configure.ac $ACLOCAL $AUTOCONF @@ -118,8 +118,8 @@ mv -f src/t src/Makefile.am ## Test using LIBOBJS from a sibling directory. ## ## -------------------------------------------- ## -sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp +mv -f configure.tmp configure.ac cat >Makefile.am <<'EOF' SUBDIRS = src @@ -155,8 +155,8 @@ $MAKE distclean ## Test using LIBOBJS from parent directory. ## ## ----------------------------------------- ## -sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/^.*src\/Makefile.*$//' configure.ac >configure.tmp +mv -f configure.tmp configure.ac cat >Makefile.am <<'EOF' AUTOMAKE_OPTIONS = subdir-objects diff --git a/t/pr401b.sh b/t/pr401b.sh index 6193587..ad88b37 100755 --- a/t/pr401b.sh +++ b/t/pr401b.sh @@ -94,8 +94,8 @@ $MAKE distcheck # Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons # unrelated to Automake or Makefile.am layout. -sed 's/#: //' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/#: //' configure.ac >configure.tmp +mv -f configure.tmp configure.ac $ACLOCAL $AUTOCONF @@ -118,8 +118,8 @@ mv -f src/t src/Makefile.am ## Test using LTLIBOBJS from a sibling directory. ## ## ---------------------------------------------- ## -sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp +mv -f configure.tmp configure.ac cat >Makefile.am <<'EOF' SUBDIRS = src @@ -155,8 +155,8 @@ $MAKE distclean ## Test using LTLIBOBJS from parent directory. ## ## ------------------------------------------- ## -sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/^.*src\/Makefile.*$//' configure.ac >configure.tmp +mv -f configure.tmp configure.ac cat >Makefile.am <<'EOF' AUTOMAKE_OPTIONS = subdir-objects diff --git a/t/pr401c.sh b/t/pr401c.sh index 96561c5..9331a50 100755 --- a/t/pr401c.sh +++ b/t/pr401c.sh @@ -95,8 +95,8 @@ $MAKE distcheck # Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons # unrelated to Automake or Makefile.am layout. -sed 's/#: //' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/#: //' configure.ac >configure.tmp +mv -f configure.tmp configure.ac $ACLOCAL $AUTOCONF @@ -120,8 +120,8 @@ mv -f src/t src/Makefile.am ## Test using ALLOCA from a sibling directory. ## ## ------------------------------------------- ## -sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp +mv -f configure.tmp configure.ac cat >Makefile.am <<'EOF' SUBDIRS = src @@ -157,8 +157,8 @@ $MAKE distclean ## Test using ALLOCA from parent directory. ## ## ---------------------------------------- ## -sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/^.*src\/Makefile.*$//' configure.ac >configure.tmp +mv -f configure.tmp configure.ac cat >Makefile.am <<'EOF' AUTOMAKE_OPTIONS = subdir-objects diff --git a/t/python11.sh b/t/python11.sh index a648c7b..e316b27 100755 --- a/t/python11.sh +++ b/t/python11.sh @@ -43,8 +43,8 @@ grep 'checking for IShouldNotExist1' stdout grep 'checking for IShouldNotExist2' stdout grep 'no suitable Python interpreter found' stderr -sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.ac >configure.int -mv -f configure.int configure.ac +sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.ac >configure.tmp +mv -f configure.tmp configure.ac $ACLOCAL --force $AUTOCONF --force # This one should define PYTHON as ":" and exit successfully. -- 1.8.0.1.409.g252f922