diff options
| author | Zack Weinberg <zackw@panix.com> | 2020-10-28 17:04:22 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2020-10-29 11:15:48 -0400 |
| commit | bc7bb0eba61183078330979684fd46788d24a581 (patch) | |
| tree | 84f7c7a9a3107c206db4c36b1b304b8b1bd92ea3 /tests/compile.at | |
| parent | 5147a642966e2247827cfd9e6f71464439c6d773 (diff) | |
| download | autoconf-bc7bb0eba61183078330979684fd46788d24a581.tar.gz | |
Autotest: add official way to execute code before all/each test.zack/autotest-new-hooks
Currently, there isn’t any documented way for an Autotest testsuite to
add custom code to be run either right before the main driver loop, or
at the point of each AT_SETUP. For instance, there’s no good place to
put environment variable sanitization that should apply to the entire
testsuite (but isn’t universally relevant), or shell function
definitions to be used by custom test macros.
Autoconf’s test suite is poking shell functions directly into the
PREPARE_TESTS diversion, and doing environment variable sanitization
in each individual test. Both of these are obviously undesirable.
This patch adds three new AT_* macros that can be used to do these
things in an officially-supported way: AT_PREPARE_TESTS adds code to
be run right before the main driver loop, AT_PREPARE_EACH_TEST adds
code to be run at the beginning of each test, and AT_TEST_HELPER_FN
defines a shell function that will be available to each test. In
Autoconf’s test suite, I use AT_PREPARE_TESTS to factor out
environment variable sanitization that *ought* to apply across the
board, and AT_TEST_HELPER_FN for the helper function used by
AT_CHECK_ENV.
(This fixes the testsuite bug reported by Jannick at
https://lists.gnu.org/archive/html/autoconf/2020-10/msg00052.html .)
Comments requested particularly on the names and implementations of
the new macros. Also, it would be nice to have an example of when
AT_PREPARE_EACH_TEST is useful, but I didn’t find one in the autoconf
test suite.
* lib/autotest/general.m4 (AT_PREPARE_TESTS, AT_PREPARE_EACH_TEST)
(AT_TEST_HELPER_FN): New macros.
(AT_INIT, AT_TESTED): Emit the code to report tested programs only
if it’s needed, and make sure it’s after any code added by
AT_PREPARE_TESTS.
* tests/local.at: Add AT_PREPARE_TESTS block that ensures
$MAKE is set sensibly and $MAKEFLAGS and $CONFIG_SITE are unset.
Use AT_TEST_HELPER_FN for the helper function needed by AT_CHECK_ENV.
(AT_CHECK_MAKE): No need to sanitize $MAKE or $MAKEFLAGS here.
* tests/base.at, tests/compile.at, tests/m4sh.at, tests/torture.at:
No need to unset or neutralize $CONFIG_SITE in individual tests.
* tests/autotest.at: Add tests for new macros.
* doc/autoconf.texi, NEWS: Document new macros.
Diffstat (limited to 'tests/compile.at')
| -rw-r--r-- | tests/compile.at | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/compile.at b/tests/compile.at index c93722b9..9ebe782e 100644 --- a/tests/compile.at +++ b/tests/compile.at @@ -175,11 +175,6 @@ AT_CLEANUP AT_SETUP([AC_LANG_SOURCE example]) -# Set CONFIG_SITE to a nonexistent file, so that there are -# no worries about configure output caused by sourcing a config.site. -CONFIG_SITE=no-such-file -export CONFIG_SITE - AT_DATA([configure.ac], [[# Taken from autoconf.texi:Generating Sources. # The only change is to not fail if gcc doesn't work. @@ -221,11 +216,6 @@ AT_CLEANUP AT_SETUP([AC_LANG_PROGRAM example]) -# Set CONFIG_SITE to a nonexistent file, so that there are -# no worries about configure output caused by sourcing a config.site. -CONFIG_SITE=no-such-file -export CONFIG_SITE - AT_DATA([configure.ac], [[# Taken from autoconf.texi:Generating Sources. # The only change is to not fail if gcc doesn't work. |