diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-26 15:26:21 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-26 15:26:21 +0100 |
| commit | c4bfa12099858594001c15a2b1750977aaef814d (patch) | |
| tree | c20f4422767aa48888a82163df78edb86fb83109 /tests | |
| parent | 28b64163e8bbca02de308612f6653ed291e2b1df (diff) | |
tests: when built without soup, don't test google relay
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/twisted/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/twisted/jingle/google-relay.py | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index 3bb3a241d..44bf97daa 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -300,6 +300,12 @@ else CHANNEL_TYPE_CALL_ENABLED_PYBOOL = False endif +if ENABLE_GOOGLE_RELAY +GOOGLE_RELAY_ENABLED_PYBOOL = True +else +GOOGLE_RELAY_ENABLED_PYBOOL = False +endif + config.py: Makefile $(AM_V_GEN) { \ echo "PACKAGE_STRING = \"$(PACKAGE_STRING)\""; \ @@ -307,6 +313,7 @@ config.py: Makefile echo "DEBUGGING = $(DEBUGGING_PYBOOL)"; \ echo "PLUGINS_ENABLED = $(PLUGINS_ENABLED_PYBOOL)"; \ echo "CHANNEL_TYPE_CALL_ENABLED = $(CHANNEL_TYPE_CALL_ENABLED_PYBOOL)"; \ + echo "GOOGLE_RELAY_ENABLED = $(GOOGLE_RELAY_ENABLED_PYBOOL)"; \ } > $@ BUILT_SOURCES = config.py diff --git a/tests/twisted/jingle/google-relay.py b/tests/twisted/jingle/google-relay.py index 419b97121..1fdad5fcf 100644 --- a/tests/twisted/jingle/google-relay.py +++ b/tests/twisted/jingle/google-relay.py @@ -2,6 +2,12 @@ Test getting relay from Google jingleinfo """ +import config + +if not config.GOOGLE_RELAY_ENABLED: + print "NOTE: built with --disable-google-relay" + raise SystemExit(77) + from gabbletest import exec_test, make_result_iq, sync_stream, \ GoogleXmlStream, disconnect_conn from servicetest import make_channel_proxy, \ |