diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 14:52:21 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 15:01:15 +0200 |
| commit | 062aeb245e68208dccb3ccc9b28e100a81dbc79b (patch) | |
| tree | 916ca4ae612169af518ca3c4b81ceb2e94567d6d /Makefile.am | |
| parent | 488de31efa525d864ad56cd023f3b33c83101088 (diff) | |
| parent | 3a1a8c6d3cb46bfe65b715ddd8a3e0d7e27e1bf7 (diff) | |
| download | automake-062aeb245e68208dccb3ccc9b28e100a81dbc79b.tar.gz | |
Merge branch 'maint'
* maint:
tests: automatic re-execution works for non-POSIX shells too
tests: use more POSIX shell features our test scripts
+ Extra non-trivial edits:
* t/ax/test-init.sh: Apply the diffs between past versions of
'defs' in maint and in master; i.e., remove handling of $required
entries 'texi2dvi-o' and 'makeinfo-html', and adjust to the fact
that the parallel testsuite harness is now the default.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e581cf20f..d9f0ae25c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -381,8 +381,11 @@ $(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part Makefile.am # Static dependencies valid for each test case. check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION) -dist_check_DATA = t/ax/plain-functions.sh t/ax/tap-functions.sh -check_DATA = defs defs-static +dist_check_DATA = \ + t/ax/test-init.sh \ + t/ax/plain-functions.sh \ + t/ax/tap-functions.sh +nodist_check_DATA = defs-static # Few more static dependencies. t/distcheck-missing-m4.log: t/ax/distcheck-hook-m4.am |