From 1be2be4e8a88b68e0491fc79a2eba9a2df6085c2 Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Wed, 3 Aug 2011 19:53:15 +0000 Subject: Kill executable targets that are now folded into performance_ui_tests. TBR=chase@chromium.org Originally reviewed at: http://codereview.chromium.org/7523032/ Review URL: http://codereview.chromium.org/7465102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95290 0039d316-1c4b-4281-b951-d872f2087c98 --- build/all.gyp | 23 +---- chrome/chrome_tests.gypi | 230 ----------------------------------------------- 2 files changed, 2 insertions(+), 251 deletions(-) diff --git a/build/all.gyp b/build/all.gyp index 005f575..5abaff1 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -265,15 +265,9 @@ '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:sync_performance_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 { @@ -345,19 +339,15 @@ 'type': 'none', 'dependencies': [ '../chrome/chrome.gyp:browser_tests', - '../chrome/chrome.gyp:memory_test', + '../chrome/chrome.gyp:performance_ui_tests', '../chrome/chrome.gyp:nacl_ui_tests', '../chrome/chrome.gyp:nacl_sandbox_tests', - '../chrome/chrome.gyp:page_cycler_tests', '../chrome/chrome.gyp:plugin_tests', '../chrome/chrome.gyp:safe_browsing_tests', - '../chrome/chrome.gyp:startup_tests', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:sync_unit_tests', - '../chrome/chrome.gyp:tab_switching_test', '../chrome/chrome.gyp:ui_tests', '../chrome/chrome.gyp:unit_tests', - '../chrome/chrome.gyp:url_fetch_test', '../ui/ui.gyp:gfx_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -424,22 +414,17 @@ '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:installer_util_unittests', '../chrome/chrome.gyp:interactive_ui_tests', - '../chrome/chrome.gyp:memory_test', '../chrome/chrome.gyp:mini_installer_test', '../chrome/chrome.gyp:nacl_ui_tests', '../chrome/chrome.gyp:nacl_sandbox_tests', - '../chrome/chrome.gyp:page_cycler_tests', '../chrome/chrome.gyp:performance_ui_tests', '../chrome/chrome.gyp:plugin_tests', '../chrome/chrome.gyp:safe_browsing_tests', '../chrome/chrome.gyp:selenium_tests', - '../chrome/chrome.gyp:startup_tests', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:sync_unit_tests', - '../chrome/chrome.gyp:tab_switching_test', '../chrome/chrome.gyp:ui_tests', '../chrome/chrome.gyp:unit_tests', - '../chrome/chrome.gyp:url_fetch_test', # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. '../chrome/installer/mini_installer.gyp:mini_installer', @@ -557,16 +542,12 @@ '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:chrome', '../chrome/chrome.gyp:interactive_ui_tests', - '../chrome/chrome.gyp:memory_test', - '../chrome/chrome.gyp:page_cycler_tests', + '../chrome/chrome.gyp:performance_ui_tests', '../chrome/chrome.gyp:safe_browsing_tests', - '../chrome/chrome.gyp:startup_tests', '../chrome/chrome.gyp:sync_unit_tests', '../chrome/chrome.gyp:sync_integration_tests', - '../chrome/chrome.gyp:tab_switching_test', '../chrome/chrome.gyp:ui_tests', '../chrome/chrome.gyp:unit_tests', - '../chrome/chrome.gyp:url_fetch_test', '../crypto/crypto.gyp:crypto_unittests', '../ui/ui.gyp:gfx_unittests', '../ipc/ipc.gyp:ipc_tests', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 6b1accd..42d7ecd 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -716,16 +716,12 @@ 'test/automation/extension_proxy_uitest.cc', 'test/automated_ui_tests/automated_ui_test_test.cc', 'test/base/chrome_process_util_uitest.cc', - 'test/ui/dom_checker_uitest.cc', # moving to performance_ui_tests - 'test/ui/dromaeo_benchmark_uitest.cc', 'test/ui/history_uitest.cc', 'test/ui/layout_plugin_uitest.cc', 'test/ui/named_interface_uitest.cc', 'test/ui/npapi_uitest.cc', 'test/ui/ppapi_uitest.cc', 'test/ui/sandbox_uitests.cc', - 'test/ui/sunspider_uitest.cc', - 'test/ui/v8_benchmark_uitest.cc', '../content/browser/appcache/appcache_ui_test.cc', '../content/browser/in_process_webkit/dom_storage_uitest.cc', '../content/browser/renderer_host/resource_dispatcher_host_uitest.cc', @@ -2932,85 +2928,6 @@ ], }, # target safe_browsing_tests { - # TODO(darin): Remove in favor of performance_ui_tests. - 'target_name': 'startup_tests', - 'type': 'executable', - 'dependencies': [ - 'chrome', - 'browser', - 'common', - 'chrome_resources', - 'chrome_strings', - 'test_support_ui', - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - ], - 'sources': [ - 'test/startup/feature_startup_test.cc', - 'test/startup/shutdown_test.cc', - 'test/startup/startup_test.cc', - ], - 'conditions': [ - ['OS=="win" and buildtype=="Official"', { - 'configurations': { - 'Release': { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WholeProgramOptimization': 'false', - }, - }, - }, - }, - },], - ['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', - ], - }], - ['OS=="win"', { - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], - 'configurations': { - 'Debug_Base': { - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', - }, - }, - }, - }, - },], - ['os_posix == 1 and OS != "mac"', { - 'conditions': [ - ['linux_use_tcmalloc==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], - ['toolkit_views==1', { - 'dependencies': [ - '../views/views.gyp:views', - ], - }], - ], - }, - { # To run the tests from page_load_test.cc on Linux, we need to: # # a) Build with Breakpad (GYP_DEFINES="linux_chromium_breakpad=1") @@ -3072,49 +2989,6 @@ ], }, { - # TODO(darin): Remove in favor of performance_ui_tests. - 'target_name': 'page_cycler_tests', - 'type': 'executable', - 'dependencies': [ - 'chrome', - 'chrome_resources', - 'chrome_strings', - 'debugger', - 'test_support_common', - 'test_support_ui', - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - ], - 'sources': [ - 'test/page_cycler/page_cycler_test.cc', - ], - 'conditions': [ - ['OS=="win" and buildtype=="Official"', { - 'configurations': { - 'Release': { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WholeProgramOptimization': 'false', - }, - }, - }, - }, - },], - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - ], - }], - ['toolkit_views==1', { - 'dependencies': [ - '../views/views.gyp:views', - ], - }], - ], - }, - { 'target_name': 'performance_ui_tests', 'type': 'executable', 'dependencies': [ @@ -3203,110 +3077,6 @@ ], }, { - # TODO(darin): Remove in favor of performance_ui_tests. - 'target_name': 'tab_switching_test', - 'type': 'executable', - 'run_as': { - 'action': ['$(TargetPath)', '--gtest_print_time'], - }, - 'dependencies': [ - 'chrome', - 'debugger', - 'test_support_common', - 'test_support_ui', - 'theme_resources', - 'theme_resources_standard', - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/tab_switching/tab_switching_test.cc', - ], - 'conditions': [ - ['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)', - ], - },], - ], - }, - { - # TODO(darin): Remove in favor of performance_ui_tests. - 'target_name': 'memory_test', - 'type': 'executable', - 'dependencies': [ - 'chrome', - 'debugger', - 'test_support_common', - 'test_support_ui', - 'theme_resources', - 'theme_resources_standard', - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/memory_test/memory_test.cc', - ], - 'conditions': [ - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - ], - }], - ], - }, - { - 'target_name': 'url_fetch_test', - 'type': 'executable', - 'dependencies': [ - 'chrome', - 'debugger', - 'test_support_common', - 'test_support_ui', - 'theme_resources', - 'theme_resources_standard', - '../base/base.gyp:base', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/url_fetch_test/url_fetch_test.cc', - ], - 'conditions': [ - ['OS=="win"', { - 'include_dirs': [ - '<(DEPTH)/third_party/wtl/include', - ], - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], - }], # OS="win" - ], # conditions - }, - { 'target_name': 'sync_unit_tests', 'type': 'executable', 'sources': [ -- cgit v1.1