DBus Test Runner

Merge lp:~indicator-applet-developers/dbus-test-runner/no-werror into lp:dbus-test-runner

  1. no-werror
  2. Merge into trunk.16.10
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 103
Merged at revision: 102
Proposed branch: lp:~indicator-applet-developers/dbus-test-runner/no-werror
Merge into: lp:dbus-test-runner
Prerequisite: lp:~3v1n0/dbus-test-runner/new-priv-gobject-abi
Diff against target: 92 lines (+9/-9)
4 files modified
build.sh (+1/-1)
libdbustest/Makefile.am (+2/-2)
src/Makefile.am (+1/-1)
tests/Makefile.am (+5/-5)
To merge this branch: bzr merge lp:~indicator-applet-developers/dbus-test-runner/no-werror
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+361756@code.launchpad.net

This proposal supersedes a proposal from 2018-08-03.

Commit message

Don't build with -Werror, it causes unnecessary build failures

Description of the change

Resubmitting rebasing on lp:~3v1n0/dbus-test-runner/new-priv-gobject-abi

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for the work, the 'removing -Werror' part looks good to me but I don't understand the code change/new symbol, why do we need that to be able to remove Werror? It would be nice if those changes who be at least described in the changelog (or split in another commit if that's orthogonal to the dropping of Werror)

review: Needs Information
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Removed confusing change, as the author doesn't remember the reason for :)

So approving the -Werror removal.

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

Yeah, that part of the diff looks fine to me :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build.sh'
2--- build.sh 2009-04-23 19:56:27 +0000
3+++ build.sh 2019-01-15 09:39:50 +0000
4@@ -1,3 +1,3 @@
5 #!/bin/sh
6
7-gcc -o dbus-test-runner `pkg-config --cflags --libs glib-2.0 gobject-2.0` dbus-test-runner.c -Wall -Werror
8+gcc -o dbus-test-runner `pkg-config --cflags --libs glib-2.0 gobject-2.0` dbus-test-runner.c -Wall
9
10=== modified file 'libdbustest/Makefile.am'
11--- libdbustest/Makefile.am 2014-11-06 19:51:07 +0000
12+++ libdbustest/Makefile.am 2019-01-15 09:39:50 +0000
13@@ -40,7 +40,7 @@
14 -DBUSTLE_DUAL_MONITOR="\"$(pkgdatadir)/dbus-test-bustle-handler\"" \
15 -DWATCHDOG="\"$(pkglibexecdir)/dbus-test-watchdog\"" \
16 -DG_LOG_DOMAIN=\"libdbustest\" \
17- -Wall -Werror -Wextra
18+ -Wall -Wextra
19
20 libdbustest_la_LIBADD = \
21 libdbustest-generated.la \
22@@ -59,7 +59,7 @@
23 $(DBUS_TEST_RUNNER_CFLAGS) \
24 -I$(builddir) \
25 -DG_LOG_DOMAIN=\"libdbustest\" \
26- -Wall -Werror
27+ -Wall
28
29 libdbustest_generated_la_SOURCES = \
30 dbus-mock-iface.h \
31
32=== modified file 'src/Makefile.am'
33--- src/Makefile.am 2012-10-02 03:15:57 +0000
34+++ src/Makefile.am 2019-01-15 09:39:50 +0000
35@@ -6,7 +6,7 @@
36 $(COVERAGE_CFLAGS) \
37 -I$(top_srcdir) \
38 -DDEFAULT_SESSION_CONF="\"$(datadir)/dbus-test-runner/session.conf\"" \
39- -Wall -Werror -Wextra
40+ -Wall -Wextra
41 dbus_test_runner_LDADD = $(DBUS_TEST_RUNNER_LIBS) \
42 $(top_builddir)/libdbustest/libdbustest.la
43 dbus_test_runner_LDFLAGS = $(COVERAGE_LDFLAGS)
44
45=== modified file 'tests/Makefile.am'
46--- tests/Makefile.am 2015-09-08 22:05:14 +0000
47+++ tests/Makefile.am 2019-01-15 09:39:50 +0000
48@@ -245,7 +245,7 @@
49 test-own-name.c
50 test_own_name_CFLAGS = \
51 $(DBUS_TEST_RUNNER_CFLAGS) \
52- -Wall -Werror
53+ -Wall
54 test_own_name_LDADD = \
55 $(DBUS_TEST_RUNNER_LIBS)
56
57@@ -253,7 +253,7 @@
58 test-check-name.c
59 test_check_name_CFLAGS = \
60 $(DBUS_TEST_RUNNER_CFLAGS) \
61- -Wall -Werror
62+ -Wall
63 test_check_name_LDADD = \
64 $(DBUS_TEST_RUNNER_LIBS)
65
66@@ -351,7 +351,7 @@
67 -I$(top_srcdir) \
68 -DSESSION_CONF="\"$(top_srcdir)/data/session.conf\"" \
69 -DGETNAME_PATH="\"$(abs_builddir)/test-libdbustest-getname\"" \
70- -Wall -Werror
71+ -Wall
72 test_libdbustest_LDADD = \
73 $(DBUS_TEST_RUNNER_LIBS) \
74 $(top_builddir)/libdbustest/libdbustest.la
75@@ -360,7 +360,7 @@
76 test-libdbustest-getname.c
77 test_libdbustest_getname_CFLAGS = \
78 $(DBUS_TEST_RUNNER_CFLAGS) \
79- -Wall -Werror
80+ -Wall
81 test_libdbustest_getname_LDADD = \
82 $(DBUS_TEST_RUNNER_LIBS)
83
84@@ -389,7 +389,7 @@
85 -I$(top_srcdir) \
86 -DSESSION_CONF="\"$(top_srcdir)/data/session.conf\"" \
87 -DGETNAME_PATH="\"$(abs_builddir)/test-libdbustest-getname\"" \
88- -Wall -Werror
89+ -Wall
90 test_libdbustest_mock_LDADD = \
91 $(DBUS_TEST_RUNNER_LIBS) \
92 $(top_builddir)/libdbustest/libdbustest.la

Subscribers

People subscribed via source and target branches

to all changes: