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

Unified Diff: chrome/test/page_cycler/page_cycler_test.cc

Issue 79017: Port page_cycler_http to Mac (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/python/google/httpd_config/httpd2_mac.conf » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/page_cycler/page_cycler_test.cc
===================================================================
--- chrome/test/page_cycler/page_cycler_test.cc (revision 13925)
+++ chrome/test/page_cycler/page_cycler_test.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -263,11 +263,12 @@
RunTest("moz", false);
}
+// TODO(nirnimesh): Intl1File, Intl2File, Intl1Http, Intl2Http crash Chromium
+// on Mac. Revisit later.
TEST_F(PageCyclerTest, Intl1File) {
RunTest("intl1", false);
}
-// TODO(nirnimesh): Intl1File, Intl2File crash Chromium on Mac. Revisit later.
TEST_F(PageCyclerReferenceTest, Intl1File) {
RunTest("intl1", false);
}
@@ -299,12 +300,14 @@
TEST_F(PageCyclerReferenceTest, DhtmlFile) {
RunTest("dhtml", false);
}
+#endif
// http (localhost) tests
TEST_F(PageCyclerTest, MozHttp) {
RunTest("moz", true);
}
+#if !defined(OS_MACOSX)
TEST_F(PageCyclerReferenceTest, MozHttp) {
RunTest("moz", true);
}
@@ -324,22 +327,26 @@
TEST_F(PageCyclerReferenceTest, Intl2Http) {
RunTest("intl2", true);
}
+#endif // !defined(OS_MACOSX)
TEST_F(PageCyclerTest, DomHttp) {
RunTest("dom", true);
}
+#if !defined(OS_MACOSX)
TEST_F(PageCyclerReferenceTest, DomHttp) {
RunTest("dom", true);
}
+#endif
TEST_F(PageCyclerTest, BloatHttp) {
RunTest("bloat", true);
}
+#if !defined(OS_MACOSX)
TEST_F(PageCyclerReferenceTest, BloatHttp) {
RunTest("bloat", true);
}
-#endif // !defined(OS_MACOSX)
+#endif
} // namespace
« no previous file with comments | « no previous file | tools/python/google/httpd_config/httpd2_mac.conf » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698