diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-10-27 17:52:35 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-10-27 17:52:35 +0200 |
| commit | 0dd85e069d595f169d2e41c98762a6395632c3fb (patch) | |
| tree | 1fbd63c3637c851e115dd2cf388beea3bf922f52 /contrib | |
| parent | cf8b865e19c25d5cb5ccb2def3d5d2d8b8c63d32 (diff) | |
| parent | 9fed1c8186e58ff7b2152e3901d5d62b6d86d9b9 (diff) | |
| download | automake-0dd85e069d595f169d2e41c98762a6395632c3fb.tar.gz | |
Merge branch 'master' into ng/master
* master:
tests: remove spurious leftover use of 'Exit'
tests: remove an obsolete, and probably now wrong, comment
tests: remove obsolescent references to './defs'
tests: prefer including 'test-init.sh' rather than './defs'
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/t/parallel-tests-html-recursive.sh | 2 | ||||
| -rwxr-xr-x | contrib/t/parallel-tests-html.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/t/parallel-tests-html-recursive.sh b/contrib/t/parallel-tests-html-recursive.sh index e58cca904..bf835769a 100755 --- a/contrib/t/parallel-tests-html-recursive.sh +++ b/contrib/t/parallel-tests-html-recursive.sh @@ -16,7 +16,7 @@ # Recursive use of 'check-html'. See Automake bug#11287. -. ./defs || exit 1 +. test-init.sh # Try the variants that are tried in check-html.am. while :; do diff --git a/contrib/t/parallel-tests-html.sh b/contrib/t/parallel-tests-html.sh index 6e853ab07..cdbf86b31 100755 --- a/contrib/t/parallel-tests-html.sh +++ b/contrib/t/parallel-tests-html.sh @@ -18,7 +18,7 @@ # - check-html # - recheck-html -. ./defs || exit 1 +. test-init.sh # Try the variants that are tried in check-html.am. while :; do |