diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 380c6dd3f6..77bf47d90c 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -31,6 +31,7 @@ PTESTS_FAST_META_OE = "\ lmdb \ microsoft-gsl \ minicoredumper \ + minizip-ng \ neon \ nlohmann-json \ nodejs \ diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest b/meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest new file mode 100644 index 0000000000..9c2dc81e35 --- /dev/null +++ b/meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +cd tests && ./gtest_minizip --gtest_print_time=0 | sed -E '/^\[ RUN/d ; s/\[ OK \]/PASS: / ; s/\[ DISABLED \]/SKIP: / ; s/\[ FAILED \]/FAIL: /' diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb index 14363d2278..a013d99ba1 100644 --- a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb +++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f" SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \ file://0001-crypt.h-Remove-register-keyword.patch \ + file://run-ptest \ " SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de" @@ -18,15 +19,16 @@ RCONFLICTS:${PN} += "minizip" DEPENDS = "xz openssl bzip2" -inherit cmake pkgconfig +inherit cmake pkgconfig ptest EXTRA_OECMAKE = "-DMZ_FORCE_FETCH_LIBS=OFF \ -DBUILD_SHARED_LIBS=ON \ " -PACKAGECONFIG ??= "zlib" +PACKAGECONFIG ??= "zlib ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test', '', d)}" PACKAGECONFIG[zlib] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib" PACKAGECONFIG[zlib-ng] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib-ng" +PACKAGECONFIG[test] = "-DMZ_BUILD_TESTS=ON -DMZ_BUILD_UNIT_TESTS=ON, -DMZ_BUILD_TESTS=OFF -DMZ_BUILD_UNIT_TESTS=OFF, googletest" do_install:append () { @@ -34,3 +36,10 @@ do_install:append () { sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip.cmake } +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp ${B}/test/gtest_minizip ${D}${PTEST_PATH}/tests + # encrypt and stream test need the LICENSE file + cp ${S}/LICENSE ${D}${PTEST_PATH}/tests +} +