Get the first set of page_cycler_tests working on Mac. This means: MozFile,

DomFile and DhtmlFile corpus sets. Not enabling Intl1File, Intl2File yet coz
they crash Chromium.

Not enabling PageCyclerReferenceTest yet coz we don't yet have a reference
build.


Review URL: http://codereview.chromium.org/67127

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13677 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 41 insertions, 30 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 3678f1c..f914877 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -11,7 +11,7 @@
   ],
   'target_defaults': {
     'sources/': [
-      ['exclude', '/(cocoa|gtk)/'],
+      ['exclude', '/(cocoa|gtk|win)/'],
       ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|x)\\.(cc|mm?)$'],
       ['exclude', '/(win|x11)_[^/]*\\.cc$'],
     ],
@@ -31,6 +31,7 @@
       }],
       ['OS=="win"', {'sources/': [
         ['include', '_(win)\\.cc$'],
+        ['include', '/win/'],
         ['include', '/win_[^/]*\\.cc$'],
       ]}],
     ],
@@ -2390,6 +2391,34 @@
         }],
       ],
     },
+    {
+      'target_name': 'page_cycler_tests',
+      'type': 'executable',
+      'dependencies': [
+        'resources',
+        'test_support_ui',
+        '../base/base.gyp:base',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'sources': [
+        'test/page_cycler/page_cycler_test.cc',
+        'tools/build/win/precompiled.cc',
+        'tools/build/win/precompiled.h',
+      ],
+      'conditions': [
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+        ['OS!="mac"', {
+          'dependencies': [
+            'views',
+          ],
+        }],
+      ],
+    },
   ],
   'conditions': [
     ['OS=="linux"', {
@@ -2449,34 +2478,6 @@
     }, { # else: OS != "mac"
       'targets': [
         {
-          'target_name': 'page_cycler_tests',
-          'type': 'executable',
-          'dependencies': [
-            'resources',
-            'test_support_ui',
-            'views',
-            '../base/base.gyp:base',
-            '../skia/skia.gyp:skia',
-            '../testing/gtest.gyp:gtest',
-          ],
-          'sources': [
-            'test/page_cycler/page_cycler_test.cc',
-            'tools/build/win/precompiled.cc',
-            'tools/build/win/precompiled.h',
-          ],
-          'conditions': [
-            ['OS!="win"', {
-              'dependencies': [
-                '../build/linux/system.gyp:gtk',
-              ],
-              'sources!': [
-                'tools/build/win/precompiled.cc',
-                'tools/build/win/precompiled.h',
-              ],
-            }],
-          ],
-        },
-        {
           'target_name': 'perf_tests',
           'type': 'executable',
           'dependencies': [
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index 91708cf..5d20457 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -250,13 +250,15 @@ class PageCyclerReferenceTest : public PageCyclerTest {
   }
 };
 
-}  // namespace
 
 // file-URL tests
 TEST_F(PageCyclerTest, MozFile) {
   RunTest("moz", false);
 }
 
+// TODO(port): Enable PageCyclerReferenceTest when reference build is
+// available for non-windows
+#if !defined(OS_MACOSX)
 TEST_F(PageCyclerReferenceTest, MozFile) {
   RunTest("moz", false);
 }
@@ -265,6 +267,7 @@ TEST_F(PageCyclerTest, Intl1File) {
   RunTest("intl1", false);
 }
 
+// TODO(nirnimesh): Intl1File, Intl2File crash Chromium on Mac. Revisit later.
 TEST_F(PageCyclerReferenceTest, Intl1File) {
   RunTest("intl1", false);
 }
@@ -276,19 +279,23 @@ TEST_F(PageCyclerTest, Intl2File) {
 TEST_F(PageCyclerReferenceTest, Intl2File) {
   RunTest("intl2", false);
 }
+#endif  // !defined(OS_MACOSX)
 
 TEST_F(PageCyclerTest, DomFile) {
   RunTest("dom", false);
 }
 
+#if !defined(OS_MACOSX)
 TEST_F(PageCyclerReferenceTest, DomFile) {
   RunTest("dom", false);
 }
+#endif
 
 TEST_F(PageCyclerTest, DhtmlFile) {
   RunTest("dhtml", false);
 }
 
+#if !defined(OS_MACOSX)
 TEST_F(PageCyclerReferenceTest, DhtmlFile) {
   RunTest("dhtml", false);
 }
@@ -333,3 +340,6 @@ TEST_F(PageCyclerTest, BloatHttp) {
 TEST_F(PageCyclerReferenceTest, BloatHttp) {
   RunTest("bloat", true);
 }
+#endif  // !defined(OS_MACOSX)
+
+}  // namespace