diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-02 18:27:33 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-03 21:11:25 +0100 |
| commit | c3ae7eebc32ff85ca9950c787b37dff2c01e2ae2 (patch) | |
| tree | 0a2591fb8c2d040824268f36eba44d03894f8887 | |
| parent | 5cede9e392a2fabcb54678db7a2cae5fdaedb5a4 (diff) | |
Turn off anti-flooding in the test wrapper, not in exec-with-log.sh
We don't use exec-with-log.sh when installed.
| -rw-r--r-- | tests/twisted/run-test.sh.in | 6 | ||||
| -rw-r--r-- | tests/twisted/tools/exec-with-log.sh.in | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in index d688888..6f85a3d 100644 --- a/tests/twisted/run-test.sh.in +++ b/tests/twisted/run-test.sh.in @@ -47,6 +47,12 @@ else export IDLE_SSL_CERT fi +# Turn off anti-flooding to hurry the tests up (without this, +# channels/join-muc-channel-bouncer.py will time out, and the rest +# will be really slow) +IDLE_HTFU=seriously +export IDLE_HTFU + if [ -n "$1" ] ; then list="$1" else diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in index b3629c3..e858e1c 100644 --- a/tests/twisted/tools/exec-with-log.sh.in +++ b/tests/twisted/tools/exec-with-log.sh.in @@ -2,7 +2,7 @@ cd "@abs_top_builddir@/tests/twisted/tools" -export IDLE_DEBUG=all IDLE_HTFU=seriously +export IDLE_DEBUG=all G_MESSAGES_DEBUG=all export G_MESSAGES_DEBUG ulimit -c unlimited |