diff options
Diffstat (limited to 'chrome/common/logging_chrome_uitest.cc')
| -rw-r--r-- | chrome/common/logging_chrome_uitest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc index 8c87ff4..551fbd9 100644 --- a/chrome/common/logging_chrome_uitest.cc +++ b/chrome/common/logging_chrome_uitest.cc @@ -66,7 +66,8 @@ TEST_F(ChromeLoggingTest, EnvironmentLogFileName) { RestoreEnvironmentVariable(); } -#if defined(OS_LINUX) && (!defined(NDEBUG) || !defined(USE_LINUX_BREAKPAD)) +#if (defined(OS_LINUX) || defined(OS_ANDROID)) \ + && (!defined(NDEBUG) || !defined(USE_LINUX_BREAKPAD)) // On Linux in Debug mode, Chrome generates a SIGTRAP. // we do not catch SIGTRAPs, thus no crash dump. // This also does not work if Breakpad is disabled. @@ -149,7 +150,7 @@ class RendererCrashTest : public UITest { } }; -#if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD) +#if (defined(OS_LINUX) || defined(OS_ANDROID)) && !defined(USE_LINUX_BREAKPAD) // On Linux, do not expect a crash dump if Breakpad is disabled. #define EXPECTED_CRASH_CRASHES 0 #else |