diff options
author | Chong Lu <Chong.Lu@windriver.com> | 2014-05-14 17:29:07 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-15 23:24:42 +0100 |
commit | 48fc1aac623347eaed87ec640aab0376839569c7 (patch) | |
tree | c9a5194cbb8573c7c0cf76603196ccde67490136 /meta/recipes-core/dbus/dbus/ptest.patch | |
parent | 53082b1ae6df280afa9b7548fef93c9409cd7352 (diff) | |
download | poky-48fc1aac623347eaed87ec640aab0376839569c7.tar.gz |
dbus: Update to 1.8.2 version
Upgrade dbus to 1.8.2.
Modify ptest suite to make it enabled on new version.
If systemd in DISTRO_FEATURES, we expect to install dbus systemd
unit files.
Remove unneeded patches since it's included in new version.
Remove unrecognized option: "--with-xml"
[YOCTO #6092]
(From OE-Core rev: 596470547451084944082cbed50351ad0d912255)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus/dbus/ptest.patch')
-rw-r--r-- | meta/recipes-core/dbus/dbus/ptest.patch | 154 |
1 files changed, 0 insertions, 154 deletions
diff --git a/meta/recipes-core/dbus/dbus/ptest.patch b/meta/recipes-core/dbus/dbus/ptest.patch deleted file mode 100644 index 263d17eff7..0000000000 --- a/meta/recipes-core/dbus/dbus/ptest.patch +++ /dev/null | |||
@@ -1,154 +0,0 @@ | |||
1 | Add install-ptest rules. | ||
2 | Change TEST_ENVIRONMENT to allow running outside build dir. | ||
3 | |||
4 | Makefile.am | 7 +++++++ | ||
5 | bus/Makefile.am | 6 ++++++ | ||
6 | dbus/Makefile.am | 6 ++++++ | ||
7 | doc/Makefile.am | 4 ++++ | ||
8 | test/Makefile.am | 25 ++++++++++++++++++++----- | ||
9 | test/name-test/Makefile.am | 9 +++++++++ | ||
10 | tools/Makefile.am | 12 ++++++++++++ | ||
11 | 7 files changed, 64 insertions(+), 5 deletions(-) | ||
12 | |||
13 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
14 | Upstream-Status: Pending | ||
15 | |||
16 | diff -ur a/Makefile.am b/Makefile.am | ||
17 | --- a/Makefile.am 2012-12-06 14:34:01.157414449 +0100 | ||
18 | +++ b/Makefile.am 2012-12-06 15:21:14.447113035 +0100 | ||
19 | @@ -30,4 +30,11 @@ | ||
20 | |||
21 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | ||
22 | |||
23 | +if DBUS_BUILD_TESTS | ||
24 | +install-ptest: | ||
25 | + @for subdir in $(SUBDIRS); do \ | ||
26 | + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ | ||
27 | + done | ||
28 | +endif | ||
29 | + | ||
30 | include tools/lcov.am | ||
31 | diff -ur a/bus/Makefile.am b/bus/Makefile.am | ||
32 | --- a/bus/Makefile.am 2012-12-06 14:34:01.169413931 +0100 | ||
33 | +++ b/bus/Makefile.am 2012-12-06 15:21:14.463112346 +0100 | ||
34 | @@ -290,3 +290,9 @@ | ||
35 | #### Extra dist | ||
36 | |||
37 | EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) | ||
38 | + | ||
39 | +if DBUS_BUILD_TESTS | ||
40 | +install-ptest: | ||
41 | + @$(MKDIR_P) $(DESTDIR) | ||
42 | + @install $(dbus_daemon_exec_PROGRAMS) $(noinst_PROGRAMS) $(DESTDIR) | ||
43 | +endif | ||
44 | diff -ur a/dbus/Makefile.am b/dbus/Makefile.am | ||
45 | --- a/dbus/Makefile.am 2012-12-06 14:34:01.161414276 +0100 | ||
46 | +++ b/dbus/Makefile.am 2012-12-06 15:21:14.451112862 +0100 | ||
47 | @@ -310,3 +310,9 @@ | ||
48 | update-systemd: | ||
49 | curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c | ||
50 | curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h | ||
51 | + | ||
52 | +if DBUS_BUILD_TESTS | ||
53 | +install-ptest: | ||
54 | + @$(MKDIR_P) $(DESTDIR) | ||
55 | + @install $(noinst_PROGRAMS) $(DESTDIR) | ||
56 | +endif | ||
57 | diff -ur a/test/Makefile.am b/test/Makefile.am | ||
58 | --- a/test/Makefile.am 2012-12-06 14:34:01.165414103 +0100 | ||
59 | +++ b/test/Makefile.am 2012-12-06 15:21:14.455112690 +0100 | ||
60 | @@ -119,12 +119,13 @@ | ||
61 | DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ | ||
62 | DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) | ||
63 | |||
64 | +ptest_run_dir = .. | ||
65 | + | ||
66 | TESTS_ENVIRONMENT = \ | ||
67 | - DBUS_BLOCK_ON_ABORT=1 \ | ||
68 | - DBUS_FATAL_WARNINGS=1 \ | ||
69 | - DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ | ||
70 | - DBUS_TEST_DATA=@abs_top_builddir@/test/data \ | ||
71 | - DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ | ||
72 | + DBUS_FATAL_WARNINGS=0 \ | ||
73 | + DBUS_TEST_DAEMON=$(ptest_run_dir)/bus/dbus-daemon$(EXEEXT) \ | ||
74 | + DBUS_TEST_DATA=$(ptest_run_dir)/test/data \ | ||
75 | + DBUS_TEST_HOMEDIR=$(ptest_run_dir)/dbus \ | ||
76 | $(NULL) | ||
77 | |||
78 | test_corrupt_SOURCES = corrupt.c | ||
79 | @@ -325,3 +325,25 @@ | ||
80 | data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf | ||
81 | $(AM_V_at)$(MKDIR_P) data/valid-config-files | ||
82 | $(AM_V_GEN)cp $< $@ | ||
83 | + | ||
84 | +if DBUS_BUILD_TESTS | ||
85 | +install-ptest: install-ptest-nonrecursive | ||
86 | + @for subdir in $(SUBDIRS); do \ | ||
87 | + if [ $$subdir != "." ]; then \ | ||
88 | + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ | ||
89 | + fi; \ | ||
90 | + done | ||
91 | + | ||
92 | +install-ptest-nonrecursive: | ||
93 | + @$(MKDIR_P) $(DESTDIR)/data/valid-config-files/session.d | ||
94 | + @for file in Makefile $(installable_tests) $(noinst_PROGRAMS) $(noinst_DATA) ; do \ | ||
95 | + if [ -f .libs/$$file ]; then \ | ||
96 | + install .libs/$$file $(DESTDIR); \ | ||
97 | + else \ | ||
98 | + install -D $${file%.in} $(DESTDIR)/$${file%.in}; \ | ||
99 | + fi; \ | ||
100 | + done; | ||
101 | + @for file in $(EXTRA_DIST); do \ | ||
102 | + install -D ${srcdir}/$${file%.in} $(DESTDIR)/$${file%.in}; \ | ||
103 | + done; | ||
104 | +endif | ||
105 | diff -ur a/test/name-test/Makefile.am b/test/name-test/Makefile.am | ||
106 | --- a/test/name-test/Makefile.am 2012-12-06 14:34:01.169413931 +0100 | ||
107 | +++ b/test/name-test/Makefile.am 2012-12-06 15:21:14.459112518 +0100 | ||
108 | @@ -36,4 +36,16 @@ | ||
109 | test_privserver_client_LDADD=../libdbus-testutils.la | ||
110 | test_autolaunch_LDADD=../libdbus-testutils.la | ||
111 | |||
112 | +install-ptest: | ||
113 | + @$(MKDIR_P) $(DESTDIR) | ||
114 | + @for file in Makefile $(noinst_PROGRAMS); do \ | ||
115 | + if [ -f .libs/$$file ]; then \ | ||
116 | + install .libs/$$file $(DESTDIR); \ | ||
117 | + else \ | ||
118 | + install $$file $(DESTDIR); \ | ||
119 | + fi \ | ||
120 | + done; | ||
121 | + @for file in $(EXTRA_DIST); do \ | ||
122 | + cp $(srcdir)/$$file $(DESTDIR); \ | ||
123 | + done; | ||
124 | endif | ||
125 | diff -ur a/tools/Makefile.am b/tools/Makefile.am | ||
126 | --- a/tools/Makefile.am 2012-12-06 14:34:01.161414276 +0100 | ||
127 | +++ b/tools/Makefile.am 2012-12-06 15:21:14.455112690 +0100 | ||
128 | @@ -78,3 +78,15 @@ | ||
129 | |||
130 | installcheck-local: | ||
131 | test -d $(DESTDIR)$(localstatedir)/lib/dbus | ||
132 | + | ||
133 | +if DBUS_BUILD_TESTS | ||
134 | +install-ptest: | ||
135 | + @$(MKDIR_P) $(DESTDIR) | ||
136 | + @for file in $(bin_PROGRAMS); do \ | ||
137 | + if [ -f .libs/$$file ]; then \ | ||
138 | + install .libs/$$file $(DESTDIR); \ | ||
139 | + else \ | ||
140 | + install $$file $(DESTDIR); \ | ||
141 | + fi; \ | ||
142 | + done; | ||
143 | +endif | ||
144 | diff -ur a/doc/Makefile.am b/doc/Makefile.am | ||
145 | --- a/doc/Makefile.am 2012-06-06 12:45:55.000000000 +0200 | ||
146 | +++ b/doc/Makefile.am 2012-12-06 16:04:58.990070587 +0100 | ||
147 | @@ -174,3 +174,7 @@ | ||
148 | |||
149 | maintainer-clean-local: | ||
150 | rm -f $(XMLTO_OUTPUT) | ||
151 | + | ||
152 | +if DBUS_BUILD_TESTS | ||
153 | +install-ptest: | ||
154 | +endif | ||