dbus-glib: remove unused packaging of tests

We're carrying a patch to install the tests, but we don't actually
install them by default or have any ptest infrastructure to run them.

As this is complicating the recipe for no reason, remove it all. If
someone in the future wants to run the tests they can do it with ptest
so they're exercised correctly.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
deleted file mode 100644 (file)
index 0b1b712..0000000
--- a/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4dbb1a459c281eeb716b4f0ce2fc01e8034c3e20 Mon Sep 17 00:00:00 2001
-From: Yao Zhao <yao.zhao@windriver.com>
-Date: Tue, 17 Jul 2012 16:46:30 -0400
-Subject: [PATCH] Change Makefile.am to install regression tests for test
- package purpose.
-
-Upstream-Status: Inappropriate [test not install is for purpose from upstream]
-
-Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
----
- test/Makefile.am            | 3 ++-
- test/core/Makefile.am       | 3 ++-
- test/interfaces/Makefile.am | 3 ++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 7393bed..1c25d5d 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -48,7 +48,8 @@ TESTS = \
-       $(test_scripts) \
-       $(NULL)
- 
--noinst_PROGRAMS = \
-+testdir = $(datadir)/@PACKAGE@/tests
-+test_PROGRAMS = \
-       $(test_programs) \
-       $(test_related_programs) \
-       $(NULL)
-diff --git a/test/core/Makefile.am b/test/core/Makefile.am
-index 35defa9..295202f 100644
---- a/test/core/Makefile.am
-+++ b/test/core/Makefile.am
-@@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS
- 
- ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
- ## build even when not doing "make check"
--noinst_PROGRAMS = \
-+testdir = $(datadir)/@PACKAGE@/tests/core
-+test_PROGRAMS = \
-       test-dbus-glib \
-       test-error-mapping \
-       test-service-glib \
-diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am
-index f3f62e4..f034b95 100644
---- a/test/interfaces/Makefile.am
-+++ b/test/interfaces/Makefile.am
-@@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS
- 
- ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
- ## build even when not doing "make check"
--noinst_PROGRAMS = test-service test-client
-+testdir = $(datadir)/@PACKAGE@/tests/interfaces
-+test_PROGRAMS = test-service test-client
- 
- test_service_SOURCES = \
-       test-interfaces.c \

diff --git a/meta/recipes-core/dbus/dbus-glib_0.114.bb b/meta/recipes-core/dbus/dbus-glib_0.114.bb
index ff3d282ac6f506e0d22ce1adfd2aba4d961ff7b9..4a827b1cbf84523380715fa81aab6a3ccbe9abd9 100644 (file)
--- a/meta/recipes-core/dbus/dbus-glib_0.114.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.114.bb
@@ -17,21 +17,15 @@ DEPENDS:class-native = "glib-2.0-native dbus-native"
 
 SRC_URI = "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
            file://no-examples.patch \
-           file://test-install-makefile.patch \
 "
 SRC_URI[sha256sum] = "c09c5c085b2a0e391b8ee7d783a1d63fe444e96717cc1814d61b5e8fc2827a7c"
 
 inherit autotools pkgconfig gettext bash-completion gtk-doc
 
-#default disable regression tests, some unit test code in non testing code
-#PACKAGECONFIG:pn-${PN} = "tests" enable regression tests local.conf
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[tests] = "--enable-tests,,,"
-
 EXTRA_OECONF:class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
 EXTRA_OECONF:class-nativesdk = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
 
-PACKAGES += "${PN}-tests ${PN}-tools"
+PACKAGES += "${PN}-tools"
 
 FILES:${PN} = "${libdir}/lib*${SOLIBS}"
 FILES:${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper"
@@ -39,9 +33,6 @@ LICENSE:${PN}-bash-completion = "GPL-2.0-or-later"
 
 RDEPENDS:${PN}-dev += "${PN}-tools"
 
-RDEPENDS:${PN}-tests = "${PN}"
-FILES:${PN}-tests = "${datadir}/${BPN}/tests"
-
 FILES:${PN}-tools = "${bindir}"
 
 BBCLASSEXTEND = "native nativesdk"