commit: 86e8809bb737ccad442a84bd45dfd988b4f895df Author: Brett A C Sheffield <bacs <AT> librecast <DOT> net> AuthorDate: Thu Feb 19 14:13:17 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 14 19:00:47 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e8809b
www-servers/varnish: skip unreliable tests Skip unreliable test t02014.vtc. Replace previous methods for skipping tests with one that is easier to maintain. When skipping tests, we insert "feature cmd false" at the top of the vtc test files so that the tests are correctly logged as SKIPped in the test result summary. Closes: https://bugs.gentoo.org/964041 Signed-off-by: Brett A C Sheffield <bacs <AT> librecast.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/81 Signed-off-by: Sam James <sam <AT> gentoo.org> www-servers/varnish/varnish-8.0.0-r1.ebuild | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/www-servers/varnish/varnish-8.0.0-r1.ebuild b/www-servers/varnish/varnish-8.0.0-r1.ebuild index a172a7899245..2218d1deffcb 100644 --- a/www-servers/varnish/varnish-8.0.0-r1.ebuild +++ b/www-servers/varnish/varnish-8.0.0-r1.ebuild @@ -43,10 +43,20 @@ DEPEND=" REQUIRED_USE="${PYTHON_REQUIRED_USE}" PATCHES=( - "${FILESDIR}/${PN}-7.1.2-disable-tests.patch" "${FILESDIR}/${PN}-8.0.0-configure-make-python-output-match-autotools.patch" # Bug: 882725 ) +# Upstream acknowledge that a small number of tests fail sporadically, including on their +# test boxes. We SKIP problematic tests here. Check https://vinyl-cache.org/vtest/ +SKIP_TESTS=( + "u00021.vtc" # Commit: 83d9fbb2961c + "r02686.vtc" # Bug: 880627 + "r02990.vtc" # Bug: 880627 + "u00008.vtc" # Bug: 880627 + "u00009.vtc" # Bug: 880627 + "t02014.vtc" # Bug: 964041 +) + src_prepare() { default @@ -55,6 +65,12 @@ src_prepare() { python_setup python_fix_shebang -q ${shebangs[*]} + # SKIP unreliable tests + local t + for t in ${SKIP_TESTS[*]}; do + sed -i -e '/^varnishtest.*$/a feature cmd false' bin/varnishtest/tests/${t} || die + done + # Remove -Werror bug #528354 sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac || die @@ -77,13 +93,6 @@ src_configure() { econf "${myeconfargs[@]}" } -src_test() { - # Times out - rm bin/varnishtest/tests/u00021.vtc || die - - default -} - src_install() { emake DESTDIR="${D}" install
