Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Unified Diff: ui/views/controls/styled_label_unittest.cc

Issue 1925943002: Add views_unittests to Mac10.{9,9(dbg),10,11} and asan bots (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yipe - cater for r401862 and r401987 Created 4 years, 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/menu/menu_runner_unittest.cc ('k') | ui/views/controls/textfield/textfield_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/styled_label_unittest.cc
diff --git a/ui/views/controls/styled_label_unittest.cc b/ui/views/controls/styled_label_unittest.cc
index 057a3a56a1b654221aff1291db3404b308d4ee0e..a86a1d4f88a55c8d5410c0f71e65af2df6a32374 100644
--- a/ui/views/controls/styled_label_unittest.cc
+++ b/ui/views/controls/styled_label_unittest.cc
@@ -257,7 +257,13 @@ TEST_F(StyledLabelTest, MAYBE_StyledRangeUnderlined) {
static_cast<Label*>(styled()->child_at(1))->font_list().GetFontStyle());
}
-TEST_F(StyledLabelTest, StyledRangeBold) {
+// Fails on Mac, but only on 10.10. See http://crbug.com/622983.
+#if defined(OS_MACOSX)
+#define MAYBE_StyledRangeBold DISABLED_StyledRangeBold
+#else
+#define MAYBE_StyledRangeBold StyledRangeBold
+#endif
+TEST_F(StyledLabelTest, MAYBE_StyledRangeBold) {
const std::string bold_text(
"This is a block of text whose style will be set to BOLD in the test");
const std::string text(" normal text");
« no previous file with comments | « ui/views/controls/menu/menu_runner_unittest.cc ('k') | ui/views/controls/textfield/textfield_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698