On Saturday 10 September 2011, Stefano Lattarini wrote:
>
> diff --git a/ChangeLog b/ChangeLog
> index 39aa991..a73829e 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,30 @@
> +2011-09-10 Stefano Lattarini <stefano.lattar...@gmail.com>
> +
> + tests: avoid creating useless files in some test directories
> + * tests/aclocal.test: Define `$am_create_testdir' to "empty"
> + before sourcing ./defs, to avoid bringing in unused auxiliary
> + files. Related adjustments.
> + * tests/aclocal3.test: Likewise.
> + * tests/aclocal8.test: Likewise.
> + * tests/aclocal9.test: Likewise.
...
Opps, I've sent an older version of the patch! Attached is the real
patch I've pushed.
Sorry for the noise,
Stefano
From 02aa640410bb9a5106b052d16c7f54f9e926740b Mon Sep 17 00:00:00 2001
Message-Id: <02aa640410bb9a5106b052d16c7f54f9e926740b.1315689590.git.stefano.lattar...@gmail.com>
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Sat, 10 Sep 2011 21:34:19 +0200
Subject: [PATCH] tests: avoid creating useless files in some test directories
* tests/aclocal.test: Define `$am_create_testdir' to "empty"
before sourcing ./defs, to avoid bringing in unused auxiliary
files. Related adjustments.
* tests/aclocal3.test: Likewise.
* tests/aclocal8.test: Likewise.
* tests/aclocal9.test: Likewise.
* tests/acloca10.test: Likewise.
* tests/acloca11.test: Likewise.
* tests/acloca12.test: Likewise.
* tests/acloca15.test: Likewise.
* tests/acloca16.test: Likewise.
* tests/acloca17.test: Likewise.
* tests/acloca18.test: Likewise.
* tests/acloca20.test: Likewise.
* tests/acloca21.test: Likewise.
* tests/acloca23.test: Likewise.
* tests/aclocal-print-acdir.test: Likewise.
* tests/ar-lib.test: Likewise.
* tests/compile.test: Likewise.
* tests/compile2.test: Likewise.
* tests/compile3.test: Likewise.
* tests/compile6.test: Likewise.
* tests/instsh2.test: Likewise.
* tests/instsh3.test: Likewise.
* tests/mdate5.test: Likewise.
* tests/mdate6.test: Likewise.
* tests/missing3.test: Likewise.
* tests/missing5.test: Likewise.
* tests/mkinst3.test: Likewise.
* tests/self-check-explicit-skips.test: Likewise.
* tests/self-check-report.test: Likewise.
* tests/self-check-sanity.test: Likewise.
* tests/tap-driver-stderr.test: Likewise.
---
ChangeLog | 37 ++++++++++++++++++++++++++++++++++
tests/acloca10.test | 4 ++-
tests/acloca11.test | 4 ++-
tests/acloca12.test | 4 ++-
tests/acloca15.test | 3 +-
tests/acloca16.test | 3 +-
tests/acloca17.test | 8 +++++-
tests/acloca18.test | 4 ++-
tests/acloca20.test | 1 +
tests/acloca21.test | 1 +
tests/acloca23.test | 4 ++-
tests/aclocal-print-acdir.test | 1 +
tests/aclocal.test | 3 ++
tests/aclocal3.test | 7 +++++-
tests/aclocal8.test | 3 +-
tests/aclocal9.test | 4 ++-
tests/ar-lib.test | 1 +
tests/compile.test | 1 +
tests/compile2.test | 1 +
tests/compile3.test | 1 +
tests/compile6.test | 1 +
tests/instsh2.test | 1 +
tests/instsh3.test | 1 +
tests/mdate5.test | 3 +-
tests/mdate6.test | 1 +
tests/missing3.test | 1 +
tests/missing5.test | 1 +
tests/mkinst3.test | 1 +
tests/self-check-explicit-skips.test | 1 +
tests/self-check-report.test | 1 +
tests/self-check-sanity.test | 1 +
tests/tap-driver-stderr.test | 1 +
32 files changed, 96 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 39aa991..c61f044 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2011-09-10 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ tests: avoid creating useless files in some test directories
+ * tests/aclocal.test: Define `$am_create_testdir' to "empty"
+ before sourcing ./defs, to avoid bringing in unused auxiliary
+ files. Related adjustments.
+ * tests/aclocal3.test: Likewise.
+ * tests/aclocal8.test: Likewise.
+ * tests/aclocal9.test: Likewise.
+ * tests/acloca10.test: Likewise.
+ * tests/acloca11.test: Likewise.
+ * tests/acloca12.test: Likewise.
+ * tests/acloca15.test: Likewise.
+ * tests/acloca16.test: Likewise.
+ * tests/acloca17.test: Likewise.
+ * tests/acloca18.test: Likewise.
+ * tests/acloca20.test: Likewise.
+ * tests/acloca21.test: Likewise.
+ * tests/acloca23.test: Likewise.
+ * tests/aclocal-print-acdir.test: Likewise.
+ * tests/ar-lib.test: Likewise.
+ * tests/compile.test: Likewise.
+ * tests/compile2.test: Likewise.
+ * tests/compile3.test: Likewise.
+ * tests/compile6.test: Likewise.
+ * tests/instsh2.test: Likewise.
+ * tests/instsh3.test: Likewise.
+ * tests/mdate5.test: Likewise.
+ * tests/mdate6.test: Likewise.
+ * tests/missing3.test: Likewise.
+ * tests/missing5.test: Likewise.
+ * tests/mkinst3.test: Likewise.
+ * tests/self-check-explicit-skips.test: Likewise.
+ * tests/self-check-report.test: Likewise.
+ * tests/self-check-sanity.test: Likewise.
+ * tests/tap-driver-stderr.test: Likewise.
+
2011-09-09 Stefano Lattarini <stefano.lattar...@gmail.com>
test defs: more environment cleanup
diff --git a/tests/acloca10.test b/tests/acloca10.test
index daf81a1..0041d57 100755
--- a/tests/acloca10.test
+++ b/tests/acloca10.test
@@ -23,9 +23,11 @@
# TODO: write a sister test that doesn't use a `dirlist' file, but
# TODO: puts third-party macros directly into `acdir'.
+am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
+AC_INIT
MACRO2
MACRO1
MACRO3
diff --git a/tests/acloca11.test b/tests/acloca11.test
index 25e7a50..ddb9156 100755
--- a/tests/acloca11.test
+++ b/tests/acloca11.test
@@ -17,9 +17,11 @@
# Make sure that when two files define the same macro in the same
# directory, the macro from the lexically greatest file is used.
+am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
+AC_INIT
MACRO2
MACRO1
END
diff --git a/tests/acloca12.test b/tests/acloca12.test
index 2fb57e9..d4d1464 100755
--- a/tests/acloca12.test
+++ b/tests/acloca12.test
@@ -18,9 +18,11 @@
# directory, the macro from the lexically greatest file is used.
# Same as acloca11.test, but without calling MACRO2.
+am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
MACRO1
END
diff --git a/tests/acloca15.test b/tests/acloca15.test
index 9cb70d1..b1f3723 100755
--- a/tests/acloca15.test
+++ b/tests/acloca15.test
@@ -17,12 +17,13 @@
# Make sure aclocal scans configure.in for macro definitions.
# PR/319.
+am_create_testdir=empty
. ./defs || Exit 1
# Start macros with AM_ because that causes aclocal to complain if it
# cannot find them.
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
m4_include([somedef.m4])
AC_DEFUN([AM_SOME_MACRO])
AC_DEFUN([AM_SOME_OTHER_MACRO])
diff --git a/tests/acloca16.test b/tests/acloca16.test
index 5f6dc60..3300856 100755
--- a/tests/acloca16.test
+++ b/tests/acloca16.test
@@ -17,9 +17,10 @@
# Make sure aclocal does not include definitions that are not actually
# evaluated.
+am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
AC_SUBST([POM])
END
diff --git a/tests/acloca17.test b/tests/acloca17.test
index c1355c5..282dc7e 100755
--- a/tests/acloca17.test
+++ b/tests/acloca17.test
@@ -16,9 +16,11 @@
# Make sure aclocal report unused required macros.
+am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
+AC_INIT
SOME_DEFS
END
@@ -34,4 +36,6 @@ EOF
WARNINGS=error $ACLOCAL -I m4 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
-grep 'configure.in:4:.*UNDEFINED_MACRO' stderr
+grep '^configure\.in:2:.*UNDEFINED_MACRO' stderr
+
+:
diff --git a/tests/acloca18.test b/tests/acloca18.test
index cb5c408..f68303d 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -17,9 +17,11 @@
# Test for --install with #serial numbers.
+am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
+AC_INIT
AM_MACRO1
AM_MACRO2
END
diff --git a/tests/acloca20.test b/tests/acloca20.test
index 9f692f8..064fcde 100755
--- a/tests/acloca20.test
+++ b/tests/acloca20.test
@@ -16,6 +16,7 @@
# Make sure aclocal does not write into symlinked aclocal.m4.
+am_create_testdir=empty
. ./defs || Exit 1
cat >foo.m4 <<'END'
diff --git a/tests/acloca21.test b/tests/acloca21.test
index 541892f..716cd80 100755
--- a/tests/acloca21.test
+++ b/tests/acloca21.test
@@ -19,6 +19,7 @@
# Also make sure aclocal does not think 'include' is
# an Autoconf macro.
+am_create_testdir=empty
. ./defs || Exit 1
cat >>configure.in <<EOF
diff --git a/tests/acloca23.test b/tests/acloca23.test
index 5a05ed2..f4f8a22 100755
--- a/tests/acloca23.test
+++ b/tests/acloca23.test
@@ -16,9 +16,11 @@
# Ensure we diagnose underquoted AC_DEFUN's.
+am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
+AC_INIT
FOO
END
diff --git a/tests/aclocal-print-acdir.test b/tests/aclocal-print-acdir.test
index 297c702..c55ae2b 100755
--- a/tests/aclocal-print-acdir.test
+++ b/tests/aclocal-print-acdir.test
@@ -16,6 +16,7 @@
# Test on aclocal's `--print-ac-dir' option.
+am_create_testdir=empty
. ./defs || Exit 1
set -e
diff --git a/tests/aclocal.test b/tests/aclocal.test
index 47c7dfa..b85250f 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -17,8 +17,11 @@
# Test on some aclocal options. Report from Alexandre Oliva.
+am_create_testdir=empty
. ./defs || Exit 1
+echo "AC_INIT([$me], [0]) AM_INIT_AUTOMAKE" > configure.in
+
$ACLOCAL --output=fred
test -f fred
diff --git a/tests/aclocal3.test b/tests/aclocal3.test
index f5b2474..f679239 100755
--- a/tests/aclocal3.test
+++ b/tests/aclocal3.test
@@ -16,9 +16,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure include of include detects missing macros
+
+am_create_testdir=empty
. ./defs || Exit 1
-echo GNOME_X_CHECKS >> configure.in
+cat >> configure.in <<END
+AC_INIT([$me], [1.0])
+GNOME_X_CHECKS
+END
mkdir macros
diff --git a/tests/aclocal8.test b/tests/aclocal8.test
index 2a1a51a..86d0e02 100755
--- a/tests/aclocal8.test
+++ b/tests/aclocal8.test
@@ -16,9 +16,10 @@
# Make sure aclocal does not require unused macros.
+am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
SOME_DEFS
END
diff --git a/tests/aclocal9.test b/tests/aclocal9.test
index b182a1a..3149341 100755
--- a/tests/aclocal9.test
+++ b/tests/aclocal9.test
@@ -16,9 +16,11 @@
# Make sure aclocal define macros in the same order as -I's.
+am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
+AC_INIT
MACRO1
MACRO2
END
diff --git a/tests/ar-lib.test b/tests/ar-lib.test
index 6f9c93c..116640f 100755
--- a/tests/ar-lib.test
+++ b/tests/ar-lib.test
@@ -16,6 +16,7 @@
# Make sure `ar-lib' wraps the Microsoft Library Manager (lib) correctly.
+am_create_testdir=empty
required=xsi-lib-shell
. ./defs || Exit 1
diff --git a/tests/compile.test b/tests/compile.test
index 0ba9ddf..12fb2be 100755
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -16,6 +16,7 @@
# Make sure `compile' preserves spaces in its arguments.
+am_create_testdir=empty
. ./defs || Exit 1
get_shell_script compile
diff --git a/tests/compile2.test b/tests/compile2.test
index 180fcc3..c89be9f 100755
--- a/tests/compile2.test
+++ b/tests/compile2.test
@@ -16,6 +16,7 @@
# Make sure `compile' deals correctly with w32 style paths.
+am_create_testdir=empty
. ./defs || Exit 1
get_shell_script compile
diff --git a/tests/compile3.test b/tests/compile3.test
index b703f66..800db1d 100755
--- a/tests/compile3.test
+++ b/tests/compile3.test
@@ -16,6 +16,7 @@
# Make sure `compile' wraps the Microsoft C/C++ compiler (cl) correctly
+am_create_testdir=empty
required=xsi-lib-shell
. ./defs || Exit 1
diff --git a/tests/compile6.test b/tests/compile6.test
index fff1487..5a2ac91 100755
--- a/tests/compile6.test
+++ b/tests/compile6.test
@@ -16,6 +16,7 @@
# Make sure `compile' searches libraries correctly
+am_create_testdir=empty
required=xsi-lib-shell
. ./defs || Exit 1
diff --git a/tests/instsh2.test b/tests/instsh2.test
index 8cc5f26..45e1746 100755
--- a/tests/instsh2.test
+++ b/tests/instsh2.test
@@ -17,6 +17,7 @@
# Various install-sh checks.
+am_create_testdir=empty
. ./defs || Exit 1
get_shell_script install-sh
diff --git a/tests/instsh3.test b/tests/instsh3.test
index 2cdf4a9..80c2e54 100755
--- a/tests/instsh3.test
+++ b/tests/instsh3.test
@@ -16,6 +16,7 @@
# More install-sh checks: check -C.
+am_create_testdir=empty
required=non-root
. ./defs || Exit 1
diff --git a/tests/mdate5.test b/tests/mdate5.test
index f7c7cfe..db6a6c6 100755
--- a/tests/mdate5.test
+++ b/tests/mdate5.test
@@ -17,11 +17,12 @@
# Test to make sure mdate-sh works correctly.
+am_create_testdir=empty
. ./defs || Exit 1
get_shell_script mdate-sh
-set x `./mdate-sh install-sh`
+set x `./mdate-sh mdate-sh`
shift
echo "$*" # For debugging.
diff --git a/tests/mdate6.test b/tests/mdate6.test
index 70360e7..de93f35 100755
--- a/tests/mdate6.test
+++ b/tests/mdate6.test
@@ -16,6 +16,7 @@
# mdate-sh can work with weird file names, doesn't eval too much.
+am_create_testdir=empty
. ./defs || Exit 1
a=
diff --git a/tests/missing3.test b/tests/missing3.test
index 328212c..20b2429 100755
--- a/tests/missing3.test
+++ b/tests/missing3.test
@@ -16,6 +16,7 @@
# Test missing when running a tool's --version.
+am_create_testdir=empty
. ./defs || Exit 1
get_shell_script missing
diff --git a/tests/missing5.test b/tests/missing5.test
index 1cd4918..0cb71e8 100755
--- a/tests/missing5.test
+++ b/tests/missing5.test
@@ -17,6 +17,7 @@
# Test how well `missing' finds output file names of various tools.
# PR automake/483.
+am_create_testdir=empty
. ./defs || Exit 1
get_shell_script missing
diff --git a/tests/mkinst3.test b/tests/mkinst3.test
index 3572ab2..9dba968 100755
--- a/tests/mkinst3.test
+++ b/tests/mkinst3.test
@@ -16,6 +16,7 @@
# Test mkinstalldirs with spaces in directory names.
+am_create_testdir=empty
. ./defs || Exit 1
# Make sure the directory we will create can be created...
diff --git a/tests/self-check-explicit-skips.test b/tests/self-check-explicit-skips.test
index d24e0ef..530048d 100755
--- a/tests/self-check-explicit-skips.test
+++ b/tests/self-check-explicit-skips.test
@@ -17,6 +17,7 @@
# Sanity check for the automake testsuite.
# Check creation/removal of temporary test working directory by `./defs'.
+am_create_testdir=empty
. ./defs || Exit 1
test x"$sh_errexit_works" = x"yes" || skip_ "no working shell exit trap"
diff --git a/tests/self-check-report.test b/tests/self-check-report.test
index 5434d5a..ae90e9f 100755
--- a/tests/self-check-report.test
+++ b/tests/self-check-report.test
@@ -20,6 +20,7 @@
unset stderr_fileno_ || :
+am_create_testdir=empty
. ./defs || Exit 1
set +e
diff --git a/tests/self-check-sanity.test b/tests/self-check-sanity.test
index 3e60a68..8626914 100755
--- a/tests/self-check-sanity.test
+++ b/tests/self-check-sanity.test
@@ -19,6 +19,7 @@
# that we can use `defs' elsewhere, when we duplicate some of the
# infrastructure from the automake/tests subdirectory.
+am_create_testdir=empty
. ./defs || Exit 1
# Avoid to confuse traces from child processed with our own traces.
diff --git a/tests/tap-driver-stderr.test b/tests/tap-driver-stderr.test
index 396624e..1147341 100755
--- a/tests/tap-driver-stderr.test
+++ b/tests/tap-driver-stderr.test
@@ -19,6 +19,7 @@
required=non-root
parallel_tests=yes
+am_create_testdir=empty
. ./defs || Exit 1
fetch_tap_driver
--
1.7.2.3
