From 2ee144a0bfb88823bfa788697bb7afc9a572c413 Mon Sep 17 00:00:00 2001 From: Qiu Tingting Date: Thu, 6 Apr 2023 10:23:30 +0800 Subject: [PATCH] lz4: Add ptest support Add a ptest for lz4. - It is taking around 9 min to execute with kvm, so added it to PTEST_SLOW. - It contains one case: test_frame. - Below is the run log: START: ptest-runner 2023-04-06T00:36 BEGIN: /usr/lib/lz4/ptest Starting lz4frame tester (64-bits, 1.9.4) Seed = 7314 Basic tests completed All tests completed PASS: lz4/test_frame DURATION: 573 END: /usr/lib/lz4/ptest 2023-04-06T00:45 STOP: ptest-runner TOTAL: 1 FAIL: 0 Signed-off-by: Qiu Tingting Signed-off-by: Richard Purdie --- .../distro/include/ptest-packagelists.inc | 3 +-- meta/recipes-support/lz4/files/run-ptest | 17 ++++++++++++++++ meta/recipes-support/lz4/lz4_1.9.4.bb | 20 ++++++++++++++++++- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-support/lz4/files/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 78750a0d98b..2f83132aeb6 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -106,6 +106,7 @@ PTESTS_SLOW = "\ tcl \ util-linux \ valgrind \ + lz4 \ " PTESTS_SLOW:remove:riscv64 = "valgrind" @@ -115,7 +116,6 @@ PTESTS_SLOW:remove:x86 = "valgrind" PTESTS_PROBLEMS:append:x86 = " valgrind" # ruby \ # Timeout -# lz4 \ # Needs a rewrite # rt-tests \ # Needs to be checked whether it runs at all # bash \ # Test outcomes are non-deterministic by design # ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py @@ -128,7 +128,6 @@ PTESTS_PROBLEMS:append:x86 = " valgrind" PTESTS_PROBLEMS = "\ ruby \ - lz4 \ rt-tests \ bash \ ifupdown \ diff --git a/meta/recipes-support/lz4/files/run-ptest b/meta/recipes-support/lz4/files/run-ptest new file mode 100644 index 00000000000..f4a46a4f2c6 --- /dev/null +++ b/meta/recipes-support/lz4/files/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +# Define test work dir +WORKDIR=@PTEST_PATH@/tests/ + +# Run test +cd ${WORKDIR} + +case_name="test_frame" +./frametest +ret=$? +if [[ ${ret} == "0" ]]; then + echo "PASS: lz4/$case_name" +else + echo "FAIL: lz4/$case_name" +fi + diff --git a/meta/recipes-support/lz4/lz4_1.9.4.bb b/meta/recipes-support/lz4/lz4_1.9.4.bb index a2a178bab5c..d2a25fd5b09 100644 --- a/meta/recipes-support/lz4/lz4_1.9.4.bb +++ b/meta/recipes-support/lz4/lz4_1.9.4.bb @@ -12,11 +12,15 @@ PE = "1" SRCREV = "5ff839680134437dbf4678f3d0c7b371d84f4964" -SRC_URI = "git://github.com/lz4/lz4.git;branch=release;protocol=https" +SRC_URI = "git://github.com/lz4/lz4.git;branch=release;protocol=https \ + file://run-ptest \ + " UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" S = "${WORKDIR}/git" +inherit ptest + # Fixed in r118, which is larger than the current version. CVE_CHECK_IGNORE += "CVE-2014-4715" @@ -27,3 +31,17 @@ do_install() { } BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN}-ptest += "bash" + +do_compile_ptest() { + oe_runmake -C ${B}/tests/ +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/ + install --mode=755 ${B}/tests/frametest ${D}${PTEST_PATH}/tests/ + sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/run-ptest + +} + -- 2.47.3