Skip to contentSkip to conversation

xz: add ptest support

PATCH In review [email protected] 2 participants 3 messages Jun 1, 2023 – Jun 15, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xz: add ptest support

From: duep <[email protected]>

Add a ptest for xz
- It is taking around 1s to execute with kvm, so added it to PTESTS_FAST
- It contains 11 test files:
test_bcj_exact_size test_block_header test_check test_filter_flags test_hardware test_index test_index_hash test_lzip_decoder test_memlimit test_stream_flags test_vli
- Below is part of the run log:

    START: ptest-runner
    2023-06-01T01:57
    BEGIN:
    /usr/lib/xz/ptest
    === test_bcj_exact_size.c ===
    PASS: test_exact_size
    PASS: test_empty_block
    ---
    # TOTAL: 2
    # PASS:  2
    # SKIP:  0
    # FAIL:  0
    # ERROR: 0
    === END ===
    ...
    === test_vli.c ===
    PASS: test_lzma_vli_size
    PASS: test_lzma_vli_encode
    PASS: test_lzma_vli_decode
    ---
    # TOTAL: 3
    # PASS:  3
    # SKIP:  0
    # FAIL:  0
    # ERROR: 0
    === END ===
    DURATION: 0
    END: /usr/lib/xz/ptest
    2023-06-01T01:57
    STOP: ptest-runner
    TOTAL: 1 FAIL: 0

- The tests under xz requires /bin/bash

---
 .../distro/include/ptest-packagelists.inc     |  1 +
 .../xz/xz/0001-build-PROGRAMS.patch           | 20 ++++++++++++++++
 meta/recipes-extended/xz/xz/run-ptest         |  5 ++++
 meta/recipes-extended/xz/xz_5.4.1.bb          | 24 +++++++++++++++++--
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/xz/xz/0001-build-PROGRAMS.patch
 create mode 100644 meta/recipes-extended/xz/xz/run-ptest
meta/conf/distro/include/ptest-packagelists.inc +1 -0
index d60ebb38fc..9aa68c75ea 100644
@@ -70,6 +70,7 @@ PTESTS_FAST = "\
     sed \
     slang \
     wayland \
+    xz \
     zlib \
 "
 PTESTS_FAST:append:libc-glibc = " glibc-tests"
meta/recipes-extended/xz/xz/0001-build-PROGRAMS.patch new file +20 -0
new file mode 100644
index 0000000000..f97a75030a
@@ -0,0 +1,20 @@
+From: Du Erpei <[email protected]>
+Subject: [PATCH] tests/Makefile.am: add target of 'build-PROGRAMS'
+
+Add target 'build-PROGRAMS' to only compile the test set under
+'/tests' and not run locally.
+
+Upstream-Status: Pending
+
+--- a/tests/Makefile.am	2023-01-12 00:51:42.000000000 +0800
++++ b/tests/Makefile.am	2023-05-30 14:49:34.507313644 +0800
+@@ -74,6 +74,9 @@ if COND_SCRIPTS
+ TESTS += test_scripts.sh
+ endif
+ 
++build-PROGRAMS: all-am
++	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
++
+ clean-local:
+ 	-rm -f compress_generated_* \
+ 		xzgrep_test_output xzgrep_test_1.xz xzgrep_test_2.xz
meta/recipes-extended/xz/xz/run-ptest new file +5 -0
new file mode 100644
index 0000000000..ebde965d5c
@@ -0,0 +1,5 @@
+#!/bin/sh
+cd ./tests
+for i in `ls test*`; do
+	./$i
+done
meta/recipes-extended/xz/xz_5.4.1.bb +22 -2
index 71bf4b540a..14808b1714 100644
@@ -24,13 +24,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=97d554a32881fee0aa283d96e47cb24a \
                     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 \
+           file://0001-build-PROGRAMS.patch \
+           file://run-ptest"
 SRC_URI[sha256sum] = "e4b0f81582efa155ccf27bb88275254a429d44968e488fc94b806f2a61cd3e22"
 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,21 @@ ALTERNATIVE:${PN} = "xz xzcat unxz \
                      lzma lzcat unlzma"
 
 BBCLASSEXTEND = "native nativesdk"
+
+do_compile_ptest(){
+	oe_runmake -C ${B}/tests/ build-PROGRAMS
+}
+
+do_install_ptest(){
+	install -d ${D}${PTEST_PATH}/tests/
+	find ${B}/tests/ -type f -not -name "*.o" -not -name "Makefile" \
+	  -exec install --mode=755 {} ${D}${PTEST_PATH}/tests/ \;
+
+	install -d ${D}${PTEST_PATH}/tests/.libs/
+	install --mode=755 ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/.libs/
+
+	install -d ${D}${PTEST_PATH}/tests/files/
+	install --mode=755 ${S}/tests/files/* ${D}${PTEST_PATH}/tests/files/
+}
+
+RDEPENDS:${PN}-ptest += "bash"
Signature · 1 line
2.25.1
#1 lore raw

meta/recipes-extended/xz/xz/0001-build-PROGRAMS.patch line 7

Quoted 7 lines · On Thu, 1 Jun 2023 at 10:52, [email protected] <[email protected]>…
meta/recipes-extended/xz/xz/0001-build-PROGRAMS.patch new file +7 -0
+From: Du Erpei <[email protected]>
+Subject: [PATCH] tests/Makefile.am: add target of 'build-PROGRAMS'
+
+Add target 'build-PROGRAMS' to only compile the test set under
+'/tests' and not run locally.
+
+Upstream-Status: Pending

Please submit this patch to xz upstream first and include the link to that submission.
https://github.com/tukaani-project/xz

Alex

#2 lore raw

Hello Alex

I have modified the patch again, and the new patch does not need to modify the upstream xz. The link of the new patch:
https://lists.openembedded.org/g/openembedded-core/message/182481

Du

-----邮件原件-----
发件人: [email protected] <[email protected]> 代表 Alexander Kanavin 发送时间: 2023年6月1日 17:03
收件人: Du, Erpei/杜 二佩 <[email protected]>
抄送: [email protected]; FNST fnstml-fujitsuten <[email protected]> 主题: Re: [OE-core] [meta-oe][PATCH V1] xz: add ptest support

meta/recipes-extended/xz/xz/0001-build-PROGRAMS.patch line 7

Quoted 7 lines · On Thu, 1 Jun 2023 at 10:52, [email protected] <[email protected]>…
meta/recipes-extended/xz/xz/0001-build-PROGRAMS.patch new file +7 -0
+From: Du Erpei <[email protected]>
+Subject: [PATCH] tests/Makefile.am: add target of 'build-PROGRAMS'
+
+Add target 'build-PROGRAMS' to only compile the test set under 
+'/tests' and not run locally.
+
+Upstream-Status: Pending

Please submit this patch to xz upstream first and include the link to that submission.
https://github.com/tukaani-project/xz

Alex