summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sanity_uitest.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-12 20:58:05 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-12 20:58:05 +0000
commit2de7c6b08bcc47b7dcb98e8a7c229eb47decd7c4 (patch)
tree0b1a724084b4e25a9c45aeb53fd2ce4e0388e53c /chrome/browser/sanity_uitest.cc
parentc6ea5ca7921c95ef9084595b7c7cec4fdacbb241 (diff)
downloadchromium_src-2de7c6b08bcc47b7dcb98e8a7c229eb47decd7c4.zip
chromium_src-2de7c6b08bcc47b7dcb98e8a7c229eb47decd7c4.tar.gz
chromium_src-2de7c6b08bcc47b7dcb98e8a7c229eb47decd7c4.tar.bz2
Revert 88791 - Valgrind: Mark GoogleTest.Crash as flaky under Mac.
BUG=85863 TEST=none TBR=thestig Review URL: http://codereview.chromium.org/7046103 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/7104130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sanity_uitest.cc')
-rw-r--r--chrome/browser/sanity_uitest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/sanity_uitest.cc b/chrome/browser/sanity_uitest.cc
index aee4a13..cd02db2 100644
--- a/chrome/browser/sanity_uitest.cc
+++ b/chrome/browser/sanity_uitest.cc
@@ -21,13 +21,7 @@ class GoogleTest : public UITest {
}
};
-// Flakily fails under Valgrind, see http://crbug.com/85863.
-#if defined(OS_MACOSX)
-#define MAYBE_Crash FLAKY_Crash
-#elese
-#define MAYBE_Crash Crash
-#endif // defined(OS_MACOSX)
-TEST_F(GoogleTest, MAYBE_Crash) {
+TEST_F(GoogleTest, Crash) {
std::wstring page_title = L"Google";
// Make sure the navigation succeeded.