libcheck: add ghetto automake output
PATCH 1/3 libcheck: add ghetto automake output
From: Ross Burton <[email protected]>
--- .../libcheck/libcheck/automake-output.patch | 82 +++++++++++++++++++ .../libcheck/libcheck_0.15.2.bb | 2 +- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libcheck/libcheck/automake-output.patch
meta/recipes-support/libcheck/libcheck/automake-output.patch new file +82 -0
@@ -0,0 +1,82 @@ +Add optional output in automake style, for integration with ptest. +Export CK_AUTOMAKE=1 when running a test suite and you'll get +PASS/FAIL lines on standard output. + +Marking this as Inappropriate right now as it's a little rough on the +edges. Filed https://github.com/libcheck/check/issues/349 to discuss +with upstream. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <[email protected]> + +diff --git a/src/check_log.c b/src/check_log.c +index 0844661..ad23c65 100644 +--- a/src/check_log.c ++++ b/src/check_log.c +@@ -26,6 +26,7 @@ + #if ENABLE_SUBUNIT + #include <subunit/child.h> + #endif ++#include <libgen.h> + + #include "check_error.h" + #include "check_list.h" +@@ -381,6 +382,34 @@ void tap_lfun(SRunner * sr CK_ATTRIBUTE_UNUSED, FILE * file, + } + } + ++void am_lfun(SRunner * sr CK_ATTRIBUTE_UNUSED, FILE * file, ++ enum print_output printmode CK_ATTRIBUTE_UNUSED, void *obj, ++ enum cl_event evt) ++{ ++ TestResult *tr; ++ const char* types[] = { "INVALID", "PASS", "FAIL", "ERROR"}; ++ ++ switch (evt) ++ { ++ case CLINITLOG_SR: ++ case CLENDLOG_SR: ++ case CLSTART_SR: ++ case CLSTART_S: ++ case CLEND_SR: ++ case CLEND_S: ++ case CLSTART_T: ++ break; ++ case CLEND_T: ++ tr = (TestResult *)obj; ++ fprintf(file, "%s: %s:%s:%s %s\n", ++ types[tr->rtype], basename(tr->file), tr->tcname, tr->tname, tr->msg); ++ fflush(file); ++ break; ++ default: ++ eprintf("Bad event type received in am_lfun", __FILE__, __LINE__); ++ } ++} ++ + #if ENABLE_SUBUNIT + void subunit_lfun(SRunner * sr, FILE * file, enum print_output printmode, + void *obj, enum cl_event evt) +@@ -527,6 +556,9 @@ void srunner_init_logging(SRunner * sr, enum print_output print_mode) + { + srunner_register_lfun(sr, f, f != stdout, tap_lfun, print_mode); + } ++ if (getenv("CK_AUTOMAKE")) ++ srunner_register_lfun(sr, stdout, 0, am_lfun, print_mode); ++ + srunner_send_evt(sr, NULL, CLINITLOG_SR); + } + +diff --git a/src/check_log.h b/src/check_log.h +index 7223b98..bfe1de3 100644 +--- a/src/check_log.h ++++ b/src/check_log.h +@@ -40,6 +40,9 @@ void xml_lfun(SRunner * sr, FILE * file, enum print_output, + void tap_lfun(SRunner * sr, FILE * file, enum print_output, + void *obj, enum cl_event evt); + ++void am_lfun(SRunner * sr, FILE * file, enum print_output, ++ void *obj, enum cl_event evt); ++ + void subunit_lfun(SRunner * sr, FILE * file, enum print_output, + void *obj, enum cl_event evt); +
meta/recipes-support/libcheck/libcheck_0.15.2.bb +1 -1
@@ -11,6 +11,7 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/check-${PV}.tar.gz \ + file://automake-output.patch \ file://not-echo-compiler-info-to-check_stdint.h.patch" SRC_URI[sha256sum] = "a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a" GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/"
@@ -33,4 +34,3 @@ PACKAGES =+ "checkmk" FILES:checkmk = "${bindir}/checkmk" RDEPENDS:checkmk = "gawk" -
Signature · 1 line
2.34.1
PATCH 2/3 libnl: clean up ptest
From: Ross Burton <[email protected]>
libnl builds lots of test-* binaries but these are for manual testing purposes. Instead, the test suite is entirely contained in the check-all binary.
Clean up the compilation by simply building check-all, and install it with libtool so the binary is installed correctly.
There is no need to RDEPEND on libcheck as that happens automatically, and the rpath workaround appears to be obsolete.
Finally rewrite run-ptest to invoke the test directly, and use the new automake-style output that has been added to libcheck.
--- .../libnl/files/enable-serial-tests.patch | 29 ------------------- meta/recipes-support/libnl/files/run-ptest | 17 ++--------- meta/recipes-support/libnl/libnl_3.7.0.bb | 20 +++---------- 3 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-support/libnl/files/enable-serial-tests.patch
meta/recipes-support/libnl/files/enable-serial-tests.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From b1476d89bf7a0bc6062438731ee4e9026696328b Mon Sep 17 00:00:00 2001 -From: Eric Xu <[email protected]> -Date: Fri, 9 Mar 2018 03:38:49 +0000 -Subject: [PATCH] Add ptest for libnl - -serial-tests is required to generate those targets. - -Upstream-Status: Inappropriate [oe-specific] -Signed-off-by: Eric Xu <[email protected]> ---- - configure.ac | 2 +- - 1 files changed, 1 insertion(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dfead98..2cc8257 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,7 +46,7 @@ AC_INIT(libnl, [libnl_version], [], [], [http://www.infradead.org/~tgr/libnl/]) - AC_CONFIG_HEADERS([lib/defs.h]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) --AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) -+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects serial-tests]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)], []) - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - --- -2.13.3 -
meta/recipes-support/libnl/files/run-ptest +2 -15
@@ -1,16 +1,3 @@ -#!/bin/sh +#! /bin/sh -num_fail=0 - -for test in check* -do - ./"$test" \ - && echo "PASS: $test" \ - || { - echo "FAIL: $test" - num_fail=$(( ${num_fail} + 1)) - } - -done - -exit $num_fail +CK_AUTOMAKE=1 ./check-all
meta/recipes-support/libnl/libnl_3.7.0.bb +4 -16
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "flex-native bison-native" SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ - file://enable-serial-tests.patch \ file://run-ptest \ "
@@ -51,26 +50,15 @@ FILES:${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" RREPLACES:${PN}-genl = "libnl-genl2" RCONFLICTS:${PN}-genl = "libnl-genl2" -RDEPENDS:${PN}-ptest += "libcheck" -RRECOMMENDS:${PN}-ptest += "kernel-module-dummy kernel-module-bonding" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}" - -# make sure the tests don't link against wrong so file -EXTRA_OECONF += "${@bb.utils.contains('PTEST_ENABLED', '1', '--disable-rpath', '', d)}" +RRECOMMENDS:${PN}-ptest += "kernel-module-dummy kernel-module-bonding" do_compile_ptest() { - # hack to remove the call to `make runtest-TESTS` - sed -i 's/$(MAKE) $(AM_MAKEFLAGS) runtest-TESTS//g' Makefile - oe_runmake check + oe_runmake ./tests/check-all } -do_install_ptest(){ - # legacy? tests are also installed, but ptest-runner will not run them - # upstream are not running these tests in their CI pipeline - # issue opened https://github.com/thom311/libnl/issues/270 - install -m 0755 tests/.libs/* ${D}${PTEST_PATH}/ - # contains build paths - rm ${D}${PTEST_PATH}/*.la +do_install_ptest() { + ./libtool install install ./tests/check-all ${D}${PTEST_PATH}/ } BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.34.1
PATCH 3/3 libcomps: clean up DEPENDS
In reply to [email protected]From: Ross Burton <[email protected]>
This recipe depends on zlib so add that explicitly.
Disable the tests and remove the dependency on libcheck, as we don't install them.
Remove obsolete PYTHON_DESIRED assignment that isn't used anywhere.
Explicitly disable the documentation for now.
--- meta/recipes-devtools/libcomps/libcomps_0.1.19.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
meta/recipes-devtools/libcomps/libcomps_0.1.19.bb +5 -3
@@ -15,10 +15,12 @@ S = "${WORKDIR}/git" inherit cmake setuptools3-base -DEPENDS += "libxml2 expat libcheck" +DEPENDS = "expat libxml2 zlib" + +EXTRA_OECMAKE = "-DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ + -DENABLE_DOCS=OFF \ + -DENABLE_TESTS=OFF" -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" OECMAKE_SOURCEPATH = "${S}/libcomps" BBCLASSEXTEND = "native nativesdk" -
Signature · 1 line
2.34.1