diff options
Diffstat (limited to 'meta/recipes-support/libcheck')
-rw-r--r-- | meta/recipes-support/libcheck/libcheck/automake-output.patch | 82 | ||||
-rw-r--r-- | meta/recipes-support/libcheck/libcheck_0.14.0.bb | 29 | ||||
-rw-r--r-- | meta/recipes-support/libcheck/libcheck_0.15.2.bb | 36 |
3 files changed, 118 insertions, 29 deletions
diff --git a/meta/recipes-support/libcheck/libcheck/automake-output.patch b/meta/recipes-support/libcheck/libcheck/automake-output.patch new file mode 100644 index 0000000000..c860f0cc0f --- /dev/null +++ b/meta/recipes-support/libcheck/libcheck/automake-output.patch @@ -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 <ross.burton@arm.com> + +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); + diff --git a/meta/recipes-support/libcheck/libcheck_0.14.0.bb b/meta/recipes-support/libcheck/libcheck_0.14.0.bb deleted file mode 100644 index a88f009cdb..0000000000 --- a/meta/recipes-support/libcheck/libcheck_0.14.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Check - unit testing framework for C code" -HOMEPAGE = "https://libcheck.github.io/check/" -SECTION = "devel" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" - -SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ - file://not-echo-compiler-info-to-check_stdint.h.patch" -SRC_URI[md5sum] = "270e82a445be6026040267a5e11cc94b" -SRC_URI[sha256sum] = "bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b" -UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" - -S = "${WORKDIR}/check-${PV}" - -inherit autotools pkgconfig texinfo - -CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk" - -RREPLACES_${PN} = "check (<= 0.9.5)" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGES =+ "checkmk" - -FILES_checkmk = "${bindir}/checkmk" - -RDEPENDS_checkmk = "gawk" - diff --git a/meta/recipes-support/libcheck/libcheck_0.15.2.bb b/meta/recipes-support/libcheck/libcheck_0.15.2.bb new file mode 100644 index 0000000000..5ab67b8728 --- /dev/null +++ b/meta/recipes-support/libcheck/libcheck_0.15.2.bb @@ -0,0 +1,36 @@ +SUMMARY = "Check - unit testing framework for C code" +DESCRIPTION = "It features a simple interface for defining unit tests, \ +putting little in the way of the developer. Tests are run in a separate \ +address space, so both assertion failures and code errors that cause \ +segmentation faults or other signals can be caught. Test results are \ +reportable in the following: Subunit, TAP, XML, and a generic logging format." +HOMEPAGE = "https://libcheck.github.io/check/" +SECTION = "devel" + +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/" + +S = "${WORKDIR}/check-${PV}" + +inherit autotools pkgconfig texinfo github-releases + +CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk" + +RREPLACES:${PN} = "check (<= 0.9.5)" + +do_install:append:class-native() { + create_cmdline_shebang_wrapper ${D}${bindir}/checkmk +} +BBCLASSEXTEND = "native nativesdk" + +PACKAGES =+ "checkmk" + +FILES:checkmk = "${bindir}/checkmk" + +RDEPENDS:checkmk = "gawk" |