[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.16.1-1-3-gcab8998

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit db1442bd774d19e4c398c9346c29677ba55adc6c
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 30 19:21:52 2011 +0100

    Add patch to skip stream tube credentials-passing tests where that isn't supported (i.e. kFreeBSD) (Closes: #623587)

diff --git a/debian/changelog b/debian/changelog
index 8368e8a..368724d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+telepathy-glib (0.15.2-3) UNRELEASED; urgency=low
+
+  * Add patch to skip stream tube credentials-passing tests where that
+    isn't supported (i.e. kFreeBSD) (Closes: #623587)
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 30 Jun 2011 19:20:55 +0100
+
 telepathy-glib (0.15.2-2) unstable; urgency=low
 
   * Cherry-pick upstream fix to increase timeout of the contact-lists
diff --git a/debian/patches/0001-Skip-stream-tube-credentials-passing-tests-where-uns.patch b/debian/patches/0001-Skip-stream-tube-credentials-passing-tests-where-uns.patch
new file mode 100644
index 0000000..017f7a5
--- /dev/null
+++ b/debian/patches/0001-Skip-stream-tube-credentials-passing-tests-where-uns.patch
@@ -0,0 +1,95 @@
+From 7f2065f1f432c1d42c6475f0ce74a28af7c86556 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Fri, 1 Jul 2011 00:26:15 +0100
+Subject: [PATCH] Skip stream tube credentials-passing tests where unsupported
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36801
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623587
+---
+ tests/dbus/stream-tube.c |   35 +++++++++++++++++++++++++++++++++++
+ 1 files changed, 35 insertions(+), 0 deletions(-)
+
+diff --git a/tests/dbus/stream-tube.c b/tests/dbus/stream-tube.c
+index 57c2dcf..e3410f2 100644
+--- a/tests/dbus/stream-tube.c
++++ b/tests/dbus/stream-tube.c
+@@ -18,6 +18,10 @@
+ #include "tests/lib/simple-conn.h"
+ #include "tests/lib/stream-tube-chan.h"
+ 
++#ifdef HAVE_GIO_UNIX
++# include <gio/gio.h>
++#endif
++
+ #define BUFFER_SIZE 128
+ 
+ typedef struct {
+@@ -44,6 +48,7 @@ TestContext contexts[] = {
+ };
+ 
+ static gboolean have_ipv6 = FALSE;
++static gboolean have_creds = FALSE;
+ 
+ typedef struct {
+     GMainLoop *mainloop;
+@@ -411,6 +416,14 @@ test_accept_success (Test *test,
+   guint i = GPOINTER_TO_UINT (data);
+   TpContact *contact;
+ 
++  if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_UNIX &&
++      contexts[i].access_control == TP_SOCKET_ACCESS_CONTROL_CREDENTIALS &&
++      !have_creds)
++    {
++      g_message ("skipped: credentials-passing not supported here");
++      return;
++    }
++
+   if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_IPV6 &&
+       !have_ipv6)
+     {
+@@ -518,6 +531,14 @@ test_offer_success (Test *test,
+   TpHandle bob_handle;
+   TpContact *contact;
+ 
++  if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_UNIX &&
++      contexts[i].access_control == TP_SOCKET_ACCESS_CONTROL_CREDENTIALS &&
++      !have_creds)
++    {
++      g_message ("skipped: credentials-passing not supported here");
++      return;
++    }
++
+   if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_IPV6 &&
+       !have_ipv6)
+     {
+@@ -714,6 +735,14 @@ test_offer_race (Test *test,
+   GSocketConnection *conn;
+   TpContact *contact;
+ 
++  if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_UNIX &&
++      contexts[i].access_control == TP_SOCKET_ACCESS_CONTROL_CREDENTIALS &&
++      !have_creds)
++    {
++      g_message ("skipped: credentials-passing not supported here");
++      return;
++    }
++
+   if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_IPV6 &&
+       !have_ipv6)
+     {
+@@ -1019,6 +1048,12 @@ main (int argc,
+ 
+   have_ipv6 = check_ipv6_support ();
+ 
++#ifdef HAVE_GIO_UNIX
++  have_creds = g_unix_credentials_message_is_supported ();
++#else
++  have_creds = FALSE;
++#endif
++
+   g_test_add ("/stream-tube/creation", Test, NULL, setup, test_creation,
+       teardown);
+   g_test_add ("/stream-tube/properties", Test, NULL, setup, test_properties,
+-- 
+1.7.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
index c2f3963..a040dc8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 contact-lists-test-timeout.patch
+0001-Skip-stream-tube-credentials-passing-tests-where-uns.patch

-- 
telepathy-glib packaging