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

Unified Diff: ash/test/ash_test_base.h

Issue 16539005: Skip mulitple-dispay tests on win8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again, and comment Created 7 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 | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index 2d9f71707e19fbf226bc539d7014c9f355ef8520..98115ad8ac5f7c72b187d2ff1d242e1f16afdf6d 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -95,6 +95,8 @@ class AshTestBase : public testing::Test {
aura::test::EventGenerator& GetEventGenerator();
protected:
+ static bool IsRunningOnWin8();
+
void RunAllPendingInMessageLoop();
// Utility methods to emulate user logged in or not, session started or not
@@ -120,6 +122,22 @@ class AshTestBase : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(AshTestBase);
};
+// Utility macros to skip the all or part of a test that fails on Win8 bots
robertshield 2013/06/10 21:13:58 ni: the all -> all
+// but passes on Win7 bots.
+// Please refer to crbug.com/247427 for more informatino about
robertshield 2013/06/10 21:13:58 nit: information
+// what type of tests should be skipped.
+#define RETURN_IF_WIN8 \
+ { \
+ if (IsRunningOnWin8()) \
+ return; \
+ }
+
+#define CONTINUE_IF_WIN8 \
+ { \
+ if (IsRunningOnWin8()) \
+ continue; \
+ }
+
} // namespace test
} // namespace ash
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698