From 9ee60eff234d8396afc82f0258f7976a4cca90da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Thu, 4 Apr 2024 13:19:17 +0200 Subject: [PATCH] Adjusting upstream-scripttests for testing-farm disabling tests unstable on testing-farm --- Sanity/upstream-scripttests/runtest.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Sanity/upstream-scripttests/runtest.sh b/Sanity/upstream-scripttests/runtest.sh index d00a727..4c315b6 100755 --- a/Sanity/upstream-scripttests/runtest.sh +++ b/Sanity/upstream-scripttests/runtest.sh @@ -85,6 +85,16 @@ rlJournalStart rlRun "mkdir BUILD" 0 "Creating BUILD directory" rlRun "rpmbuild --nodeps --define '_topdir $TmpDir' -bp $TmpDir/SPECS/*spec" \ 0 "Preparing sources" + + # Disabling tests unstable on testing-farm + grep -r "testing-farm" /var/ARTIFACTS/*/plans/all/discover/default-0/tests + if [ $? -eq 0 ]; then + rlLog "Disabling tests unstable on testing-farm" + rlLog "Disabled tests Test_opt_set_keycode, Test_set_completion" + sed -i "/^func Test_opt_set_keycode\(\)/,/^endfunc$/d" BUILD/vim91/src/testdir/test_options.vim + sed -i "/^func Test_set_completion\(\)/,/^endfunc$/d" BUILD/vim91/src/testdir/test_options.vim + fi + if rlIsFedora || rlIsRHELLike '>9' then rlRun "rm -rf BUILD/*SPECPARTS &> /dev/null" 0,1 "Remove the additional directory if exists"