diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-01-20 19:00:46 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-01-20 19:00:46 +0000 |
| commit | 978f93ba348ef3b472edc7f3e3c6d60c8b44c951 (patch) | |
| tree | 2b7b59ef64c0119d0c0a1f82cfdb13de13968e07 | |
| parent | 9842081653c93831bf509d2954b6cc99a63b3a52 (diff) | |
Insert "wait for exit" in a way that only enables it when using lcov or refdbg
Based on comments from Guillaume.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | tests/twisted/Makefile.am | 10 | ||||
| -rw-r--r-- | tools/lcov.am | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 8fb5722ff..eb7ce9650 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,4 +10,6 @@ check-twisted: all check-all: check check-twisted include tools/lcov.am +LCOV_CHECK_ARGS = CHECK_TWISTED_SLEEP=6 + include tools/telepathy.am diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index 95386479d..2a06e653c 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -98,12 +98,20 @@ TESTS_ENVIRONMENT = \ check-local: check-coding-style check-twisted +# set to 6 when using refdbg, to give Gabble time to exit +CHECK_TWISTED_SLEEP=0 + check-twisted: $(MAKE) -C tools rm -f tools/core rm -f tools/gabble-testing.log + if test -n "$$GABBLE_TEST_REFDBG"; then \ + sleep=6; \ + else \ + sleep=$(CHECK_TWISTED_SLEEP); \ + fi; \ sh $(srcdir)/tools/with-session-bus.sh \ - --sleep=6 \ + --sleep=$$sleep \ --config-file=tools/tmp-session-bus.conf \ -- $(MAKE) check-TESTS \ TESTS="$(TWISTED_TESTS)" \ diff --git a/tools/lcov.am b/tools/lcov.am index 494eea0fe..7384f1b99 100644 --- a/tools/lcov.am +++ b/tools/lcov.am @@ -18,7 +18,7 @@ lcov-report: lcov-check: $(MAKE) lcov-reset - $(MAKE) check + $(MAKE) check $(LCOV_CHECK_ARGS) $(MAKE) lcov-report ## vim:set ft=automake: |