[Buildroot] [PATCH] package/xenomai: fix testsuite install

[Buildroot] [PATCH] package/xenomai: fix testsuite install

[Romain Naour]

From: Pierre Ficheux <pierre.ficheux@smile.fr>

Since commit [1], the testsuite build is unconditionally disabled
although we have the option BR2_PACKAGE_XENOMAI_TESTSUITE to
install Xenomai testsuite on the target.

Handle --disable-testsuite option with BR2_PACKAGE_XENOMAI_TESTSUITE.

[1] 74196b7d059684e555a87e5409c21c56c727066b

Signed-off-by: Pierre Ficheux <pierre.ficheux@smile.fr>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/xenomai/xenomai.mk | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index c1ad0c5df6..9356919259 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -41,7 +41,6 @@ XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
 
 XENOMAI_CONF_OPTS += \
 	--disable-demo \
-	--disable-testsuite \
 	--includedir=/usr/include/xenomai/
 
 ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y)
@@ -87,17 +86,10 @@ endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES
 
-ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
-define XENOMAI_REMOVE_TESTSUITE
-	rm -rf $(TARGET_DIR)/usr/share/xenomai/
-	for i in clocktest gpiotest latency smokey spitest switchtest \
-		xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \
-		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
-	done
-	rm -rf $(TARGET_DIR)/usr/demo/
-endef
-
-XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE
+ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),y)
+XENOMAI_CONF_OPTS += --enable-testsuite
+else
+XENOMAI_CONF_OPTS += --disable-testsuite
 endif
 
 ifeq ($(BR2_PACKAGE_XENOMAI_RTCAN),)
-- 
2.34.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/xenomai: fix testsuite install

[Thomas Petazzoni via buildroot]

On Wed, 15 Mar 2023 18:05:18 +0100
Romain Naour <romain.naour@smile.fr> wrote:

> From: Pierre Ficheux <pierre.ficheux@smile.fr>
> 
> Since commit [1], the testsuite build is unconditionally disabled
> although we have the option BR2_PACKAGE_XENOMAI_TESTSUITE to
> install Xenomai testsuite on the target.
> 
> Handle --disable-testsuite option with BR2_PACKAGE_XENOMAI_TESTSUITE.
> 
> [1] 74196b7d059684e555a87e5409c21c56c727066b
> 
> Signed-off-by: Pierre Ficheux <pierre.ficheux@smile.fr>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/xenomai/xenomai.mk | 16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/xenomai: fix testsuite install

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes:

 > On Wed, 15 Mar 2023 18:05:18 +0100
 > Romain Naour <romain.naour@smile.fr> wrote:

 >> From: Pierre Ficheux <pierre.ficheux@smile.fr>
 >> 
 >> Since commit [1], the testsuite build is unconditionally disabled
 >> although we have the option BR2_PACKAGE_XENOMAI_TESTSUITE to
 >> install Xenomai testsuite on the target.
 >> 
 >> Handle --disable-testsuite option with BR2_PACKAGE_XENOMAI_TESTSUITE.
 >> 
 >> [1] 74196b7d059684e555a87e5409c21c56c727066b
 >> 
 >> Signed-off-by: Pierre Ficheux <pierre.ficheux@smile.fr>
 >> Signed-off-by: Romain Naour <romain.naour@smile.fr>
 >> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 >> ---
 >> package/xenomai/xenomai.mk | 16 ++++------------
 >> 1 file changed, 4 insertions(+), 12 deletions(-)

 > Applied to master, thanks.

Committed to 2023.02.x and 2023.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot