There are two types of cases: executables and POSIX shell scripts. The output of them are different, so run them with different method in run-ptest. 74 test cases in all and all test cases PASS. Add xz-ptest to PTESTS_FAST because test duration is 19s on qemux86-64.
Test results on qemux86-64: root@qemux86-64:~# ptest-runner xz START: ptest-runner 2024-01-24T06:45 BEGIN: /usr/lib/xz/ptest === test_bcj_exact_size.c === PASS: test_exact_size PASS: test_empty_block --- === END === ... ... === test_vli.c === PASS: test_lzma_vli_size PASS: test_lzma_vli_encode PASS: test_lzma_vli_decode --- === END === PASS: test_files.sh PASS: test_scripts.sh PASS: test_compress.sh DURATION: 19 END: /usr/lib/xz/ptest 2024-01-24T06:45 STOP: ptest-runner TOTAL: 1 FAIL: 0 Signed-off-by: Xu, Chi <[email protected]> --- .../distro/include/ptest-packagelists.inc | 1 + .../xz/xz/0001-Update-test-scripts.patch | 80 +++++++++++++++++++ meta/recipes-extended/xz/xz/run-ptest | 26 ++++++ meta/recipes-extended/xz/xz_5.4.5.bb | 21 ++++- 4 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/xz/xz/0001-Update-test-scripts.patch create mode 100644 meta/recipes-extended/xz/xz/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index ef6f471e7b..cddc84195f 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -77,6 +77,7 @@ PTESTS_FAST = "\ sed \ slang \ wayland \ + xz \ zlib \ libexif \ " diff --git a/meta/recipes-extended/xz/xz/0001-Update-test-scripts.patch b/meta/recipes-extended/xz/xz/0001-Update-test-scripts.patch new file mode 100644 index 0000000000..81bff29b3d --- /dev/null +++ b/meta/recipes-extended/xz/xz/0001-Update-test-scripts.patch @@ -0,0 +1,80 @@ +From c3921adf93c578412f9ce520ed48b42d60c64f77 Mon Sep 17 00:00:00 2001 +From: "Xu, Chi" <[email protected]> +Date: Wed, 24 Jan 2024 14:28:13 +0800 +Subject: [PATCH] Update test scripts: replace ../src/* with /usr/bin + +In order to run scripts on target, replace ../src/* with /usr/bin + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Xu, Chi <[email protected]> +--- + tests/test_compress.sh | 8 ++++---- + tests/test_files.sh | 4 ++-- + tests/test_scripts.sh | 6 +++--- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/tests/test_compress.sh b/tests/test_compress.sh +index ff13cef..6169672 100755 +--- a/tests/test_compress.sh ++++ b/tests/test_compress.sh +@@ -10,7 +10,7 @@ + ############################################################################### + + # If xz wasn't built, this test is skipped. +-if test -x ../src/xz/xz ; then ++if test -x /usr/bin/xz ; then + : + else + exit 77 +@@ -76,12 +76,12 @@ test_xz() { + fi + } + +-XZ="../src/xz/xz --memlimit-compress=48MiB --memlimit-decompress=5MiB \ ++XZ="/usr/bin/xz --memlimit-compress=48MiB --memlimit-decompress=5MiB \ + --no-adjust --threads=1 --check=crc32" + grep "define HAVE_CHECK_CRC64" ../config.h > /dev/null \ + && XZ="$XZ --check=crc64" +-XZDEC="../src/xzdec/xzdec" # No memory usage limiter available +-test -x ../src/xzdec/xzdec || XZDEC= ++XZDEC="/usr/bin/xzdec" # No memory usage limiter available ++test -x /usr/bin/xzdec || XZDEC= + + # Create the required input file if needed. + # +diff --git a/tests/test_files.sh b/tests/test_files.sh +index 60402e7..37dcf4a 100755 +--- a/tests/test_files.sh ++++ b/tests/test_files.sh +@@ -10,8 +10,8 @@ + ############################################################################### + + # If both xz and xzdec were not build, skip this test. +-XZ=../src/xz/xz +-XZDEC=../src/xzdec/xzdec ++XZ=/usr/bin/xz ++XZDEC=/usr/bin/xzdec + test -x "$XZ" || XZ= + test -x "$XZDEC" || XZDEC= + if test -z "$XZ$XZDEC"; then +diff --git a/tests/test_scripts.sh b/tests/test_scripts.sh +index ee82361..f91c5d8 100755 +--- a/tests/test_scripts.sh ++++ b/tests/test_scripts.sh +@@ -10,9 +10,9 @@ + ############################################################################### + + # If scripts weren't built, this test is skipped. +-XZ=../src/xz/xz +-XZDIFF=../src/scripts/xzdiff +-XZGREP=../src/scripts/xzgrep ++XZ=/usr/bin/xz ++XZDIFF=/usr/bin/xzdiff ++XZGREP=/usr/bin/xzgrep + + for i in XZ XZDIFF XZGREP; do + eval test -x "\$$i" && continue +-- +2.25.1 + diff --git a/meta/recipes-extended/xz/xz/run-ptest b/meta/recipes-extended/xz/xz/run-ptest new file mode 100644 index 0000000000..cc8ba92016 --- /dev/null +++ b/meta/recipes-extended/xz/xz/run-ptest @@ -0,0 +1,26 @@ +#!/bin/bash + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +# executables test cases +tests_exec=$(file $(ls test_*) | grep "ELF" | awk -F: '{print $1}') +for i in ${tests_exec}; do + ./$i +done + +# POSIX shell script test cases +export srcdir=${ptestdir}/tests +test_shell="test_files.sh test_scripts.sh test_compress.sh" +for j in ${test_shell}; do + if [ $j == "test_compress.sh" ]; then + ./$j create_compress_files + else + ./$j + fi + if [ $? -eq 0 ]; then + echo "PASS: $j" + else + echo "FAIL: $j" + fi +done diff --git a/meta/recipes-extended/xz/xz_5.4.5.bb b/meta/recipes-extended/xz/xz_5.4.5.bb index 09eade8be0..e3a99465b2 100644 --- a/meta/recipes-extended/xz/xz_5.4.5.bb +++ b/meta/recipes-extended/xz/xz_5.4.5.bb @@ -24,13 +24,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c8ea84ebe7b93cce676b54355dc6b2c0 \ file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \ " -SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz"; +SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest file://0001-Update-test-scripts.patch', '', d)} \ + " SRC_URI[sha256sum] = "135c90b934aee8fbc0d467de87a05cb70d627da36abe518c357a873709e5b7d6" UPSTREAM_CHECK_REGEX = "xz-(?P<pver>\d+(\.\d+)+)\.tar" CACHED_CONFIGUREVARS += "gl_cv_posix_shell=/bin/sh" -inherit autotools gettext +inherit autotools gettext ptest PACKAGES =+ "liblzma" @@ -42,3 +44,18 @@ ALTERNATIVE:${PN} = "xz xzcat unxz \ lzma lzcat unlzma" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN}-ptest += "bash file" + +do_compile_ptest() { + oe_runmake check TESTS= +} + +do_install_ptest () { + install -d ${D}/${PTEST_PATH}/tests + find ${B}/tests/.libs -type f -executable -exec cp {} ${D}${PTEST_PATH}/tests \; + cp ${B}/config.h ${D}${PTEST_PATH} + for i in files xzgrep_expected_output test_files.sh test_scripts.sh test_compress.sh; do + cp -r ${S}/tests/$i ${D}${PTEST_PATH}/tests + done +} -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#194263): https://lists.openembedded.org/g/openembedded-core/message/194263 Mute This Topic: https://lists.openembedded.org/mt/103905858/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
