mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

libgpiod: disable C++ tests for libgpiod v1.6.x

Browse Source 
Catch2 recipe is moving to version 3 of the Catch2 API which will make
the C++ tests in libgpiod uncompatible. libgpiod v2 as ported to the new
interface but v1.6.x will not be so just disable building the C++ tests.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Bartosz Golaszewski
2024-06-11 11:04:03 +02:00
committed by Khem Raj
parent 4b4086edef
commit 1e477be454
5 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-bindings-cxx-disable-tests.patch
+33
View File
@@ -0,0 +1,33 @@
From 8293f0b8a329beed542f5c8a2efa4641759fccf4 Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Date: Tue, 11 Jun 2024 10:34:14 +0200
Subject: [PATCH] bindings: cxx: disable tests
Meta-openembedded is moving to catch2 v3 which will make the C++ tests
incompatible with the testing library. As this is an older version of
the project, just disable C++ tests entirely.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
Upstream-Status: Inappropriate [upstream continues to use Catch2 v2]
bindings/cxx/Makefile.am | 6 ------
1 file changed, 6 deletions(-)
diff --git a/bindings/cxx/Makefile.am b/bindings/cxx/Makefile.am
index 5c40ceb..d901836 100644
--- a/bindings/cxx/Makefile.am
+++ b/bindings/cxx/Makefile.am
@@ -19,9 +19,3 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgpiodcxx.pc
SUBDIRS = . examples
-
-if WITH_TESTS
-
-SUBDIRS += tests
-
-endif
--
2.40.1
meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
testbins="gpiod-test gpio-tools-test gpiod-cxx-test gpiod_py_test.py" testbins="gpiod-test gpio-tools-test gpiod_py_test.py"
ptestdir=$(dirname "$(readlink -f "$0")") ptestdir=$(dirname "$(readlink -f "$0")")
cd $ptestdir/tests cd $ptestdir/tests
meta-oe/recipes-support/libgpiod/libgpiod.inc
-4
View File
@@ -52,9 +52,5 @@ do_install_ptest() {
for tool in ${FILES:${PN}-tools}; do for tool in ${FILES:${PN}-tools}; do
install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/
done done
if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then
install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
fi
} }
meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
+2
View File
@@ -3,6 +3,8 @@ require libgpiod.inc
LICENSE = "LGPL-2.1-or-later" LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de"
SRC_URI += "file://0001-bindings-cxx-disable-tests.patch"
SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc" SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:"
meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb
+1
View File
@@ -26,6 +26,7 @@ RDEPENDS:${PN}-ptest += " \
RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs" RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs"
do_install_ptest:append() { do_install_ptest:append() {
install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/ install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/
install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h
} }