summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2013-06-25 16:14:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-28 09:14:05 +0100
commit5e77e098a133a662dfca9c58e87e6f6e1359e821 (patch)
treed8f51f103e1b04d0e34e78faa77c90ddf0992125
parent9106cfb2f4927a96ab749f97ed268940d75c9bf8 (diff)
downloadpoky-5e77e098a133a662dfca9c58e87e6f6e1359e821.tar.gz
dbus-ptest: Install missing files
Install files from EXTRA_DIST needed for some tests. Add configure parameter with-dbus-test-dir to specify where the test tools are located. (From OE-Core rev: 330d594af9f14faf0e5770b6056f4457a033fedd) Signed-off-by: Adrian Dudau <adrian.dudau@enea.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus-1.6.8/ptest.patch20
-rw-r--r--meta/recipes-core/dbus/dbus-ptest_1.6.8.bb1
2 files changed, 16 insertions, 5 deletions
diff --git a/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch b/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch
index 106bfb4c57..263d17eff7 100644
--- a/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch
+++ b/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch
@@ -76,7 +76,7 @@ diff -ur a/test/Makefile.am b/test/Makefile.am
76 $(NULL) 76 $(NULL)
77 77
78 test_corrupt_SOURCES = corrupt.c 78 test_corrupt_SOURCES = corrupt.c
79@@ -325,3 +326,18 @@ 79@@ -325,3 +325,25 @@
80 data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf 80 data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf
81 $(AM_V_at)$(MKDIR_P) data/valid-config-files 81 $(AM_V_at)$(MKDIR_P) data/valid-config-files
82 $(AM_V_GEN)cp $< $@ 82 $(AM_V_GEN)cp $< $@
@@ -91,26 +91,36 @@ diff -ur a/test/Makefile.am b/test/Makefile.am
91+ 91+
92+install-ptest-nonrecursive: 92+install-ptest-nonrecursive:
93+ @$(MKDIR_P) $(DESTDIR)/data/valid-config-files/session.d 93+ @$(MKDIR_P) $(DESTDIR)/data/valid-config-files/session.d
94+ @for file in Makefile $(installable_tests) $(EXTRA_DIST) $(noinst_DATA); do \ 94+ @for file in Makefile $(installable_tests) $(noinst_PROGRAMS) $(noinst_DATA) ; do \
95+ install -D $${file%.in} $(DESTDIR)/$${file%.in}; \ 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}; \
96+ done; 103+ done;
97+endif 104+endif
98diff -ur a/test/name-test/Makefile.am b/test/name-test/Makefile.am 105diff -ur a/test/name-test/Makefile.am b/test/name-test/Makefile.am
99--- a/test/name-test/Makefile.am 2012-12-06 14:34:01.169413931 +0100 106--- a/test/name-test/Makefile.am 2012-12-06 14:34:01.169413931 +0100
100+++ b/test/name-test/Makefile.am 2012-12-06 15:21:14.459112518 +0100 107+++ b/test/name-test/Makefile.am 2012-12-06 15:21:14.459112518 +0100
101@@ -36,4 +36,13 @@ 108@@ -36,4 +36,16 @@
102 test_privserver_client_LDADD=../libdbus-testutils.la 109 test_privserver_client_LDADD=../libdbus-testutils.la
103 test_autolaunch_LDADD=../libdbus-testutils.la 110 test_autolaunch_LDADD=../libdbus-testutils.la
104 111
105+install-ptest: 112+install-ptest:
106+ @$(MKDIR_P) $(DESTDIR) 113+ @$(MKDIR_P) $(DESTDIR)
107+ @for file in Makefile $(noinst_PROGRAMS) $(EXTRA_DIST); do \ 114+ @for file in Makefile $(noinst_PROGRAMS); do \
108+ if [ -f .libs/$$file ]; then \ 115+ if [ -f .libs/$$file ]; then \
109+ install .libs/$$file $(DESTDIR); \ 116+ install .libs/$$file $(DESTDIR); \
110+ else \ 117+ else \
111+ install $$file $(DESTDIR); \ 118+ install $$file $(DESTDIR); \
112+ fi \ 119+ fi \
113+ done; 120+ done;
121+ @for file in $(EXTRA_DIST); do \
122+ cp $(srcdir)/$$file $(DESTDIR); \
123+ done;
114 endif 124 endif
115diff -ur a/tools/Makefile.am b/tools/Makefile.am 125diff -ur a/tools/Makefile.am b/tools/Makefile.am
116--- a/tools/Makefile.am 2012-12-06 14:34:01.161414276 +0100 126--- a/tools/Makefile.am 2012-12-06 14:34:01.161414276 +0100
diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.8.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.8.bb
index d00819a8dc..8d21666c57 100644
--- a/meta/recipes-core/dbus/dbus-ptest_1.6.8.bb
+++ b/meta/recipes-core/dbus/dbus-ptest_1.6.8.bb
@@ -38,6 +38,7 @@ EXTRA_OECONF = "--enable-tests \
38 --disable-libaudit \ 38 --disable-libaudit \
39 --with-xml=expat \ 39 --with-xml=expat \
40 --with-systemdsystemunitdir=${systemd_unitdir}/system/ \ 40 --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
41 --with-dbus-test-dir=${PTEST_PATH} \
41 ${EXTRA_OECONF_X}" 42 ${EXTRA_OECONF_X}"
42 43
43do_install() { 44do_install() {