Attachment 85621 Details for Bug 69216 – always enable Avahi tests when building with the Avahi backend

[patch] always enable Avahi tests when building with the Avahi backend

0007-always-enable-Avahi-tests-when-building-with-the-Ava.patch (text/plain), 2.24 KB, created by Guillaume Desmottes on 2013-09-11 10:32:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-09-11 10:32:21 UTC

Size: 2.24 KB

patch

obsolete

>From 30bd273aa8d4455fc42a87ea66bb90c139ee6e8c Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Wed, 11 Sep 2013 12:13:24 +0200
>Subject: [PATCH 7/7] 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
>---
> configure.ac              | 13 -------------
> tests/twisted/Makefile.am |  2 +-
> 2 files changed, 1 insertion(+), 14 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 280f071..e31c15f 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -115,18 +115,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]),
>@@ -403,7 +391,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 1a24b95..1e98457 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
> 
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69216: 85615 | 85616 | 85617 | 85618 | 85619 | 85620 | 85621 | 85626 | 85627

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.