Move interactive_ui_tests target to !mac for now.

TBR=eroman

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

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

1 files changed, 126 insertions, 125 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index ed181af..28778f1 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3572,131 +3572,6 @@
       ],
     },
     {
-      'target_name': 'interactive_ui_tests',
-      'type': 'executable',
-      'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0',
-      'dependencies': [
-        'chrome',
-        'chrome_resources',
-        'chrome_strings',
-        'debugger',
-        'test_support_common',
-        'test_support_ui',
-        'third_party/hunspell/hunspell.gyp:hunspell',
-        '../net/net.gyp:net_resources',
-        '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/libpng/libpng.gyp:libpng',
-        '../third_party/libxml/libxml.gyp:libxml',
-        '../third_party/zlib/zlib.gyp:zlib',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/npapi/npapi.gyp:npapi',
-        # run time dependency
-        '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin',
-        '../webkit/webkit.gyp:webkit_resources',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'browser/browser_focus_uitest.cc',
-        'browser/debugger/devtools_sanity_unittest.cc',
-        'browser/views/bookmark_bar_view_test.cc',
-        'browser/blocked_popup_container_interactive_uitest.cc',
-        'browser/views/find_bar_win_interactive_uitest.cc',
-        'browser/views/tabs/tab_dragging_test.cc',
-        'test/interactive_ui/npapi_interactive_test.cc',
-        'test/interactive_ui/view_event_test_base.cc',
-        'test/interactive_ui/view_event_test_base.h',
-      ],
-      'conditions': [
-        ['OS=="linux"', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-          'sources!': [
-            # TODO(port)
-            'browser/debugger/devtools_sanity_unittest.cc',
-            'browser/views/bookmark_bar_view_test.cc',
-            'browser/blocked_popup_container_interactive_uitest.cc',
-            'browser/views/find_bar_win_interactive_uitest.cc',
-            'browser/views/tabs/tab_dragging_test.cc',
-            'test/interactive_ui/npapi_interactive_test.cc',
-            'test/interactive_ui/view_event_test_base.cc',
-            'test/interactive_ui/view_event_test_base.h',
-          ],
-        }],
-        ['OS=="linux" and toolkit_views==1', {
-          'dependencies': [
-            '../views/views.gyp:views',
-          ],
-        }],
-        ['OS=="mac"', {
-          'sources!': [
-            # TODO(port)
-            'browser/browser_focus_uitest.cc',
-            'browser/debugger/devtools_sanity_unittest.cc',
-            'browser/views/bookmark_bar_view_test.cc',
-            'browser/blocked_popup_container_interactive_uitest.cc',
-            'browser/views/find_bar_win_interactive_uitest.cc',
-            'browser/views/tabs/tab_dragging_test.cc',
-            'test/interactive_ui/npapi_interactive_test.cc',
-            'test/interactive_ui/view_event_test_base.cc',
-            'test/interactive_ui/view_event_test_base.h',
-          ],
-        }],
-        ['OS=="win"', {
-          'include_dirs': [
-            'third_party/wtl/include',
-          ],
-          'dependencies': [
-            'chrome_dll_version',
-            'crash_service',  # run time dependency
-            'installer/installer.gyp:installer_util_strings',
-            '../views/views.gyp:views',
-          ],
-          'sources': [
-            '../webkit/glue/resources/aliasb.cur',
-            '../webkit/glue/resources/cell.cur',
-            '../webkit/glue/resources/col_resize.cur',
-            '../webkit/glue/resources/copy.cur',
-            '../webkit/glue/resources/row_resize.cur',
-            '../webkit/glue/resources/vertical_text.cur',
-            '../webkit/glue/resources/zoom_in.cur',
-            '../webkit/glue/resources/zoom_out.cur',
-
-            'app/chrome_dll.rc',
-            'test/data/resource.rc',
-
-            # TODO:  It would be nice to have these pulled in
-            # automatically from direct_dependent_settings in
-            # their various targets (net.gyp:net_resources, etc.),
-            # but that causes errors in other targets when
-            # resulting .res files get referenced multiple times.
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
-
-            'tools/build/win/precompiled_wtl.h',
-            'tools/build/win/precompiled_wtl.cc',
-          ],
-          'configurations': {
-            'Debug': {
-              'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
-              'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                },
-              },
-            },
-          },
-        }],
-      ],
-    },
-    {
       'target_name': 'ui_tests',
       'type': 'executable',
       'msvs_guid': '76235B67-1C27-4627-8A33-4B2E1EF93EDE',
@@ -4922,6 +4797,132 @@
             }],
           ],
         },
+        # TODO: enable on mac.
+        {
+          'target_name': 'interactive_ui_tests',
+          'type': 'executable',
+          'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0',
+          'dependencies': [
+            'chrome',
+            'chrome_resources',
+            'chrome_strings',
+            'debugger',
+            'test_support_common',
+            'test_support_ui',
+            'third_party/hunspell/hunspell.gyp:hunspell',
+            '../net/net.gyp:net_resources',
+            '../skia/skia.gyp:skia',
+            '../third_party/icu38/icu38.gyp:icui18n',
+            '../third_party/libpng/libpng.gyp:libpng',
+            '../third_party/libxml/libxml.gyp:libxml',
+            '../third_party/zlib/zlib.gyp:zlib',
+            '../testing/gtest.gyp:gtest',
+            '../third_party/npapi/npapi.gyp:npapi',
+            # run time dependency
+            '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin',
+            '../webkit/webkit.gyp:webkit_resources',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'browser/browser_focus_uitest.cc',
+            'browser/debugger/devtools_sanity_unittest.cc',
+            'browser/views/bookmark_bar_view_test.cc',
+            'browser/blocked_popup_container_interactive_uitest.cc',
+            'browser/views/find_bar_win_interactive_uitest.cc',
+            'browser/views/tabs/tab_dragging_test.cc',
+            'test/interactive_ui/npapi_interactive_test.cc',
+            'test/interactive_ui/view_event_test_base.cc',
+            'test/interactive_ui/view_event_test_base.h',
+          ],
+          'conditions': [
+            ['OS=="linux"', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+              'sources!': [
+                # TODO(port)
+                'browser/debugger/devtools_sanity_unittest.cc',
+                'browser/views/bookmark_bar_view_test.cc',
+                'browser/blocked_popup_container_interactive_uitest.cc',
+                'browser/views/find_bar_win_interactive_uitest.cc',
+                'browser/views/tabs/tab_dragging_test.cc',
+                'test/interactive_ui/npapi_interactive_test.cc',
+                'test/interactive_ui/view_event_test_base.cc',
+                'test/interactive_ui/view_event_test_base.h',
+              ],
+            }],
+            ['OS=="linux" and toolkit_views==1', {
+              'dependencies': [
+                '../views/views.gyp:views',
+              ],
+            }],
+            ['OS=="mac"', {
+              'sources!': [
+                # TODO(port)
+                'browser/browser_focus_uitest.cc',
+                'browser/debugger/devtools_sanity_unittest.cc',
+                'browser/views/bookmark_bar_view_test.cc',
+                'browser/blocked_popup_container_interactive_uitest.cc',
+                'browser/views/find_bar_win_interactive_uitest.cc',
+                'browser/views/tabs/tab_dragging_test.cc',
+                'test/interactive_ui/npapi_interactive_test.cc',
+                'test/interactive_ui/view_event_test_base.cc',
+                'test/interactive_ui/view_event_test_base.h',
+              ],
+            }],
+            ['OS=="win"', {
+              'include_dirs': [
+                'third_party/wtl/include',
+              ],
+              'dependencies': [
+                'chrome_dll_version',
+                'crash_service',  # run time dependency
+                'installer/installer.gyp:installer_util_strings',
+                '../views/views.gyp:views',
+              ],
+              'sources': [
+                '../webkit/glue/resources/aliasb.cur',
+                '../webkit/glue/resources/cell.cur',
+                '../webkit/glue/resources/col_resize.cur',
+                '../webkit/glue/resources/copy.cur',
+                '../webkit/glue/resources/row_resize.cur',
+                '../webkit/glue/resources/vertical_text.cur',
+                '../webkit/glue/resources/zoom_in.cur',
+                '../webkit/glue/resources/zoom_out.cur',
+
+                'app/chrome_dll.rc',
+                'test/data/resource.rc',
+
+                # TODO:  It would be nice to have these pulled in
+                # automatically from direct_dependent_settings in
+                # their various targets (net.gyp:net_resources, etc.),
+                # but that causes errors in other targets when
+                # resulting .res files get referenced multiple times.
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
+
+                'tools/build/win/precompiled_wtl.h',
+                'tools/build/win/precompiled_wtl.cc',
+              ],
+              'configurations': {
+                'Debug': {
+                  'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+                  'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+                  'msvs_settings': {
+                    'VCLinkerTool': {
+                      'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                    },
+                  },
+                },
+              },
+            }],
+          ],
+        },
       ],
     }],  # OS!="mac"
     ['OS!="win"',