diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest index 0cfa955f03..7d0312005f 100755 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest @@ -1,2 +1,16 @@ -#!/usr/bin/env sh +#! /bin/sh + +# Multiply all timeouts by ten so they're more likely to work +# on a loaded system. +export CK_TIMEOUT_MULTIPLIER=5 + +# Skip some tests that we know are problematic +export GST_CHECKS_IGNORE="" +# gstnetclientclock.c:test_functioning is very sensitive to load +GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning" + +# aggregator.c:test_infinite_seek_50_src_live is known to be flaky +# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/410 +GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_infinite_seek_50_src_live" + gnome-desktop-testing-runner gstreamer diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/skip-aggregator-test.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/skip-aggregator-test.patch deleted file mode 100644 index 81337512fd..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/skip-aggregator-test.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9b72aa7cdbc2a81cffc6f855933afe90c81046d5 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 28 Feb 2024 12:40:34 +0000 -Subject: [PATCH] Skip aggregator test - -This test case is known to be flaky upstream[1] and often fails on the -autobuilder[2], so skip it until this has been resolved upstream. - -[1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/410 -[2] https://bugzilla.yoctoproject.org/show_bug.cgi?id=15054 - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton ---- - tests/check/libs/aggregator.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/check/libs/aggregator.c b/tests/check/libs/aggregator.c -index 1f2c5b4..27b3ac7 100644 ---- a/tests/check/libs/aggregator.c -+++ b/tests/check/libs/aggregator.c -@@ -1475,7 +1475,9 @@ gst_aggregator_suite (void) - tcase_add_test (general, test_flushing_seek); - tcase_add_test (general, test_infinite_seek); - tcase_add_test (general, test_infinite_seek_50_src); -- tcase_add_test (general, test_infinite_seek_50_src_live); -+ // This test case is known to be flaky, remove it until resolved: -+ // https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/410 -+ // tcase_add_test (general, test_infinite_seek_50_src_live); - tcase_add_test (general, test_linear_pipeline); - tcase_add_test (general, test_two_src_pipeline); - tcase_add_test (general, test_timeout_pipeline); --- -2.34.1 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.10.bb index c16f0de3b7..0c944e9e11 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.10.bb @@ -21,7 +21,6 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://0002-tests-add-support-for-install-the-tests.patch \ file://0003-tests-use-a-dictionaries-for-environment.patch \ file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ - file://skip-aggregator-test.patch \ " SRC_URI[sha256sum] = "969aaef396f252ce925132a4be2aa004e0320f5c1baf0acaaae09c544a6759f4"