diff options
| author | Marius Bakke <marius@gnu.org> | 2023-01-03 15:38:13 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2023-01-03 15:38:13 +0100 |
| commit | 9123bb0fba3fce976dc41cd3b8919ee73b4cee4d (patch) | |
| tree | 50ba63a4a3a6ffeb2f37fd0929813b51e00d01dc /gnu/packages/patches/kodi-increase-test-timeout.patch | |
| parent | ec0fbb471dfc6f72796da9ebafbb0630daa91267 (diff) | |
| parent | 71ee1fbbed8ea9788dd48a634653d66606d372ce (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/kodi-increase-test-timeout.patch')
| -rw-r--r-- | gnu/packages/patches/kodi-increase-test-timeout.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/gnu/packages/patches/kodi-increase-test-timeout.patch b/gnu/packages/patches/kodi-increase-test-timeout.patch deleted file mode 100644 index 8fb149ff9d..0000000000 --- a/gnu/packages/patches/kodi-increase-test-timeout.patch +++ /dev/null @@ -1,18 +0,0 @@ -Increase thread timeout to reduce flakiness. - -Taken from upstream: -https://github.com/xbmc/xbmc/commit/574b0182d8b641fd24029f372ebdcccc897123e2 - -diff --git a/xbmc/threads/test/TestEvent.cpp b/xbmc/threads/test/TestEvent.cpp -index 42fb8c2fc609..40e644c0ed3c 100644 ---- a/xbmc/threads/test/TestEvent.cpp -+++ b/xbmc/threads/test/TestEvent.cpp -@@ -484,7 +484,7 @@ TEST(TestEvent, GroupTimedWait) - EXPECT_TRUE(w3.result == NULL); - - // this should end given the wait is for only 50 millis -- EXPECT_TRUE(waitThread3.timed_join(MILLIS(100))); -+ EXPECT_TRUE(waitThread3.timed_join(MILLIS(200))); - - EXPECT_TRUE(!w3.waiting); - EXPECT_TRUE(w3.result == NULL); |