diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 17:08:56 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 17:08:56 +0000 |
| commit | 9480d3341bd862dde25f6cea9b09e08c4f77db00 (patch) | |
| tree | e0f9b6567a56b024673e81e2205e142253c1459b /base/process | |
| parent | 3420a0fa11e47f4574be16c37412cb89574f669f (diff) | |
| download | chromium_src-9480d3341bd862dde25f6cea9b09e08c4f77db00.zip chromium_src-9480d3341bd862dde25f6cea9b09e08c4f77db00.tar.gz chromium_src-9480d3341bd862dde25f6cea9b09e08c4f77db00.tar.bz2 | |
Disable ProcessUtilTest.GetAppOutputRestrictedNoZombies under ASan on 64-bit OS X
BUG=298197
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/24742002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process')
| -rw-r--r-- | base/process/process_util_unittest.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/base/process/process_util_unittest.cc b/base/process/process_util_unittest.cc index 3e723a3..2f61ab5 100644 --- a/base/process/process_util_unittest.cc +++ b/base/process/process_util_unittest.cc @@ -769,7 +769,16 @@ TEST_F(ProcessUtilTest, GetAppOutputRestrictedSIGPIPE) { } #endif -TEST_F(ProcessUtilTest, GetAppOutputRestrictedNoZombies) { +#if defined(ADDRESS_SANITIZER) && defined(OS_MACOSX) && \ + defined(ARCH_CPU_64_BITS) +// Times out under AddressSanitizer on 64-bit OS X, see +// http://crbug.com/298197. +#define MAYBE_GetAppOutputRestrictedNoZombies \ + DISABLED_GetAppOutputRestrictedNoZombies +#else +#define MAYBE_GetAppOutputRestrictedNoZombies GetAppOutputRestrictedNoZombies +#endif +TEST_F(ProcessUtilTest, MAYBE_GetAppOutputRestrictedNoZombies) { std::vector<std::string> argv; argv.push_back(std::string(kShellPath)); // argv[0] |