From c610b8dcd9d55ef952e6daf4441e0ca47180dc70 Mon Sep 17 00:00:00 2001 From: Julien Stephan Date: Thu, 3 Aug 2023 15:29:08 +0200 Subject: libexif: add ptest support adds ptest support for libexif Ptest was executed on a core-image-minimal: root@qemux86-64:~# ptest-runner libexif START: ptest-runner 2023-07-12T15:45 BEGIN: /usr/lib/libexif/ptest [...] i==================== All 13 tests passed (1 test was not run) ==================== [...] DURATION: 35 END: /usr/lib/libexif/ptest 2023-07-12T15:45 STOP: ptest-runner TOTAL: 1 FAIL: 0 (From OE-Core rev: 4e2340dfecdfbe22b07161e89de4e25d466820bb) Signed-off-by: Julien Stephan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + ...1-Add-serial-tests-config-needed-by-ptest.patch | 26 +++++++++++++++++++ meta/recipes-support/libexif/libexif/run-ptest | 3 +++ meta/recipes-support/libexif/libexif_0.6.24.bb | 30 +++++++++++++++++++++- 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libexif/libexif/0001-Add-serial-tests-config-needed-by-ptest.patch create mode 100644 meta/recipes-support/libexif/libexif/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 6250cf081e..bbbef5b043 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -75,6 +75,7 @@ PTESTS_FAST = "\ slang \ wayland \ zlib \ + libexif \ " PTESTS_FAST:append:libc-glibc = " glibc-tests" PTESTS_PROBLEMS:remove:libc-glibc = "glibc-tests" diff --git a/meta/recipes-support/libexif/libexif/0001-Add-serial-tests-config-needed-by-ptest.patch b/meta/recipes-support/libexif/libexif/0001-Add-serial-tests-config-needed-by-ptest.patch new file mode 100644 index 0000000000..505aa07330 --- /dev/null +++ b/meta/recipes-support/libexif/libexif/0001-Add-serial-tests-config-needed-by-ptest.patch @@ -0,0 +1,26 @@ +From 1ee7217c8ae724d793f9a9876c3608057a2ccbf8 Mon Sep 17 00:00:00 2001 +From: Julien Stephan +Date: Tue, 11 Jul 2023 16:07:54 +0200 +Subject: [PATCH] Add serial-tests config needed by ptest + +Add serial-tests support, ptest needs it. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Julien Stephan +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index cd48047..5413907 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,7 @@ AM_INIT_AUTOMAKE([ + dist-zip + check-news + subdir-objects ++ serial-tests + ]) + AM_MAINTAINER_MODE + diff --git a/meta/recipes-support/libexif/libexif/run-ptest b/meta/recipes-support/libexif/libexif/run-ptest new file mode 100644 index 0000000000..2d23159eb0 --- /dev/null +++ b/meta/recipes-support/libexif/libexif/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +make -o Makefile runtest-TESTS diff --git a/meta/recipes-support/libexif/libexif_0.6.24.bb b/meta/recipes-support/libexif/libexif_0.6.24.bb index 367f012f8c..27e369a89a 100644 --- a/meta/recipes-support/libexif/libexif_0.6.24.bb +++ b/meta/recipes-support/libexif/libexif_0.6.24.bb @@ -11,12 +11,40 @@ def version_underscore(v): return "_".join(v.split(".")) SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libexif-${PV}.tar.bz2 \ + file://0001-Add-serial-tests-config-needed-by-ptest.patch \ + file://run-ptest \ " SRC_URI[sha256sum] = "d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae" -inherit autotools gettext github-releases +inherit autotools gettext github-releases ptest EXTRA_OECONF += "--disable-docs" +do_compile_ptest() { + oe_runmake -C test buildtest-TESTS +} + +do_install_ptest() { + install ${B}/test/test*[!\.o] ${D}${PTEST_PATH} + for f in ${D}${PTEST_PATH}/test*; do + sed -i "s/\(LD_LIBRARY_PATH=\).*\(:\$LD_LIBRARY_PATH\)\"/\1.\2/" $f + done + + install ${B}/test/Makefile ${D}${PTEST_PATH} + sed -i -e "/^srcdir/c srcdir = \$\{PWD\}" ${D}${PTEST_PATH}/Makefile + + install -d ${D}${PTEST_PATH}/nls + install ${B}/test/nls/*[!\.o] ${D}${PTEST_PATH}/nls + install -d ${D}${PTEST_PATH}/.libs + install ${B}/test/.libs/* ${D}${PTEST_PATH}/.libs + + install ${S}/test/*.sh ${D}${PTEST_PATH} + + install -d ${D}${PTEST_PATH}/testdata + install ${S}/test/testdata/* ${D}${PTEST_PATH}/testdata +} + +RDEPENDS:${PN}-ptest += "make bash" + BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf