From aea21d5a39e4d46fb88c8075692517a98a35f46a Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 2 Apr 2025 15:45:41 +0800 Subject: minizip-ng: Add ptest support # ./run-ptest [==========] Running 55 tests from 6 test suites. [----------] Global test environment set-up. [----------] 22 tests from crypt PASS: crypt.rand PASS: crypt.sha1 PASS: crypt.sha224 PASS: crypt.sha256 PASS: crypt.sha384 PASS: crypt.sha512 PASS: crypt.aes128 PASS: crypt.aes128_cbc PASS: crypt.aes128_gcm PASS: crypt.aes194 PASS: crypt.aes256 PASS: crypt.hmac_sha1 PASS: crypt.hmac_sha1_short_password PASS: crypt.hmac_sha256 PASS: crypt.pbkdf2 PASS: crypt.pbkdf2_long_odd_password PASS: crypt.pbkdf2_short_password PASS: crypt.pbkdf2_rfc6070_v1 PASS: crypt.pbkdf2_rfc6070_v2 PASS: crypt.pbkdf2_rfc6070_v3 PASS: crypt.pbkdf2_rfc6070_v4 PASS: crypt.pbkdf2_rfc6070_v5 [----------] 1 test from os PASS: os.utf8_unicode_string [----------] 2 tests from encrypt PASS: encrypt.pkcrypt PASS: encrypt.aes [----------] 2 tests from stream bzip compressed from 877 to 505 bzip uncompressed from 505 to 877 PASS: stream.bzip lzma compressed from 877 to 526 lzma uncompressed from 526 to 877 PASS: stream.lzma [----------] 20 tests from os/path_resolve PASS: os/path_resolve.os/0 PASS: os/path_resolve.os/1 PASS: os/path_resolve.os/2 PASS: os/path_resolve.os/3 PASS: os/path_resolve.os/4 PASS: os/path_resolve.os/5 PASS: os/path_resolve.os/6 PASS: os/path_resolve.os/7 PASS: os/path_resolve.os/8 PASS: os/path_resolve.os/9 PASS: os/path_resolve.os/10 PASS: os/path_resolve.os/11 PASS: os/path_resolve.os/12 PASS: os/path_resolve.os/13 PASS: os/path_resolve.os/14 PASS: os/path_resolve.os/15 PASS: os/path_resolve.os/16 PASS: os/path_resolve.os/17 PASS: os/path_resolve.os/18 PASS: os/path_resolve.os/19 [----------] 8 tests from stream/stream_find PASS: stream/stream_find.find/0 PASS: stream/stream_find.find/1 PASS: stream/stream_find.find/2 PASS: stream/stream_find.find/3 PASS: stream/stream_find.find/4 PASS: stream/stream_find.find/5 PASS: stream/stream_find.find/6 PASS: stream/stream_find.find/7 [----------] Global test environment tear-down [==========] 55 tests from 6 test suites ran. [ PASSED ] 55 tests. Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- meta-oe/conf/include/ptest-packagelists-meta-oe.inc | 1 + meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest | 3 +++ meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb | 13 +++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest 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 +} + -- cgit v1.2.3-54-g00ecf