Merge lp:~mardy/libsignon-glib/multi-arch into lp:libsignon-glib

[Alberto Mardegan]

Multi arch support

Multi arch support

Also, show log file when build fails.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-amd64-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libsignon-glib-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

Thanks, looks good!

review: Approve

[David Barth (dbarth)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:154
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/12/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-amd64-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libsignon-glib-ci/12/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/libsignon-glib/multi-arch]

155. By Alberto Mardegan on 2015-04-20

Do not count on mechanisms being ordered

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:155
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libsignon-glib-ci/13/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-06-16 14:12:07 +0000
+++ debian/control	2015-04-20 11:34:18 +0000
@@ -27,6 +27,9 @@
 Package: libsignon-glib-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support,
+             ${misc:Pre-Depends},
 Depends: libsignon-glib1 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends},
@@ -41,7 +44,9 @@
 Package: libsignon-glib1
 Section: libs
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Pre-Depends: multiarch-support,
+             ${misc:Pre-Depends},
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: library for signond
 
=== modified file 'debian/rules'
--- debian/rules	2013-06-05 11:47:45 +0000
+++ debian/rules	2015-04-20 11:34:18 +0000
@@ -8,6 +8,13 @@
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-gtk-doc
 
+override_dh_auto_test:
+	dh_auto_test || ( \
+		echo "Tests failed. Log:"; \
+		cat tests/test-suite.log; \
+		false \
+	)
+
 override_dh_install:
 	# install the python3 gir override file as well
 	PYTHON=python3 ./configure --prefix=/usr
 
=== modified file 'tests/check_signon.c'
--- tests/check_signon.c	2014-12-09 08:52:37 +0000
+++ tests/check_signon.c	2015-04-20 11:34:18 +0000
@@ -47,6 +47,18 @@
 
 #define SIGNOND_IDLE_TIMEOUT (5 + 2)
 
+static gboolean _contains(gchar **list, gchar *item)
+{
+    gboolean present = FALSE;
+    gint i = 0;
+    while (list[i] != NULL)
+    {
+        if (g_strcmp0 (item, list[i]) == 0) present = TRUE;
+        i++;
+    }
+    return present;
+}
+
 static void
 end_test ()
 {
@@ -239,7 +251,7 @@
     while ( i > 0 )
     {
         gchar* pattern = patterns[--i];
-        fail_unless(g_strcmp0(pattern, mechanisms[i]) == 0, "The obtained mechanism differs from predefined pattern: %s vs %s", mechanisms[i], pattern);
+        fail_unless(_contains(mechanisms, pattern), "The obtained mechanism list does not contain %s", pattern);
     }
 
     g_strfreev(mechanisms);
@@ -1002,18 +1014,6 @@
 }
 END_TEST
 
-static gboolean _contains(gchar **mechs, gchar *mech)
-{
-    gboolean present = FALSE;
-    gint i = 0;
-    while (mechs[i] != NULL)
-    {
-        if (g_strcmp0 (mech, mechs[i]) == 0) present = TRUE;
-        i++;
-    }
-    return present;
-}
-
 static void identity_info_cb(SignonIdentity *self, const SignonIdentityInfo *info, const GError *error, gpointer user_data)
 {
      if (error)