Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1473531 -- Disable gtest storage_DeadlockDetectorTest.storage_Sanity5DeathTest for macosx ccov build.

Browse Source 
Summary: GTest is permafailing because of this test (GTest is always running over 1200s).

Reviewers: froydnj

Reviewed By: froydnj

Bug #: 1473531

Differential Revision: https://phabricator.services.mozilla.com/D2032

--HG--
extra : rebase_source : 07413c4d7ba4eb6bd1439f292bd489a775dab61b
This commit is contained in:
Calixte Denizet 2018-07-17 21:24:12 +03:00
parent 05aa13980f
commit cfaea27109
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
storage/test/gtest/test_deadlock_detector.cpp
View File

@ -59,6 +59,11 @@ extern unsigned int _gdb_sleep_duration;
#define MUTEX TestMutex #define MUTEX TestMutex
#define TESTNAME(name) storage_##name #define TESTNAME(name) storage_##name
// Bug 1473531: the test storage_DeadlockDetectorTest.storage_Sanity5DeathTest times out on macosx ccov builds
#if defined(XP_MACOSX) && defined(MOZ_CODE_COVERAGE)
#define DISABLE_STORAGE_SANITY5_DEATH_TEST
#endif
// We need to use a namespace to avoid duplicate definitions of some functions // We need to use a namespace to avoid duplicate definitions of some functions
// within TestDeadlockDetector.cpp. // within TestDeadlockDetector.cpp.
namespace storage { namespace storage {

2
xpcom/tests/gtest/TestDeadlockDetector.cpp
View File

@ -211,6 +211,7 @@ Sanity5_Child()
return 0; return 0;
} }
#if !defined(DISABLE_STORAGE_SANITY5_DEATH_TEST)
TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity5DeathTest)) TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity5DeathTest))
{ {
const char* const regex = const char* const regex =
@ -222,6 +223,7 @@ TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity5DeathTest))
"###!!! ASSERTION: Potential deadlock detected.*"; "###!!! ASSERTION: Potential deadlock detected.*";
ASSERT_DEATH_IF_SUPPORTED(Sanity5_Child(), regex); ASSERT_DEATH_IF_SUPPORTED(Sanity5_Child(), regex);
} }
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Multithreaded tests // Multithreaded tests