tests: better names for temporary configure.ac files

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.lattarini@gmail.com>

diff --git a/t/cond42.sh b/t/cond42.sh
index b3d0305cee8ac3605937fc52f0d88c631f95f5fd..f90341d28b71e321447872a9a1836ac1e4165a9a 100755 (executable)
--- 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 ff336756de0f3b52b52e78317074c065a9daa29d..c5da21cd71b9634230f2252517db7f1e43b0239b 100755 (executable)
--- 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 3d58a3eeb341623822368f1a6d4d23be2bb54100..bc0c276a50bf8c255fd57ae1dfcfce77c74da6bd 100755 (executable)
--- 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 6fed2155c329a497248b67744576eb337ccbcaf8..54834d64166a2e9bc38683a98d102c33b299fd0e 100755 (executable)
--- 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 7cf62efaba6db9b9b0c63886f0dadc2a0e04a79b..88c613844108eae634c9e51fcd79f5a67ad5d68c 100755 (executable)
--- 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 ea26c0202ec8c112a8fd8eee2bf66136e47815e4..94751307265b5033f4794777a3a6d0818c1fedb5 100755 (executable)
--- 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 3e73b0d4e1c72e6c062242c93e37e549da3be79a..36ca5a35db96e1b039288ca1f661fa54c07b0ed0 100755 (executable)
--- 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 61935879a7b0d0981240ff30beac6a3f1b54c040..ad88b37e184d0ba77fc020637aad9de5f21badf0 100755 (executable)
--- 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 96561c5e22877f7a9d899cedb593e45853520985..9331a50431ef7a406b395988aac4dfb895b759bb 100755 (executable)
--- 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 a648c7b33958d2a3cdb6a4cd8a4126473b964dcc..e316b2720271fc32011f5f8e18fbd96ae7f42bda 100755 (executable)
--- 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.