Chromium Code Reviews

Side by Side Diff: build/all.gyp

Issue 7530002: Revert 94519 - Kill executable targets that are now folded into performance_ui_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'All', 8 'target_name': 'All',
9 'type': 'none', 9 'type': 'none',
10 'xcode_create_dependents_test_runner': 1, 10 'xcode_create_dependents_test_runner': 1,
(...skipping 245 matching lines...)
256 '../webkit/webkit.gyp:test_shell_common', 256 '../webkit/webkit.gyp:test_shell_common',
257 ], 257 ],
258 }], 258 }],
259 ], 259 ],
260 }, # target_name: chromium_2010_builder_tests 260 }, # target_name: chromium_2010_builder_tests
261 { 261 {
262 'target_name': 'chromium_builder_perf', 262 'target_name': 'chromium_builder_perf',
263 'type': 'none', 263 'type': 'none',
264 'dependencies': [ 264 'dependencies': [
265 'chromium_builder_qa', # needed for pyauto 265 'chromium_builder_qa', # needed for pyauto
266 '../chrome/chrome.gyp:memory_test',
267 '../chrome/chrome.gyp:page_cycler_tests',
266 '../chrome/chrome.gyp:performance_ui_tests', 268 '../chrome/chrome.gyp:performance_ui_tests',
267 '../chrome/chrome.gyp:plugin_tests', 269 '../chrome/chrome.gyp:plugin_tests',
270 '../chrome/chrome.gyp:startup_tests',
268 '../chrome/chrome.gyp:sync_performance_tests', 271 '../chrome/chrome.gyp:sync_performance_tests',
272 '../chrome/chrome.gyp:tab_switching_test',
273 '../chrome/chrome.gyp:ui_tests', # needed for dromaeo, sunspider, v8
274 '../chrome/chrome.gyp:url_fetch_test',
269 ], 275 ],
270 }, # target_name: chromium_builder_perf 276 }, # target_name: chromium_builder_perf
271 { 277 {
272 'target_name': 'chromium_gpu_builder', 278 'target_name': 'chromium_gpu_builder',
273 'type': 'none', 279 'type': 'none',
274 'dependencies': [ 280 'dependencies': [
275 '../chrome/chrome.gyp:gpu_tests', 281 '../chrome/chrome.gyp:gpu_tests',
276 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree' , 282 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree' ,
277 ], 283 ],
278 }, # target_name: chromium_gpu_builder 284 }, # target_name: chromium_gpu_builder
(...skipping 51 matching lines...)
330 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 336 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
331 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests', 337 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
332 'temp_gyp/googleurl.gyp:googleurl_unittests', 338 'temp_gyp/googleurl.gyp:googleurl_unittests',
333 ], 339 ],
334 }, 340 },
335 { 341 {
336 'target_name': 'chromium_builder_rel', 342 'target_name': 'chromium_builder_rel',
337 'type': 'none', 343 'type': 'none',
338 'dependencies': [ 344 'dependencies': [
339 '../chrome/chrome.gyp:browser_tests', 345 '../chrome/chrome.gyp:browser_tests',
340 '../chrome/chrome.gyp:performance_ui_tests', 346 '../chrome/chrome.gyp:memory_test',
341 '../chrome/chrome.gyp:nacl_ui_tests', 347 '../chrome/chrome.gyp:nacl_ui_tests',
342 '../chrome/chrome.gyp:nacl_sandbox_tests', 348 '../chrome/chrome.gyp:nacl_sandbox_tests',
349 '../chrome/chrome.gyp:page_cycler_tests',
343 '../chrome/chrome.gyp:plugin_tests', 350 '../chrome/chrome.gyp:plugin_tests',
344 '../chrome/chrome.gyp:safe_browsing_tests', 351 '../chrome/chrome.gyp:safe_browsing_tests',
352 '../chrome/chrome.gyp:startup_tests',
345 '../chrome/chrome.gyp:sync_integration_tests', 353 '../chrome/chrome.gyp:sync_integration_tests',
346 '../chrome/chrome.gyp:sync_unit_tests', 354 '../chrome/chrome.gyp:sync_unit_tests',
355 '../chrome/chrome.gyp:tab_switching_test',
347 '../chrome/chrome.gyp:ui_tests', 356 '../chrome/chrome.gyp:ui_tests',
348 '../chrome/chrome.gyp:unit_tests', 357 '../chrome/chrome.gyp:unit_tests',
358 '../chrome/chrome.gyp:url_fetch_test',
349 '../ui/ui.gyp:gfx_unittests', 359 '../ui/ui.gyp:gfx_unittests',
350 '../gpu/gpu.gyp:gpu_unittests', 360 '../gpu/gpu.gyp:gpu_unittests',
351 '../ipc/ipc.gyp:ipc_tests', 361 '../ipc/ipc.gyp:ipc_tests',
352 '../jingle/jingle.gyp:jingle_unittests', 362 '../jingle/jingle.gyp:jingle_unittests',
353 '../media/media.gyp:media_unittests', 363 '../media/media.gyp:media_unittests',
354 '../printing/printing.gyp:printing_unittests', 364 '../printing/printing.gyp:printing_unittests',
355 '../remoting/remoting.gyp:remoting_unittests', 365 '../remoting/remoting.gyp:remoting_unittests',
356 '../sql/sql.gyp:sql_unittests', 366 '../sql/sql.gyp:sql_unittests',
357 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 367 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
358 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests', 368 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
(...skipping 46 matching lines...)
405 'targets': [ 415 'targets': [
406 # These targets are here so the build bots can use them to build 416 # These targets are here so the build bots can use them to build
407 # subsets of a full tree for faster cycle times. 417 # subsets of a full tree for faster cycle times.
408 { 418 {
409 'target_name': 'chromium_builder', 419 'target_name': 'chromium_builder',
410 'type': 'none', 420 'type': 'none',
411 'dependencies': [ 421 'dependencies': [
412 '../chrome/chrome.gyp:browser_tests', 422 '../chrome/chrome.gyp:browser_tests',
413 '../chrome/chrome.gyp:installer_util_unittests', 423 '../chrome/chrome.gyp:installer_util_unittests',
414 '../chrome/chrome.gyp:interactive_ui_tests', 424 '../chrome/chrome.gyp:interactive_ui_tests',
425 '../chrome/chrome.gyp:memory_test',
415 '../chrome/chrome.gyp:mini_installer_test', 426 '../chrome/chrome.gyp:mini_installer_test',
416 '../chrome/chrome.gyp:nacl_ui_tests', 427 '../chrome/chrome.gyp:nacl_ui_tests',
417 '../chrome/chrome.gyp:nacl_sandbox_tests', 428 '../chrome/chrome.gyp:nacl_sandbox_tests',
429 '../chrome/chrome.gyp:page_cycler_tests',
418 '../chrome/chrome.gyp:performance_ui_tests', 430 '../chrome/chrome.gyp:performance_ui_tests',
419 '../chrome/chrome.gyp:plugin_tests', 431 '../chrome/chrome.gyp:plugin_tests',
420 '../chrome/chrome.gyp:safe_browsing_tests', 432 '../chrome/chrome.gyp:safe_browsing_tests',
421 '../chrome/chrome.gyp:selenium_tests', 433 '../chrome/chrome.gyp:selenium_tests',
434 '../chrome/chrome.gyp:startup_tests',
422 '../chrome/chrome.gyp:sync_integration_tests', 435 '../chrome/chrome.gyp:sync_integration_tests',
423 '../chrome/chrome.gyp:sync_unit_tests', 436 '../chrome/chrome.gyp:sync_unit_tests',
437 '../chrome/chrome.gyp:tab_switching_test',
424 '../chrome/chrome.gyp:ui_tests', 438 '../chrome/chrome.gyp:ui_tests',
425 '../chrome/chrome.gyp:unit_tests', 439 '../chrome/chrome.gyp:unit_tests',
440 '../chrome/chrome.gyp:url_fetch_test',
426 # mini_installer_tests depends on mini_installer. This should be 441 # mini_installer_tests depends on mini_installer. This should be
427 # defined in installer.gyp. 442 # defined in installer.gyp.
428 '../chrome/installer/mini_installer.gyp:mini_installer', 443 '../chrome/installer/mini_installer.gyp:mini_installer',
429 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', 444 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
430 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', 445 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
431 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', 446 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
432 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', 447 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
433 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', 448 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
434 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 449 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
435 '../courgette/courgette.gyp:courgette_unittests', 450 '../courgette/courgette.gyp:courgette_unittests',
(...skipping 97 matching lines...)
533 'sources': [ 548 'sources': [
534 # TODO(bradnelson): This is here to work around gyp issue 137. 549 # TODO(bradnelson): This is here to work around gyp issue 137.
535 # Remove this sources list when that issue has been fixed. 550 # Remove this sources list when that issue has been fixed.
536 'all.gyp', 551 'all.gyp',
537 ], 552 ],
538 'dependencies': [ 553 'dependencies': [
539 '../base/base.gyp:base_unittests', 554 '../base/base.gyp:base_unittests',
540 '../chrome/chrome.gyp:browser_tests', 555 '../chrome/chrome.gyp:browser_tests',
541 '../chrome/chrome.gyp:chrome', 556 '../chrome/chrome.gyp:chrome',
542 '../chrome/chrome.gyp:interactive_ui_tests', 557 '../chrome/chrome.gyp:interactive_ui_tests',
543 '../chrome/chrome.gyp:performance_ui_tests', 558 '../chrome/chrome.gyp:memory_test',
559 '../chrome/chrome.gyp:page_cycler_tests',
544 '../chrome/chrome.gyp:safe_browsing_tests', 560 '../chrome/chrome.gyp:safe_browsing_tests',
561 '../chrome/chrome.gyp:startup_tests',
545 '../chrome/chrome.gyp:sync_unit_tests', 562 '../chrome/chrome.gyp:sync_unit_tests',
546 '../chrome/chrome.gyp:sync_integration_tests', 563 '../chrome/chrome.gyp:sync_integration_tests',
564 '../chrome/chrome.gyp:tab_switching_test',
547 '../chrome/chrome.gyp:ui_tests', 565 '../chrome/chrome.gyp:ui_tests',
548 '../chrome/chrome.gyp:unit_tests', 566 '../chrome/chrome.gyp:unit_tests',
567 '../chrome/chrome.gyp:url_fetch_test',
549 '../crypto/crypto.gyp:crypto_unittests', 568 '../crypto/crypto.gyp:crypto_unittests',
550 '../ui/ui.gyp:gfx_unittests', 569 '../ui/ui.gyp:gfx_unittests',
551 '../ipc/ipc.gyp:ipc_tests', 570 '../ipc/ipc.gyp:ipc_tests',
552 '../jingle/jingle.gyp:jingle_unittests', 571 '../jingle/jingle.gyp:jingle_unittests',
553 '../media/media.gyp:ffmpeg_tests', 572 '../media/media.gyp:ffmpeg_tests',
554 '../media/media.gyp:media_unittests', 573 '../media/media.gyp:media_unittests',
555 '../net/net.gyp:net_unittests', 574 '../net/net.gyp:net_unittests',
556 '../printing/printing.gyp:printing_unittests', 575 '../printing/printing.gyp:printing_unittests',
557 '../remoting/remoting.gyp:remoting_unittests', 576 '../remoting/remoting.gyp:remoting_unittests',
558 '../sql/sql.gyp:sql_unittests', 577 '../sql/sql.gyp:sql_unittests',
559 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 578 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
560 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests', 579 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
561 '../views/views.gyp:views_unittests', 580 '../views/views.gyp:views_unittests',
562 'temp_gyp/googleurl.gyp:googleurl_unittests', 581 'temp_gyp/googleurl.gyp:googleurl_unittests',
563 ], 582 ],
564 }, 583 },
565 ], # targets 584 ], # targets
566 }], # "chromeos==1" 585 }], # "chromeos==1"
567 ], # conditions 586 ], # conditions
568 } 587 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine