[PATCH] xz: Add ptest support

[PATCH] xz: Add ptest support

[Xu, Chi]

72 test cases in all and all test cases PASS.
Test results on qemux86-64:
root@qemux86-64:~# ptest-runner xz
START: ptest-runner
2024-01-23T07:37
BEGIN: /usr/lib/xz/ptest
=== test_block_header.c ===
PASS: test_lzma_block_header_size
PASS: test_lzma_block_header_encode
PASS: test_lzma_block_header_decode
---
=== END ===
PASS: create_compress_files
=== test_hardware.c ===
PASS: test_lzma_physmem
PASS: test_lzma_cputhreads
---
=== END ===
...
...
=== test_bcj_exact_size.c ===
PASS: test_exact_size
PASS: test_empty_block
---
=== END ===
DURATION: 1
END: /usr/lib/xz/ptest
2024-01-23T07:37
STOP: ptest-runner
TOTAL: 1 FAIL: 0

Signed-off-by: Xu, Chi <chi.xu@windriver.com>
---
 .../distro/include/ptest-packagelists.inc     |  1 +
 meta/recipes-extended/xz/xz/run-ptest         | 20 +++++++++++++++++++
 meta/recipes-extended/xz/xz_5.4.5.bb          | 18 +++++++++++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)
 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..21b84d311a 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -78,6 +78,7 @@ PTESTS_FAST = "\
     slang \
     wayland \
     zlib \
+    xz \
     libexif \
 "
 PTESTS_FAST:append:libc-glibc = " glibc-y2038-tests"
diff --git a/meta/recipes-extended/xz/xz/run-ptest b/meta/recipes-extended/xz/xz/run-ptest
new file mode 100644
index 0000000000..64aaf38638
--- /dev/null
+++ b/meta/recipes-extended/xz/xz/run-ptest
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+ptestdir=$(dirname "$(readlink -f "$0")")
+cd "$ptestdir"/tests || exit
+
+tests=`find . -type f -executable | sed 's/\.\///g'`
+
+for i in ${tests}; do
+    if [ $i == "create_compress_files" ]; then
+        ./$i
+        if [ $? -eq 0 ]; then
+            echo "PASS: $i"
+        else
+            echo "FAIL: $i"
+        fi
+    else
+        ./$i
+    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..e7a873af96 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', '', 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,15 @@ ALTERNATIVE:${PN} = "xz xzcat unxz \
                      lzma lzcat unlzma"
 
 BBCLASSEXTEND = "native nativesdk"
+
+RDEPENDS:${PN}-ptest += "bash"
+
+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 -r ${S}/tests/files ${D}${PTEST_PATH}/tests
+}
-- 
2.25.1

Re: [OE-core] [PATCH] xz: Add ptest support

[Alexander Kanavin]

On Tue, 23 Jan 2024 at 09:21, Chi Xu <chi.xu@eng.windriver.com> wrote:
> +tests=`find . -type f -executable | sed 's/\.\///g'`
> +
> +for i in ${tests}; do
> +    if [ $i == "create_compress_files" ]; then
> +        ./$i
> +        if [ $? -eq 0 ]; then
> +            echo "PASS: $i"
> +        else
> +            echo "FAIL: $i"
> +        fi
> +    else
> +        ./$i
> +    fi

This should be investigated a bit more. Why does create_compress_files
need to be special cased and other tests do not?

Alex

RE: [OE-core] [PATCH] xz: Add ptest support

[Xu, Chi]

There are two types of cases in xz pkg: executables and POSIX shell scripts.
I only integrated executables in V1 patch.
There are two script cases "test_compress.sh" and "test_scripts.sh", create_compress_files is a test tool which will be called by "test_compress.sh". 
I will install both types of case and send V2.

Thanks,
Chi

> -----Original Message-----
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Sent: Tuesday, January 23, 2024 5:43 PM
> To: Xu, Chi <Chi.Xu@windriver.com>
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] xz: Add ptest support
> 
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and
> know the content is safe.
> 
> On Tue, 23 Jan 2024 at 09:21, Chi Xu <chi.xu@eng.windriver.com> wrote:
> > +tests=`find . -type f -executable | sed 's/\.\///g'`
> > +
> > +for i in ${tests}; do
> > +    if [ $i == "create_compress_files" ]; then
> > +        ./$i
> > +        if [ $? -eq 0 ]; then
> > +            echo "PASS: $i"
> > +        else
> > +            echo "FAIL: $i"
> > +        fi
> > +    else
> > +        ./$i
> > +    fi
> 
> This should be investigated a bit more. Why does create_compress_files need
> to be special cased and other tests do not?
> 
> Alex

[PATCH] xz: Add ptest support

[Xu, Chi]

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 <chi.xu@windriver.com>
---
 .../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" <chi.xu@windriver.com>
+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 <chi.xu@windriver.com>
+---
+ 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