From c9136de654419d9b13871500a96e8744059b4020 Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Tue, 21 Mar 2023 08:42:27 -0700 Subject: cmocka: update from 1.1.5+ to 1.1.7 Switch the SRC_URI branch from master to stable-1.1 The 1.1.5 version was actually a bit ahead of that tag but the ChangeLog comment for the two releases are: Thu Feb 23 2023 Andreas Schneider * cmocka version 1.1.7 * Update ignore list for source tarball generation Fri Feb 16 2023 Andreas Schneider * cmocka version 1.1.6 * Added new assert macros to compare 2 double given an epsilon * Added meson build system * Added header with version to TAP13 output * Fixed issues with MSVC * Fixed TAP output for skipped tests * Fixed issue with fail_msg * CMake generated configs for find_package(cmocka) * Documentation improvements CMake still seems to be the default build tool based on Install.md so use that rather than the shiny Meson system. One test, test_cmockery, was added so now there are 23 passing ptests. Signed-off-by: Randy MacLeod Signed-off-by: Khem Raj --- meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb | 43 ----------------------------- meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb | 43 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb create mode 100644 meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb deleted file mode 100644 index 554d582a57..0000000000 --- a/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "cmocka is an elegant unit testing framework for C with support for mock \ -objects. It only requires the standard C library, works on a range of computing \ -platforms (including embedded) and with different compilers." -HOMEPAGE = "https://cmocka.org/" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRCREV = "a4fc3dd7705c277e3a57432895e9852ea105dac9" -PV .= "+git${SRCPV}" -SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=master \ - file://run-ptest \ - " - -S = "${WORKDIR}/git" - -inherit cmake ptest - -EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}" -# Use -Wl,wrap linker flag, which does not work with LTO -LTO = "" - -do_install:append () { - install -d ${D}${datadir}/${BPN}/example - install -d ${D}${datadir}/${BPN}/example/mock/chef_wrap - install -d ${D}${datadir}/${BPN}/example/mock/uptime - - install -m 0755 ${B}/example/*_test ${D}/${datadir}/${BPN}/example - install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${datadir}/${BPN}/example/mock/chef_wrap - install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${datadir}/${BPN}/example/mock/uptime - install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${datadir}/${BPN}/example/mock/uptime - install -m 0644 ${B}/example/mock/uptime/libproc_uptime.so ${D}/${datadir}/${BPN}/example/mock/libproc_uptime.so -} - -do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/tests/test_* ${D}${PTEST_PATH}/tests -} - -PACKAGE_BEFORE_PN += "${PN}-examples" - -FILES:${PN}-examples = "${datadir}/${BPN}/example" -INSANE_SKIP:${PN}-examples = "libdir" diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb b/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb new file mode 100644 index 0000000000..308d5ca1fb --- /dev/null +++ b/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "cmocka is an elegant unit testing framework for C with support for mock \ +objects. It only requires the standard C library, works on a range of computing \ +platforms (including embedded) and with different compilers." +HOMEPAGE = "https://cmocka.org/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "a01cc69ee9536f90e57c61a198f2d1944d3d4313" +PV .= "+git${SRCPV}" +SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-1.1 \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +inherit cmake ptest + +EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}" +# Use -Wl,wrap linker flag, which does not work with LTO +LTO = "" + +do_install:append () { + install -d ${D}${datadir}/${BPN}/example + install -d ${D}${datadir}/${BPN}/example/mock/chef_wrap + install -d ${D}${datadir}/${BPN}/example/mock/uptime + + install -m 0755 ${B}/example/*_test ${D}/${datadir}/${BPN}/example + install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${datadir}/${BPN}/example/mock/chef_wrap + install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${datadir}/${BPN}/example/mock/uptime + install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${datadir}/${BPN}/example/mock/uptime + install -m 0644 ${B}/example/mock/uptime/libproc_uptime.so ${D}/${datadir}/${BPN}/example/mock/libproc_uptime.so +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/test_* ${D}${PTEST_PATH}/tests +} + +PACKAGE_BEFORE_PN += "${PN}-examples" + +FILES:${PN}-examples = "${datadir}/${BPN}/example" +INSANE_SKIP:${PN}-examples = "libdir" -- cgit v1.2.3-54-g00ecf