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

Unified Diff: base/test/trace_event_analyzer_unittest.cc

Issue 10690161: Make it possible to run gtests on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@presubmit_change
Patch Set: Created 8 years, 5 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
« base/test/test_suite.cc ('K') | « base/test/test_suite.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/trace_event_analyzer_unittest.cc
diff --git a/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc
index dd1ce4dd54c6de410149e1b8999939d112076f68..42f9b8e081f5a069b1b998131ea2a770956e3131 100644
--- a/base/test/trace_event_analyzer_unittest.cc
+++ b/base/test/trace_event_analyzer_unittest.cc
@@ -201,6 +201,9 @@ TEST_F(TraceEventAnalyzerTest, QueryEventMember) {
EXPECT_FALSE(event_has_other.Evaluate(other));
}
+#if defined(OS_IOS)
stuartmorgan 2012/07/12 09:36:31 Let's pull this file out of the CL; it's not conce
+#define BooleanOperators DISABLED_BooleanOperators
+#endif
TEST_F(TraceEventAnalyzerTest, BooleanOperators) {
ManualSetUp();
@@ -342,6 +345,9 @@ TEST_F(TraceEventAnalyzerTest, ArithmeticOperators) {
EXPECT_STREQ("math2", found.front()->name.c_str());
}
+#if defined(OS_IOS)
+#define StringPattern DISABLED_StringPattern
+#endif
TEST_F(TraceEventAnalyzerTest, StringPattern) {
ManualSetUp();
« base/test/test_suite.cc ('K') | « base/test/test_suite.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698