5 files changed, 103 insertions, 73 deletions

diff --git a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch
deleted file mode 100644
index c51fb1cfdb..0000000000
--- a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c5cd932fb08e7ce90cdbf9ae6c5cc7e65ac0738e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Wei=C3=9F?= <michael.weiss@aisec.fraunhofer.de>
-Date: Tue, 9 May 2023 20:00:26 +0200
-Subject: [PATCH] pv/display: handle error of tcgetpgrp() in pv_in_foreground()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Show pv progress bar even if no terminal is set, e.g., in a busybox
-init script. The description of pv_in_forground() states it will
-return true "if we aren't outputting to a terminal". However, this
-is not the case since tcgetpgrg() will return an error and set ERRNO
-to ENOTTY if the output fd is not an tty. We now handle this error
-correctly and pv_in_foreground() returns also true in that case.
-
-Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de>
----
-Upstream-Status: Pending
-
- src/pv/display.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/pv/display.c b/src/pv/display.c
-index aff643b..8d1f4c9 100644
---- a/src/pv/display.c
-+++ b/src/pv/display.c
-@@ -48,6 +48,10 @@ bool pv_in_foreground(void)
- 
-        our_process_group = getpgrp();
-        tty_process_group = tcgetpgrp(STDERR_FILENO);
-+
-+       if (tty_process_group == -1 && errno == ENOTTY)
-+               return true;
-+
-        if (our_process_group == tty_process_group)
-                return true;
- 
--- 
-2.30.2
-
diff --git a/meta-oe/recipes-support/pv/pv/pv-test-system-version.patch b/meta-oe/recipes-support/pv/pv/pv-test-system-version.patch
new file mode 100644
index 0000000000..f5e2b05768
--- /dev/null
+++ b/meta-oe/recipes-support/pv/pv/pv-test-system-version.patch
@@ -0,0 +1,18 @@
+Use the version of pv installed on the system rather than the ./pv from 
+the development tree as is done when running 'make check'.
+
+Upstream-Status: Inappropriate [x-compile specific]
+
+---
+diff -Naur pv-1.9.31.orig/tests/test-env.sh pv-1.9.31/tests/test-env.sh
+--- pv-1.9.31.orig/tests/test-env.sh    2024-12-07 08:59:43.000000000 -0500
++++ pv-1.9.31/tests/test-env.sh 2025-03-26 14:11:30.987123378 -0400
+@@ -9,7 +9,7 @@
+ true "${srcdir:?not set - call this from 'make check'}"
+ 
+ # Parameters.
+-testSubject="./pv"
++testSubject="pv"
+ sourcePath="${srcdir}"
+ 
+ # Set everything to the "C" locale.
diff --git a/meta-oe/recipes-support/pv/pv/run-ptest b/meta-oe/recipes-support/pv/pv/run-ptest
index 3f5956f4c0..b0370e0a99 100644
--- a/meta-oe/recipes-support/pv/pv/run-ptest
+++ b/meta-oe/recipes-support/pv/pv/run-ptest
@@ -1,7 +1,22 @@
 #!/bin/sh
 
-rm -rf tests.log
-sh -e run-test.sh pv . > tests.log 2>&1
-sed -e 's|\(.*\):.*OK|PASS: \1|' \
-    -e 's|\(.*\):.*FAILED|FAIL: \1|' \
-   tests.log
+srcdir=/usr/lib/pv/ptest       
+export srcdir                      
+                        
+source tests/test-env.sh
+               
+num_fail=0
+
+# all pv tests are capitalized
+for test in tests/[A-Z]*
+do
+    ./"$test" \
+         && echo "PASS: $test" \
+         || {
+            echo "FAIL: $test"
+            num_fail=$(( ${num_fail} + 1))
+         }
+
+done
+
+exit $num_fail
diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.6.20.bb
deleted file mode 100644
index 6a739af927..0000000000
--- a/meta-oe/recipes-support/pv/pv_1.6.20.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline"
-HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml"
-
-LICENSE = "Artistic-2.0"
-LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
-
-SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \
-           file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \
-           file://run-ptest \
-"
-SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603"
-
-UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
-UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar.bz2"
-
-inherit autotools ptest
-
-LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}"
-export LDEMULATION
-
-RDEPENDS:${PN}-ptest += "coreutils ${PN}"
-
-do_install_ptest() {
-    install -d ${D}${PTEST_PATH}/tests
-    cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests
-    cp -r ${S}/autoconf/scripts/run-test.sh  ${D}${PTEST_PATH}
-    # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest
-}
diff --git a/meta-oe/recipes-support/pv/pv_1.9.31.bb b/meta-oe/recipes-support/pv/pv_1.9.31.bb
new file mode 100644
index 0000000000..578012fcfd
--- /dev/null
+++ b/meta-oe/recipes-support/pv/pv_1.9.31.bb
@@ -0,0 +1,65 @@
+SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline"
+HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml"
+
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://docs/COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.gz \
+           file://pv-test-system-version.patch \
+           file://run-ptest \
+"
+SRC_URI[sha256sum] = "a35e92ec4ac0e8f380e8e840088167ae01014bfa008a3a9d6506b848079daedf"
+
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
+UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar"
+
+inherit autotools gettext ptest
+
+LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}"
+export LDEMULATION
+
+# for ptests
+VALGRIND = "valgrind"
+
+# valgrind supports armv7 and above
+VALGRIND:armv4 = ''
+VALGRIND:armv5 = ''
+VALGRIND:armv6 = ''
+
+# X32 isn't supported by valgrind at this time
+VALGRIND:linux-gnux32 = ''
+VALGRIND:linux-muslx32 = ''
+
+# Disable for some MIPS variants
+VALGRIND:mipsarchr6 = ''
+VALGRIND:linux-gnun32 = ''
+
+# Disable for powerpc64 with musl
+VALGRIND:libc-musl:powerpc64 = ''
+VALGRIND:libc-musl:powerpc64le = ''
+
+# RISC-V support for valgrind is not there yet
+VALGRIND:riscv64 = ""
+VALGRIND:riscv32 = ""
+
+RDEPENDS:${PN}-ptest += "bash coreutils tmux ${VALGRIND}"
+RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales"
+RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-binary-localedata-c"
+
+do_install_ptest() {
+    testsdir=${D}${PTEST_PATH}/tests
+    install -d ${testsdir}
+    cp -r ${S}/tests/* ${testsdir}
+    #
+    # remove self-hosted install test
+    rm -f ${testsdir}/Bug_-_Install_all_files.test
+    # skip the failing valgrind tests for now (March 2025).
+    # See: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15817
+    rm -f ${testsdir}/Memory*
+    # test requires at least 3GB free on /tmp
+    rm -f ${testsdir}/Integrity_-_Large_file_support.test
+    # fails due to our prompt: 
+    rm -f ${testsdir}/Terminal_-_Detect_width.test
+    #
+    # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest
+}