diff options
| author | petermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 01:44:39 +0000 |
|---|---|---|
| committer | petermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 01:44:39 +0000 |
| commit | 3e6836bee9c420588d99b8dca99f724f5cf5bc49 (patch) | |
| tree | 9035d25913be8c96df19a257cca20672184e3ea0 /chrome/common/service_process_util_unittest.cc | |
| parent | b08f83debbb9e9ed7a3d350ad46a56080c740158 (diff) | |
| download | chromium_src-3e6836bee9c420588d99b8dca99f724f5cf5bc49.zip chromium_src-3e6836bee9c420588d99b8dca99f724f5cf5bc49.tar.gz chromium_src-3e6836bee9c420588d99b8dca99f724f5cf5bc49.tar.bz2 | |
These tests fail in the touch environment, and we would like to queue fixing them behind keeping that build working as well as it does today.
BUG=84854, 84855
TEST=none
Review URL: http://codereview.chromium.org/7112013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88265 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 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index 89bd230..d3a9b64 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -29,6 +29,13 @@ #include <glib.h> #endif +#if defined(TOUCH_UI) +// This test fails http://crbug/84854 +#define MAYBE_ForceShutdown FAILS_ForceShutdown +#else +#define MAYBE_ForceShutdown ForceShutdown +#endif + namespace { bool g_good_shutdown = false; @@ -166,7 +173,7 @@ TEST_F(ServiceProcessStateTest, SharedMem) { ASSERT_EQ(base::GetCurrentProcId(), pid); } -TEST_F(ServiceProcessStateTest, ForceShutdown) { +TEST_F(ServiceProcessStateTest, MAYBE_ForceShutdown) { base::ProcessHandle handle = SpawnChild("ServiceProcessStateTestShutdown", true); ASSERT_TRUE(handle); |