Revert 94519 - Kill executable targets that are now folded into performance_ui_tests.

build/all.gyp

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 245 matching lines @@
             '../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: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
     {
       '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
@@ skipping 51 matching lines @@
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
         },
         {
           'target_name': 'chromium_builder_rel',
           'type': 'none',
           'dependencies': [
             '../chrome/chrome.gyp:browser_tests',
-            '../chrome/chrome.gyp:performance_ui_tests',
+            '../chrome/chrome.gyp:memory_test',
             '../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',
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/media.gyp:media_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',
@@ skipping 46 matching lines @@
       'targets': [
         # These targets are here so the build bots can use them to build
         # subsets of a full tree for faster cycle times.
         {
           'target_name': 'chromium_builder',
           'type': 'none',
           'dependencies': [
             '../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',
             '../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',
@@ skipping 97 matching lines @@
           'sources': [
             # TODO(bradnelson): This is here to work around gyp issue 137.
             #     Remove this sources list when that issue has been fixed.
             'all.gyp',
           ],
           'dependencies': [
             '../base/base.gyp:base_unittests',
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:chrome',
             '../chrome/chrome.gyp:interactive_ui_tests',
-            '../chrome/chrome.gyp:performance_ui_tests',
+            '../chrome/chrome.gyp:memory_test',
+            '../chrome/chrome.gyp:page_cycler_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',
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/media.gyp:ffmpeg_tests',
             '../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',
             '../views/views.gyp:views_unittests',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
         },
       ],  # targets
     }], # "chromeos==1"
   ], # conditions
 }