diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-26 12:21:40 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-26 14:11:39 +0200 |
| commit | d8b3c5e4b81986b875f56502006288f43aee5159 (patch) | |
| tree | 22f8be673deba523de807e249ab64894eb78ffc0 /Makefile.am | |
| parent | 60f8b3de17ae8812c8e1fc6dd2eb8fe492aee9c7 (diff) | |
| download | automake-d8b3c5e4b81986b875f56502006288f43aee5159.tar.gz | |
tests: protect test libs against multiple inclusion
* t/ax/test-lib.sh, t/ax/am-test-lib.sh: Return early if already sourced.
Use the witness variables '$test_lib_sourced' and '$am_test_lib_sourced',
respectively, for this purpose.
* runtest.in, Makefile.am (AM_TESTS_ENVIRONMENT): Unset 'test_lib_sourced'
and 'am_test_lib_sourced', to avoid interferences from the environment.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index ce502b4ec..e55e43de6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -342,6 +342,8 @@ AM_TESTS_ENVIRONMENT = \ am_test_prefer_config_shell \ am_original_AUTOMAKE \ am_original_ACLOCAL \ + am_test_lib_sourced \ + test_lib_sourced \ ; do \ eval test x"\$${$$v}" = x || unset $$v; \ done; |