diff --git a/meta/recipes-multimedia/libpng/files/0001-tests-stream-per-test-results-to-stdout.patch b/meta/recipes-multimedia/libpng/files/0001-tests-stream-per-test-results-to-stdout.patch new file mode 100644 index 0000000000..139495d211 --- /dev/null +++ b/meta/recipes-multimedia/libpng/files/0001-tests-stream-per-test-results-to-stdout.patch @@ -0,0 +1,237 @@ +From e0898e243cbef677a862612f04b6bca2b07c2453 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin +Date: Wed, 12 Aug 2026 12:22:54 -0400 +Subject: [PATCH] tests: stream per-test results to stdout + +Modify Makefile.am and create a new 'test-driver-tee' script to uses in +libpng's ptest suite, so we can live capture test results. This way, if +the test suite hits a timeout while running (e.g. on qemuriscv64), we +have some extra information about what happened in a specific test +and/or an indication of what wouldn't run. + +The diff between the original test-driver and test-driver-tee: + +|do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' | do_exit='rm -f $log_file $trs_file $log_file.exit; (exit $st) +|"$@" >>"$log_file" 2>&1 | # Programs that print many lines in a loop (e.g. pngimage's p +|estatus=$? | # lines) fully-buffer stdio once it's not a tty, so without t +| > # output would arrive in one dump at exit instead of streamin +| > if command -v stdbuf >/dev/null 2>&1; then +| > set -- stdbuf -oL -eL "$@" +| > fi +| > { "$@"; echo $? >"$log_file.exit"; } 2>&1 | tee -a "$log_file +| > estatus=$(cat "$log_file.exit") +| > rm -f "$log_file.exit" + +AI-Generated: Uses Claude Sonnet 5 + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Trevor Gamblin +--- + Makefile.am | 8 ++- + test-driver-tee | 167 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 174 insertions(+), 1 deletion(-) + create mode 100755 test-driver-tee + +diff --git a/Makefile.am b/Makefile.am +index eb7078158..a2e64fbe6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -111,6 +111,12 @@ TESTS =\ + tests/pngunknown-vpAg\ + tests/pngimage-quick\ + tests/pngimage-full ++ ++# Stream each test's detailed output to stdout as it runs (the stock ++# test-driver only writes it to the per-test .log file), while still ++# leaving the final automake summary for the end of the run. ++LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-tee ++TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-tee + endif + + # man pages +@@ -165,7 +171,7 @@ pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc + # not done in the source directory! + EXTRA_DIST= \ + ANNOUNCE AUTHORS CHANGES INSTALL LICENSE README TODO TRADEMARK \ +- pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ ++ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh test-driver-tee \ + ${srcdir}/ci ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \ + $(TESTS) $(XFAIL_TESTS) tests/pngstest \ + CMakeLists.txt example.c libpng-manual.txt +diff --git a/test-driver-tee b/test-driver-tee +new file mode 100755 +index 000000000..a6d5aa027 +--- /dev/null ++++ b/test-driver-tee +@@ -0,0 +1,167 @@ ++#! /bin/sh ++# test-driver - basic testsuite driver script. ++ ++scriptversion=2025-06-18.21; # UTC ++ ++# Copyright (C) 2011-2025 Free Software Foundation, Inc. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# This file is maintained in Automake, please report ++# bugs to or send patches to ++# . ++ ++# Make unconditional expansion of undefined variables an error. This ++# helps a lot in preventing typo-related bugs. ++set -u ++ ++usage_error () ++{ ++ echo "$0: $*" >&2 ++ print_usage >&2 ++ exit 2 ++} ++ ++print_usage () ++{ ++ cat <. ++GNU Automake home page: . ++General help using GNU software: . ++END ++} ++ ++test_name= # Used for reporting. ++log_file= # Where to save the output of the test script. ++trs_file= # Where to save the metadata of the test run. ++expect_failure=no ++color_tests=no ++collect_skipped_logs=yes ++enable_hard_errors=yes ++while test $# -gt 0; do ++ case $1 in ++ --help) print_usage; exit $?;; ++ --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;; ++ --test-name) test_name=$2; shift;; ++ --log-file) log_file=$2; shift;; ++ --trs-file) trs_file=$2; shift;; ++ --color-tests) color_tests=$2; shift;; ++ --collect-skipped-logs) collect_skipped_logs=$2; shift;; ++ --expect-failure) expect_failure=$2; shift;; ++ --enable-hard-errors) enable_hard_errors=$2; shift;; ++ --) shift; break;; ++ -*) usage_error "invalid option: '$1'";; ++ *) break;; ++ esac ++ shift ++done ++ ++missing_opts= ++test x"$test_name" = x && missing_opts="$missing_opts --test-name" ++test x"$log_file" = x && missing_opts="$missing_opts --log-file" ++test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" ++if test x"$missing_opts" != x; then ++ usage_error "the following mandatory options are missing:$missing_opts" ++fi ++ ++if test $# -eq 0; then ++ usage_error "missing argument" ++fi ++ ++if test $color_tests = yes; then ++ # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. ++ red='' # Red. ++ grn='' # Green. ++ lgn='' # Light green. ++ blu='' # Blue. ++ mgn='' # Magenta. ++ std='' # No color. ++else ++ red= grn= lgn= blu= mgn= std= ++fi ++ ++do_exit='rm -f $log_file $trs_file $log_file.exit; (exit $st); exit $st' ++trap "st=129; $do_exit" 1 ++trap "st=130; $do_exit" 2 ++trap "st=141; $do_exit" 13 ++trap "st=143; $do_exit" 15 ++ ++# Test script is run here. We create the file first, then append to it, ++# to ameliorate tests themselves also writing to the log file. Our tests ++# don't, but others can (automake bug#35762). ++: >"$log_file" ++# Programs that print many lines in a loop (e.g. pngimage's per-file PASS ++# lines) fully-buffer stdio once it's not a tty, so without this their ++# output would arrive in one dump at exit instead of streaming live. ++if command -v stdbuf >/dev/null 2>&1; then ++ set -- stdbuf -oL -eL "$@" ++fi ++{ "$@"; echo $? >"$log_file.exit"; } 2>&1 | tee -a "$log_file" ++estatus=$(cat "$log_file.exit") ++rm -f "$log_file.exit" ++ ++if test $enable_hard_errors = no && test $estatus -eq 99; then ++ tweaked_estatus=1 ++else ++ tweaked_estatus=$estatus ++fi ++ ++case $tweaked_estatus:$expect_failure in ++ 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; ++ 0:*) col=$grn res=PASS recheck=no gcopy=no;; ++ 77:*) col=$blu res=SKIP recheck=no gcopy=$collect_skipped_logs;; ++ 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; ++ *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; ++ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; ++esac ++ ++# Report the test outcome and exit status in the logs, so that one can ++# know whether the test passed or failed simply by looking at the '.log' ++# file, without the need of also peaking into the corresponding '.trs' ++# file (automake bug#11814). ++echo "$res $test_name (exit status: $estatus)" >>"$log_file" ++ ++# Report outcome to console. ++echo "${col}${res}${std}: $test_name" ++ ++# Register the test result, and other relevant metadata. ++echo ":test-result: $res" > $trs_file ++echo ":global-test-result: $res" >> $trs_file ++echo ":recheck: $recheck" >> $trs_file ++echo ":copy-in-global-log: $gcopy" >> $trs_file ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'before-save-hook 'time-stamp nil t) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%Y-%02m-%02d.%02H" ++# time-stamp-time-zone: "UTC0" ++# time-stamp-end: "; # UTC" ++# End: +-- +2.55.0 + diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.58.bb b/meta/recipes-multimedia/libpng/libpng_1.6.58.bb index 6e4e5e9f38..928b010c9c 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.58.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.58.bb @@ -12,6 +12,7 @@ LIBV = "16" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz \ file://run-ptest \ + file://0001-tests-stream-per-test-results-to-stdout.patch \ " SRC_URI[sha256sum] = "28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775" @@ -33,13 +34,13 @@ PACKAGES =+ "${PN}-tools" FILES:${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix ${bindir}/pngcp" -RDEPENDS:${PN}-ptest += "make bash gawk" +RDEPENDS:${PN}-ptest += "make bash gawk coreutils" do_install_ptest() { # Install test scripts to ptest path install -d ${D}${PTEST_PATH}/src/tests install -m 755 ${S}/tests/* ${D}${PTEST_PATH}/src/tests - install -m 755 ${S}/test-driver ${D}${PTEST_PATH} + install -m 755 ${S}/test-driver-tee ${D}${PTEST_PATH} install -d ${D}${PTEST_PATH}/src/tests/scripts install -m 755 ${S}/scripts/*.awk ${D}${PTEST_PATH}/src/tests/scripts install -m 644 ${S}/scripts/pnglib* ${S}/scripts/*.c ${S}/scripts/*.def ${S}/scripts/macro.lst ${D}${PTEST_PATH}/src/tests/scripts