diff options
| -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] |