diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-11 12:13:24 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-11 15:36:40 +0200 |
| commit | 99c26fbed6d30afcf2525b8204da37de0bdebda0 (patch) | |
| tree | 45790895d47cd1d4a8dfdc5ce0a215a64f1e3706 | |
| parent | 6dd2177a31a0d111dd0025892d95cbdcd2a23c78 (diff) | |
always enable Avahi tests when building with the Avahi backend
We use to have this switch because tests hitting the network were considered
touchy. But we now have an Avahi mock implementation used by default for tests
so it's no longer an issue. User has to explicitely define SALUT_TEST_REAL_AVAHI
to run tests with the system Avahi.
https://bugs.freedesktop.org/show_bug.cgi?id=69216
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | tests/twisted/Makefile.am | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 930ea94a..5ac80e0a 100644 --- a/configure.ac +++ b/configure.ac @@ -113,18 +113,6 @@ AC_MSG_RESULT([$TEST_PYTHON]) AC_SUBST(TEST_PYTHON) AM_CONDITIONAL([WANT_TWISTED_TESTS], test false != "$TEST_PYTHON") -dnl enable avahi tests -AC_ARG_ENABLE(avahi-tests, - AC_HELP_STRING([ --enable-avahi-tests], - [Enable tests that use the system avahi to hit the network ]), - enable_avahi_tests=$enableval, enable_avahi_tests=yes) - -AS_IF([test x$enable_avahi_tests = xyes], - [AS_IF([test false = "$TEST_PYTHON"], - [AC_MSG_ERROR( - [Python with twisted support is needed for avahi twisted tests])])]) -AM_CONDITIONAL(WANT_TWISTED_AVAHI_TESTS, test "x$enable_avahi_tests" = "xyes") - dnl olpc specific code switch AC_ARG_ENABLE(olpc, AC_HELP_STRING([--enable-olpc],[compile with olpc specific code]), @@ -401,7 +389,6 @@ Configure summary: Backend.....................: ${backend} Enable debug................: ${enable_debug} Python tests................: ${tests_enabled} - Avahi tests.................: ${enable_avahi_tests} Plugins.....................: ${enable_plugins} Features: diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index a434bbcf..c5651291 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -69,7 +69,7 @@ if ENABLE_OLPC TWISTED_AVAHI_TESTS += $(TWISTED_AVAHI_OLPC_TESTS) endif -if WANT_TWISTED_AVAHI_TESTS +if USE_BACKEND_AVAHI TWISTED_TESTS += $(TWISTED_AVAHI_TESTS) endif |