diff options
| author | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 23:16:13 +0000 |
|---|---|---|
| committer | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 23:16:13 +0000 |
| commit | 851beb59eeb2466b866744e0a7f829c8e60efaa2 (patch) | |
| tree | d4ff0d89a57ee6eafe1e8b705e78581227f1e491 /chrome/common/service_process_util_unittest.cc | |
| parent | f27ddd7242a98b92750e8e25ed605a09db7417cf (diff) | |
| download | chromium_src-851beb59eeb2466b866744e0a7f829c8e60efaa2.zip chromium_src-851beb59eeb2466b866744e0a7f829c8e60efaa2.tar.gz chromium_src-851beb59eeb2466b866744e0a7f829c8e60efaa2.tar.bz2 | |
Mark ServiceProcessStateTest.ForceShutdown flaky on Linux.
BUG=84854
TEST=n/a
TBR=sanjeevr@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/service_process_util_unittest.cc')
| -rw-r--r-- | chrome/common/service_process_util_unittest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index d3a9b64..4f757fc 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -30,11 +30,16 @@ #endif #if defined(TOUCH_UI) -// This test fails http://crbug/84854 +// This test fails http://crbug.com/84854, and is very flaky on CrOS and +// somewhat flaky on other Linux. #define MAYBE_ForceShutdown FAILS_ForceShutdown #else +#if defined(OS_LINUX) +#define MAYBE_ForceShutdown FLAKY_ForceShutdown +#else #define MAYBE_ForceShutdown ForceShutdown #endif +#endif namespace { |