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

Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 155
Merged at revision: 154
Proposed branch: lp:~mardy/libsignon-glib/multi-arch
Merge into: lp:libsignon-glib
Diff against target: 93 lines (+26/-14)
3 files modified
debian/control (+6/-1)
debian/rules (+7/-0)
tests/check_signon.c (+13/-13)
To merge this branch: bzr merge lp:~mardy/libsignon-glib/multi-arch
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
David Barth Pending
Alberto Mardegan Pending
Review via email: mp+256782@code.launchpad.net

This proposal supersedes a proposal from 2015-04-07.

Commit message

Multi arch support

Description of the change

Multi arch support

Also, show log file when build fails.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote : Posted in a previous version of this proposal

Thanks, looks good!

review: Approve
Revision history for this message
David Barth (dbarth) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~mardy/libsignon-glib/multi-arch updated
155. By Alberto Mardegan

Do not count on mechanisms being ordered

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-06-16 14:12:07 +0000
3+++ debian/control 2015-04-20 11:34:18 +0000
4@@ -27,6 +27,9 @@
5 Package: libsignon-glib-dev
6 Section: libdevel
7 Architecture: any
8+Multi-Arch: same
9+Pre-Depends: multiarch-support,
10+ ${misc:Pre-Depends},
11 Depends: libsignon-glib1 (= ${binary:Version}),
12 ${shlibs:Depends},
13 ${misc:Depends},
14@@ -41,7 +44,9 @@
15 Package: libsignon-glib1
16 Section: libs
17 Architecture: any
18-Pre-Depends: ${misc:Pre-Depends}
19+Multi-Arch: same
20+Pre-Depends: multiarch-support,
21+ ${misc:Pre-Depends},
22 Depends: ${shlibs:Depends},
23 ${misc:Depends}
24 Description: library for signond
25
26=== modified file 'debian/rules'
27--- debian/rules 2013-06-05 11:47:45 +0000
28+++ debian/rules 2015-04-20 11:34:18 +0000
29@@ -8,6 +8,13 @@
30 override_dh_auto_configure:
31 dh_auto_configure -- --enable-gtk-doc
32
33+override_dh_auto_test:
34+ dh_auto_test || ( \
35+ echo "Tests failed. Log:"; \
36+ cat tests/test-suite.log; \
37+ false \
38+ )
39+
40 override_dh_install:
41 # install the python3 gir override file as well
42 PYTHON=python3 ./configure --prefix=/usr
43
44=== modified file 'tests/check_signon.c'
45--- tests/check_signon.c 2014-12-09 08:52:37 +0000
46+++ tests/check_signon.c 2015-04-20 11:34:18 +0000
47@@ -47,6 +47,18 @@
48
49 #define SIGNOND_IDLE_TIMEOUT (5 + 2)
50
51+static gboolean _contains(gchar **list, gchar *item)
52+{
53+ gboolean present = FALSE;
54+ gint i = 0;
55+ while (list[i] != NULL)
56+ {
57+ if (g_strcmp0 (item, list[i]) == 0) present = TRUE;
58+ i++;
59+ }
60+ return present;
61+}
62+
63 static void
64 end_test ()
65 {
66@@ -239,7 +251,7 @@
67 while ( i > 0 )
68 {
69 gchar* pattern = patterns[--i];
70- fail_unless(g_strcmp0(pattern, mechanisms[i]) == 0, "The obtained mechanism differs from predefined pattern: %s vs %s", mechanisms[i], pattern);
71+ fail_unless(_contains(mechanisms, pattern), "The obtained mechanism list does not contain %s", pattern);
72 }
73
74 g_strfreev(mechanisms);
75@@ -1002,18 +1014,6 @@
76 }
77 END_TEST
78
79-static gboolean _contains(gchar **mechs, gchar *mech)
80-{
81- gboolean present = FALSE;
82- gint i = 0;
83- while (mechs[i] != NULL)
84- {
85- if (g_strcmp0 (mech, mechs[i]) == 0) present = TRUE;
86- i++;
87- }
88- return present;
89-}
90-
91 static void identity_info_cb(SignonIdentity *self, const SignonIdentityInfo *info, const GError *error, gpointer user_data)
92 {
93 if (error)

Subscribers

People subscribed via source and target branches

to all changes: