Merge branch 'testsuite-more-namespace-safeness' into testsuite-work

* testsuite-more-namespace-safeness:
  tests defs: more namespace-safeness

diff --cc ChangeLog
index ae2eb2b,43b2a6e..1da4dc7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,26 +1,33 @@@
+ 2011-09-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests defs: more namespace-safeness
+       ($using_tap): Renamed ...
+       ($am_using_tap): ... to this.
+       ($parallel_tests): Renamed ...
+       ($am_parallel_tests): ... to this.
+       ($test_prefer_config_shell): Renamed ...
+       ($am_test_prefer_config_shell): ... to this.
+       ($original_AUTOMAKE): Renamed ...
+       ($am_original_AUTOMAKE): ... to this.
+       ($original_ACLOCAL): Renamed ...
+       ($am_original_ACLOCAL): ... to this.
+       * tests/defs, tests/defs-static.in, tests/gen-testsuite-part,
+       tests/README, and all callers: Adjusted.
+       * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Adjust, and rewrite
+       to make future adjustments easier.
+       * tests/defs (funcs_file_): Renamed ...
+       (am_funcs_file): ... to this.
+       * Makefile.am (sc_tests_obsolete_variables): New maintainer
+       check.
+       (syntax_check_rules): Add it.
+ 
 +2011-09-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      aclocal: better URL reference in error message
 +      * aclocal.in (scan_file): In the error message about underquoted
 +      definitions, reference the automake page at `www.gnu.org', not
 +      at `sources.redhat.com'.
 +
  2011-09-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: avoid creating useless files in some test directories