From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Holland Subject: bug#36675: [PATCH] gnu: kodi: Disable intermittently failing test. Date: Tue, 3 Dec 2019 13:52:14 +0000 Message-ID: <20191203135214.1871840-1-josh@inv.alid.pw> References: <87wogj3xzo.fsf@inv.alid.pw> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:48444) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ic8c3-0002Bh-Fm for bug-guix@gnu.org; Tue, 03 Dec 2019 08:53:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ic8bx-000171-15 for bug-guix@gnu.org; Tue, 03 Dec 2019 08:53:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ic8bw-00010Q-5R for bug-guix@gnu.org; Tue, 03 Dec 2019 08:53:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ic8bu-00047H-3L for bug-guix@gnu.org; Tue, 03 Dec 2019 08:53:02 -0500 In-Reply-To: <87wogj3xzo.fsf@inv.alid.pw> Sender: "Debbugs-submit" Resent-Message-ID: List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 36675@debbugs.gnu.org Cc: Josh Holland As reported in , occasionally the TestMassEvent.General test in kodi crashes with a mutex error. * gnu/packages/patches/kodi-skip-testmasseventgeneral.patch: New file. * gnu/packages/kodi.scm (kodi)[source]: Use it. * gnu/local.mk: (dist_patch_DATA): Add it. --- I have tested building the kodi-wayland package with this patch, and it successfully builds and the tests pass. gnu/local.mk | 1 + gnu/packages/kodi.scm | 3 +- .../kodi-skip-testmasseventgeneral.patch | 59 +++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/kodi-skip-testmasseventgeneral.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2d922373e..4fc690c785 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1036,6 +1036,7 @@ dist_patch_DATA = \ %D%/packages/patches/kodi-increase-test-timeout.patch \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/kodi-skip-test-449.patch \ + %D%/packages/patches/kodi-skip-testmasseventgeneral.patch \ %D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/lcalc-default-parameters-1.patch \ %D%/packages/patches/lcalc-default-parameters-2.patch \ diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 59ea11f812..04d879bd17 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -281,7 +281,8 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") "1m0295czxabdcqyqf5m94av9d88pzhnzjvyfs1q07xqq82h313p7")) (patches (search-patches "kodi-skip-test-449.patch" "kodi-increase-test-timeout.patch" - "kodi-set-libcurl-ssl-parameters.patch")) + "kodi-set-libcurl-ssl-parameters.patch" + "kodi-skip-testmasseventgeneral.patch")) (snippet '(begin (use-modules (guix build utils)) diff --git a/gnu/packages/patches/kodi-skip-testmasseventgeneral.patch b/gnu/packages/patches/kodi-skip-testmasseventgeneral.patch new file mode 100644 index 0000000000..89fe60b598 --- /dev/null +++ b/gnu/packages/patches/kodi-skip-testmasseventgeneral.patch @@ -0,0 +1,59 @@ +This test has been intermittently failing since version 18.2 (see Guix +bug 36675). + +438/521 Test #438: TestMassEvent.General ....................................................Child aborted***Exception: 0.82 sec +Note: Google Test filter = TestMassEvent.General +[==========] Running 1 test from 1 test case. +[----------] Global test environment set-up. +[----------] 1 test from TestMassEvent +[ RUN ] TestMassEvent.General +[ OK ] TestMassEvent.General (105 ms) +[----------] 1 test from TestMassEvent (105 ms total) + +[----------] Global test environment tear-down +[==========] 1 test from 1 test case ran. (142 ms total) +[ PASSED ] 1 test. +kodi-test: ../nptl/pthread_mutex_lock.c:434: __pthread_mutex_lock_full: Assertion `robust || (oldval & FUTEX_OWNER_DIED) == 0' failed. + +--- + xbmc/threads/test/TestEvent.cpp | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +diff --git a/xbmc/threads/test/TestEvent.cpp b/xbmc/threads/test/TestEvent.cpp +index 40e644c0ed..8fe329caa4 100644 +--- a/xbmc/threads/test/TestEvent.cpp ++++ b/xbmc/threads/test/TestEvent.cpp +@@ -592,17 +592,17 @@ template void RunMassEventTest(std::vector>& m, boo + } + + +-TEST(TestMassEvent, General) +-{ +- g_event = new CEvent(); ++// TEST(TestMassEvent, General) ++// { ++// g_event = new CEvent(); + +- std::vector> m(NUMTHREADS); +- for(size_t i=0; i> m(NUMTHREADS); ++// for(size_t i=0; i