diff mbox series

libpng: skip pngimage-full test on riscv64

Message ID 20260810181923.3091327-1-tgamblin@baylibre.com
State New
Headers show
Series libpng: skip pngimage-full test on riscv64 | expand

Commit Message

Trevor Gamblin Aug. 10, 2026, 6:19 p.m. UTC 
The libpng ptest suite fails intermittently on the Autobuilder. This
seems to be tied to the pngimage-full test, which is the last one to run
and differs from pngimage-quick by using an --exhaustive flag to
indicate that a very wide variety of feature/configuration combos for
the libpng library should be tested. Disable the suite by patching
Makefile.am to exclude it, then conditionally include the patch for
riscv64 systems with a SRC_URI override.

For comparison, here's what the test suite output looks like with the
patch applied (note the last handful of results before the summary):

|PASS: tests/pngunknown-discard
|PASS: tests/pngunknown-if-safe
|PASS: tests/pngunknown-sAPI
|PASS: tests/pngunknown-sTER
|PASS: tests/pngunknown-save
|PASS: tests/pngunknown-vpAg
|PASS: tests/pngimage-quick
|============================================================================
|Testsuite summary for libpng 1.6.58
|============================================================================
|# TOTAL: 35
|# PASS:  35
|# SKIP:  0
|# XFAIL: 0
|# FAIL:  0
|# XPASS: 0
|# ERROR: 0
|============================================================================
|make[1]: Leaving directory '/usr/lib/libpng/ptest/src'
|DURATION: 464
|END: /usr/lib/libpng/ptest
|2026-08-10T18:09
|STOP: ptest-runner
|TOTAL: 1 FAIL: 0
|root@qemuriscv64:~#

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
 ...ile.am-drop-pngimage-full-from-TESTS.patch | 32 +++++++++++++++++++
 .../libpng/libpng_1.6.58.bb                   |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta/recipes-multimedia/libpng/files/0001-Makefile.am-drop-pngimage-full-from-TESTS.patch
diff mbox series

Patch

diff --git a/meta/recipes-multimedia/libpng/files/0001-Makefile.am-drop-pngimage-full-from-TESTS.patch b/meta/recipes-multimedia/libpng/files/0001-Makefile.am-drop-pngimage-full-from-TESTS.patch
new file mode 100644
index 0000000000..61349abdaf
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/files/0001-Makefile.am-drop-pngimage-full-from-TESTS.patch
@@ -0,0 +1,32 @@ 
+From 4e02adfe6fb14d4a9e78699a313981bd7c9f69f3 Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Mon, 10 Aug 2026 13:58:35 -0400
+Subject: [PATCH] Makefile.am: drop pngimage-full from TESTS
+
+This test is prone to failure on riscv64. Remove it from the TESTS list so it
+doesn't get included in the test images.
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index eb7078158..59051c2c7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -109,8 +109,7 @@ TESTS =\
+    tests/pngunknown-sTER\
+    tests/pngunknown-save\
+    tests/pngunknown-vpAg\
+-   tests/pngimage-quick\
+-   tests/pngimage-full
++   tests/pngimage-quick
+ endif
+ 
+ # man pages
+-- 
+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..02832640cc 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.58.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.58.bb
@@ -13,6 +13,7 @@  LIBV = "16"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz \
            file://run-ptest \
 "
+SRC_URI:append:riscv64 = " file://0001-Makefile.am-drop-pngimage-full-from-TESTS.patch"
 
 SRC_URI[sha256sum] = "28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775"