* 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/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 | 27 +++++++++++++++++++++++++++ tests/aclocal-print-acdir.test | 1 + tests/aclocal.test | 3 +++ tests/aclocal3.test | 7 ++++++- tests/aclocal8.test | 2 ++ 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 + 22 files changed, 59 insertions(+), 3 deletions(-)
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. + * 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/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..756f7c4 100755 --- a/tests/aclocal8.test +++ b/tests/aclocal8.test @@ -16,9 +16,11 @@ # Make sure aclocal does not require unused macros. +am_create_testdir=empty . ./defs || Exit 1 cat >> configure.in << 'END' +AC_INIT 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