Make the gyp files more cross-platform across the Unices

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 190 matching lines @@
         '../content/common/notification_observer_mock.h',
         '../ui/gfx/image_unittest_util.h',
         '../ui/gfx/image_unittest_util.cc',
       ],
       'conditions': [
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
         }],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
         }],
@@ skipping 34 matching lines @@
         'test/ui/ui_test.h',
         'test/ui/ui_test_suite.cc',
         'test/ui/ui_test_suite.h',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
             'chrome.gyp:crash_service',  # run time dependency
           ],
         }],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
       ],
     },
     {
       'target_name': 'test_support_sync',
       'type': '<(library)',
       'dependencies': [
@@ skipping 64 matching lines @@
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/unit/run_all_unittests.cc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # Needed for the following #include chain:
             #   test/unit/run_all_unittests.cc
             #   test/unit/chrome_test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
         }],
       ],
     },
@@ skipping 26 matching lines @@
           'configurations': {
             'Release': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'WholeProgramOptimization': 'false',
                 },
               },
             },
           },
         },],
-        ['OS=="linux"', {
+        ['use_x11 == 1', {
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
@@ skipping 53 matching lines @@
         'test/interactive_ui/infobars_uitest.cc',
         'test/interactive_ui/keyboard_access_uitest.cc',
         'test/interactive_ui/mouseleave_interactive_uitest.cc',
         'test/interactive_ui/npapi_interactive_test.cc',
         'test/interactive_ui/view_event_test_base.cc',
         'test/interactive_ui/view_event_test_base.h',
         'test/out_of_proc_test_runner.cc',
         'test/unit/chrome_test_suite.h',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['OS=="linux" and toolkit_views==0', {
+        ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
           'sources!': [
             # TODO(port)
             'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
             'browser/ui/views/menu_item_view_test.cc',
             'browser/ui/views/tabs/tab_dragging_test.cc',
             'browser/ui/views/tabs/tab_strip_interactive_uitest.cc',
             'test/interactive_ui/npapi_interactive_test.cc',
             'test/interactive_ui/view_event_test_base.cc',
             'test/interactive_ui/view_event_test_base.h',
@@ skipping 183 matching lines @@
         '../content/browser/in_process_webkit/dom_storage_uitest.cc',
         '../content/browser/renderer_host/resource_dispatcher_host_uitest.cc',
         '../content/worker/worker_uitest.cc',
       ],
       'conditions': [
         ['target_arch!="arm"', {
           'dependencies': [
             '../webkit/webkit.gyp:copy_npapi_test_plugin',
           ],
         }],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
-        }, { # else: OS != "linux"
+        }, { # else: toolkit_uses_gtk != 1
           'sources!': [
             'browser/process_singleton_linux_uitest.cc',
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
         ['OS=="mac"', {
@@ skipping 40 matching lines @@
           'sources!': [
             # TODO(dtu): port to windows http://crosbug.com/8515
             'test/ui/named_interface_uitest.cc',
           ],
         }, { # else: OS != "win"
           'sources!': [
             # TODO(port): http://crbug.com/45770
             'browser/printing/printing_layout_uitest.cc',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['chromeos==1', {
           'sources!': [
@@ skipping 97 matching lines @@
         'test/webdriver/commands/title_command.h',
         'test/webdriver/commands/title_command.cc',
         'test/webdriver/commands/url_command.h',
         'test/webdriver/commands/url_command.cc',
         'test/webdriver/commands/webdriver_command.h',
         'test/webdriver/commands/webdriver_command.cc',
         'test/webdriver/commands/webelement_commands.h',
         'test/webdriver/commands/webelement_commands.cc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="linux" and toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],
     },
@@ skipping 128 matching lines @@
         ['OS=="win"', {
           'sources': [
             '../sandbox/tests/validation_tests/commands.cc',
             '../sandbox/tests/validation_tests/commands.h',
             '../sandbox/tests/common/controller.h',
             'test/nacl_security_tests/nacl_security_tests_win.h',
             'test/nacl_security_tests/nacl_security_tests_win.cc',
           ],
         },],
         # Set fPIC in case it isn't set.
-        ['(OS=="linux" or OS=="openbsd" or OS=="freebsd" or OS=="solaris")'
+        ['os_posix == 1 and OS != "mac"'
          'and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
           'cflags': ['-fPIC'],
         },],
       ],
     },
     {
       'target_name': 'nacl_sandbox_tests',
       'type': 'executable',
       'msvs_guid': '3087FC25-2C24-44B2-8253-44065EB47ACD',
       'dependencies': [
@@ skipping 949 matching lines @@
             ['exclude', 'browser/ui/webui/print_preview_ui_html_source_unittest.cc'],
           ],
         }, { # else: chromeos == 0
           'sources/': [
             ['exclude', '^browser/chromeos/'],
             ['exclude', '^browser/policy/device_policy_cache_unittest.cc'],
             ['exclude', '^browser/policy/enterprise_install_attributes_unittest.cc' ],
             ['exclude', '^browser/ui/webui/chromeos/login'],
           ],
         }],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'conditions': [
             ['selinux==0', {
               'dependencies': [
                 '../sandbox/sandbox.gyp:*',
               ],
             }],
             ['toolkit_views==1', {
               'sources!': [
                  'browser/autocomplete/autocomplete_popup_view_gtk_unittest.cc',
                  'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
                  'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
                  'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
                  'browser/ui/gtk/gtk_expanded_container_unittest.cc',
                  'browser/ui/gtk/gtk_theme_service_unittest.cc',
                  'browser/ui/gtk/options/cookies_view_unittest.cc',
                  'browser/ui/gtk/options/languages_page_gtk_unittest.cc',
                  'browser/ui/gtk/reload_button_gtk_unittest.cc',
                  'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
               ],
             }],
           ],
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources!': [
             'browser/printing/print_job_unittest.cc',
           ],
-        }, { # else: OS != "linux"
+        }, { # else: toolkit_uses_gtk != 1
           'sources!': [
             'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
             'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
             '../views/focus/accelerator_handler_gtk_unittest.cc',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['OS=="mac"', {
            # The test fetches resources which means Mac need the app bundle to
@@ skipping 496 matching lines @@
             'app/chrome_command_ids.h',
             'app/chrome_dll.rc',
             'app/chrome_dll_resource.h',
             'app/chrome_dll_version.rc.version',
             'browser/extensions/extension_rlz_apitest.cc',
             # http://crbug.com/15101 These tests fail on Linux and Mac.
             'browser/renderer_host/web_cache_manager_browsertest.cc',
             '../content/browser/child_process_security_policy_browsertest.cc',
           ],
         }],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources': [
             # TODO(estade): port to win/mac.
             'browser/ui/webui/constrained_html_ui_browsertest.cc',
           ],
         }],
@@ skipping 17 matching lines @@
           ],
           'sources': [
             'browser/spellcheck_message_filter_browsertest.cc',
             '../content/renderer/external_popup_menu_unittest.cc',
           ],
         }, { # else: OS != "mac"
           'sources!': [
             'browser/extensions/browser_action_test_util_mac.mm',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
@@ skipping 112 matching lines @@
           'configurations': {
             'Release': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'WholeProgramOptimization': 'false',
                 },
               },
             },
           },
         },],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
             '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
@@ skipping 10 matching lines @@
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         },],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
@@ skipping 50 matching lines @@
           'configurations': {
             'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         },],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         },],
       ],
     },
     {
       'target_name': 'page_cycler_tests',
       'type': 'executable',
       'msvs_guid': 'C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7',
@@ skipping 16 matching lines @@
           'configurations': {
             'Release': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'WholeProgramOptimization': 'false',
                 },
               },
             },
           },
         },],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
@@ skipping 17 matching lines @@
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/tab_switching/tab_switching_test.cc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '<(allocator_target)',
           ],
         },],
@@ skipping 14 matching lines @@
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/memory_test/memory_test.cc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
       ],
     },
     {
       'target_name': 'url_fetch_test',
       'type': 'executable',
@@ skipping 145 matching lines @@
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         }, { # else: OS != "win"
           'sources!': [
             'browser/sync/util/data_encryption_unittest.cc',
           ],
         }],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             'packed_resources'
           ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
@@ skipping 103 matching lines @@
         'test/live_sync/two_client_live_themes_sync_test.cc',
         'test/live_sync/two_client_live_typed_urls_sync_test.cc',
         'test/test_notification_tracker.cc',
         'test/test_notification_tracker.h',
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.mm',
         'test/ui_test_utils_win.cc',
         'test/data/resource.rc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
            ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
             '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
@@ skipping 127 matching lines @@
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
             '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
           # See comments about "xcode_settings" elsewhere in this file.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
         }],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
            ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
@@ skipping 114 matching lines @@
             '../webkit/support/webkit_support.gyp:glue',
           ],
           'sources': [
             'browser/safe_browsing/filter_false_positive_perftest.cc',
             'browser/visitedlink/visitedlink_perftest.cc',
             'common/json_value_serializer_perftest.cc',
             'test/perf/perftests.cc',
             'test/perf/url_parse_perftest.cc',
           ],
           'conditions': [
-            ['OS=="linux"', {
+            ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
               'sources!': [
                 # TODO(port):
                 'browser/safe_browsing/filter_false_positive_perftest.cc',
               ],
             }],
             ['OS=="win"', {
@@ skipping 135 matching lines @@
               'dependencies': [
                 '<(allocator_target)',
               ],
             },],
           ],
         },
       ]},  # 'targets'
     ],  # OS=="win"
     # If you change this condition, make sure you also change it in all.gyp
     # for the chromium_builder_qa target.
-    ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch==python_arch)', {
+    ['OS == "mac" or OS == "win" or (os_posix == 1 and target_arch == python_arch)', {
       'targets': [
         {
           # Documentation: http://dev.chromium.org/developers/testing/pyauto
           'target_name': 'pyautolib',
           'type': 'shared_library',
           'product_prefix': '_',
           'dependencies': [
             'chrome',
             'debugger',
             'syncapi',
@@ skipping 31 matching lines @@
             # that xcode would generate)
             # Change when gyp can support a platform-neutral way for this
             # (http://code.google.com/p/gyp/issues/detail?id=135)
             'EXECUTABLE_EXTENSION': 'so',
             # When generated, pyautolib_wrap.cc includes some swig support
             # files which, as of swig 1.3.31 that comes with 10.5 and 10.6,
             # may not compile cleanly at -Wall.
             'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',  # -Wno-error
           },
           'conditions': [
-            ['OS=="linux"', {
+            ['os_posix == 1 and OS!=="mac"', {

[tony, 2011/05/19 17:03:37]

The trybots were complaining about this !==.  I've patched it in a local
checkout and I'm running through the try bots now.

               'include_dirs': [
                 '..',
                 '<(sysroot)/usr/include/python<(python_ver)',
               ],
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],
               'link_settings': {
                 'libraries': [
                   '-lpython<(python_ver)',
@@ skipping 254 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: