summaryrefslogtreecommitdiffstats
path: root/chrome/test/page_cycler
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-17 18:14:38 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-17 18:14:38 +0000
commitad35d11fa8e27e5d0f882a56725c6950d248be15 (patch)
treee25136bf3eb22eb23dcf7be0bab87f66a34c954e /chrome/test/page_cycler
parent041645eb2baa02b7e2790887f786a53f529ff45b (diff)
downloadchromium_src-ad35d11fa8e27e5d0f882a56725c6950d248be15.zip
chromium_src-ad35d11fa8e27e5d0f882a56725c6950d248be15.tar.gz
chromium_src-ad35d11fa8e27e5d0f882a56725c6950d248be15.tar.bz2
Port page_cycler_http to Mac
Accompanying buildbot changes @ http://codereview.chromium.org/67234 Review URL: http://codereview.chromium.org/79017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/page_cycler')
-rw-r--r--chrome/test/page_cycler/page_cycler_test.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index 5d20457..a8826ee 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -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 @@ TEST_F(PageCyclerReferenceTest, MozFile) {
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(PageCyclerTest, DhtmlFile) {
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(PageCyclerTest, Intl2Http) {
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