chrome/common/logging_chrome_uitest.cc - Issue 9960072: Upstream crash changes for android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/logging_chrome_uitest.cc

Issue 9960072: Upstream crash changes for android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fixes to gyp and a typo in breakpad_linuxish.cc Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/common/logging_chrome_uitest.cc

diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc

index 8c87ff49a0e711d5e59bfe8274e3277c8fd71e1f..551fbd9428624e13e2a9b8605c7d637b6bbc60bc 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

« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »