diff -p -up chromium-14.0.794.0/build/all.gyp.skip-builder-tests chromium-14.0.794.0/build/all.gyp --- chromium-14.0.794.0/build/all.gyp.skip-builder-tests 2011-07-19 16:50:07.000000000 +0000 +++ chromium-14.0.794.0/build/all.gyp 2011-07-19 18:22:19.000000000 +0000 @@ -140,161 +140,6 @@ }], ], }, # target_name: All - { - 'target_name': 'chromium_builder_tests', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base_unittests', - '../chrome/chrome.gyp:browser_tests', - '../chrome/chrome.gyp:interactive_ui_tests', - '../chrome/chrome.gyp:nacl_ui_tests', - '../chrome/chrome.gyp:nacl_sandbox_tests', - '../chrome/chrome.gyp:safe_browsing_tests', - '../chrome/chrome.gyp:sync_integration_tests', - '../chrome/chrome.gyp:sync_unit_tests', - '../chrome/chrome.gyp:ui_tests', - '../chrome/chrome.gyp:unit_tests', - '../crypto/crypto.gyp:crypto_unittests', - '../ui/ui.gyp:gfx_unittests', - '../gpu/gpu.gyp:gpu_unittests', - '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support', - '../ipc/ipc.gyp:ipc_tests', - '../jingle/jingle.gyp:jingle_unittests', - '../media/media.gyp:media_unittests', - '../net/net.gyp:net_unittests', - '../printing/printing.gyp:printing_unittests', - '../remoting/remoting.gyp:remoting_unittests', - '../sql/sql.gyp:sql_unittests', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', - ], - 'conditions': [ - ['OS=="win"', { - 'dependencies': [ - '../chrome/chrome.gyp:installer_util_unittests', - '../chrome/chrome.gyp:mini_installer_test', - # mini_installer_tests depends on mini_installer. This should be - # defined in installer.gyp. - '../chrome/installer/mini_installer.gyp:mini_installer', - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - '../courgette/courgette.gyp:courgette_unittests', - '../sandbox/sandbox.gyp:sbox_integration_tests', - '../sandbox/sandbox.gyp:sbox_unittests', - '../sandbox/sandbox.gyp:sbox_validation_tests', - '../views/views.gyp:views_unittests', - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', - # TODO(nsylvain) ui_tests.exe depends on test_shell_common. - # This should: - # 1) not be the case. OR. - # 2) be expressed in the ui tests dependencies. - '../webkit/webkit.gyp:test_shell_common', - ], - }], - ], - }, # target_name: chromium_builder_tests - { - 'target_name': 'chromium_2010_builder_tests', - 'type': 'none', - 'dependencies': [ - '../chrome/chrome.gyp:chrome', - '../base/base.gyp:base_unittests', - '../chrome/chrome.gyp:browser_tests', - '../chrome/chrome.gyp:interactive_ui_tests', - # TODO(bradnelson): fix and enable. - #'../chrome/chrome.gyp:nacl_ui_tests', - #'../chrome/chrome.gyp:nacl_sandbox_tests', - '../chrome/chrome.gyp:safe_browsing_tests', - '../chrome/chrome.gyp:sync_integration_tests', - '../chrome/chrome.gyp:sync_unit_tests', - '../chrome/chrome.gyp:ui_tests', - '../chrome/chrome.gyp:unit_tests', - '../crypto/crypto.gyp:crypto_unittests', - '../ui/ui.gyp:gfx_unittests', - '../gpu/gpu.gyp:gpu_unittests', - '../ipc/ipc.gyp:ipc_tests', - '../jingle/jingle.gyp:jingle_unittests', - '../media/media.gyp:media_unittests', - '../net/net.gyp:net_unittests', - '../printing/printing.gyp:printing_unittests', - '../remoting/remoting.gyp:remoting_unittests', - '../sql/sql.gyp:sql_unittests', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', - ], - 'conditions': [ - ['OS=="win"', { - 'dependencies': [ - '../chrome/chrome.gyp:installer_util_unittests', - # TODO(bradnelson): fix and enable. - #'../chrome/chrome.gyp:mini_installer_test', - # mini_installer_tests depends on mini_installer. This should be - # defined in installer.gyp. - #'../chrome/installer/mini_installer.gyp:mini_installer', - #'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - #'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', - #'../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', - #'../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - #'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', - #'../chrome_frame/chrome_frame.gyp:npchrome_frame', - '../courgette/courgette.gyp:courgette_unittests', - '../sandbox/sandbox.gyp:sbox_integration_tests', - '../sandbox/sandbox.gyp:sbox_unittests', - '../sandbox/sandbox.gyp:sbox_validation_tests', - '../views/views.gyp:views_unittests', - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', - # TODO(nsylvain) ui_tests.exe depends on test_shell_common. - # This should: - # 1) not be the case. OR. - # 2) be expressed in the ui tests dependencies. - '../webkit/webkit.gyp:test_shell_common', - ], - }], - ], - }, # target_name: chromium_2010_builder_tests - { - 'target_name': 'chromium_builder_perf', - 'type': 'none', - 'dependencies': [ - 'chromium_builder_qa', # needed for pyauto - '../chrome/chrome.gyp:memory_test', - '../chrome/chrome.gyp:page_cycler_tests', - '../chrome/chrome.gyp:performance_ui_tests', - '../chrome/chrome.gyp:plugin_tests', - '../chrome/chrome.gyp:startup_tests', - '../chrome/chrome.gyp:tab_switching_test', - '../chrome/chrome.gyp:ui_tests', # needed for dromaeo, sunspider, v8 - '../chrome/chrome.gyp:url_fetch_test', - ], - }, # target_name: chromium_builder_perf - { - 'target_name': 'chromium_gpu_builder', - 'type': 'none', - 'dependencies': [ - '../chrome/chrome.gyp:gpu_tests', - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree', - ], - }, # target_name: chromium_gpu_builder - { - 'target_name': 'chromium_builder_qa', - 'type': 'none', - 'dependencies': [ - '../chrome/chrome.gyp:chromedriver', - ], - 'conditions': [ - ['OS=="mac" or OS=="win" or (os_posix==1 and target_arch==python_arch)', { - 'dependencies': [ - '../chrome/chrome.gyp:pyautolib', - ], - }], - ], - }, # target_name: chromium_builder_qa ], 'conditions': [ ['OS=="mac"', {