Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: base/base.gyp

Issue 9621014: Separate xvfb.py logic into its own script (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | testing/test_env.py » ('j') | testing/xvfb.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 'target_name': 'base_unittests_run', 445 'target_name': 'base_unittests_run',
446 'type': 'none', 446 'type': 'none',
447 'dependencies': [ 447 'dependencies': [
448 'base_unittests', 448 'base_unittests',
449 ], 449 ],
450 'actions': [ 450 'actions': [
451 { 451 {
452 'action_name': 'isolate', 452 'action_name': 'isolate',
453 'inputs': [ 453 'inputs': [
454 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', 454 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
455 '<(PRODUCT_DIR)/xdisplaycheck',
456 '<(DEPTH)/testing/test_env.py',
457 '<(DEPTH)/testing/xvfb.py',
455 ], 458 ],
456 'conditions': [ 459 'conditions': [
457 ['OS != "mac" and OS != "win"', { 460 ['OS != "mac" and OS != "win"', {
458 'inputs': [ 461 'inputs': [
459 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 462 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
460 ], 463 ],
461 }], 464 }],
462 ['OS == "win"', { 465 ['OS == "win"', {
463 'inputs': [ 466 'inputs': [
464 'data/file_version_info_unittest/FileVersionInfoTest1.dll', 467 'data/file_version_info_unittest/FileVersionInfoTest1.dll',
(...skipping 10 matching lines...) Expand all
475 '--mode=<(tests_run)', 478 '--mode=<(tests_run)',
476 '--root', '<(DEPTH)', 479 '--root', '<(DEPTH)',
477 '--result', '<@(_outputs)', 480 '--result', '<@(_outputs)',
478 '<@(_inputs)', 481 '<@(_inputs)',
479 # Directories can't be tracked by build tools (make, msbuild, xcode, 482 # Directories can't be tracked by build tools (make, msbuild, xcode,
480 # etc) so we just put it on the command line without specifying it 483 # etc) so we just put it on the command line without specifying it
481 # as an input. 484 # as an input.
482 # TODO(maruel): Revisit the support for this at all and list each 485 # TODO(maruel): Revisit the support for this at all and list each
483 # individual test files instead. 486 # individual test files instead.
484 'data/file_util_unittest/', 487 'data/file_util_unittest/',
488 '--',
489 # Wraps base_unittests under xvfb.
490 '<(DEPTH)/testing/xvfb.py',
491 '<(PRODUCT_DIR)',
492 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
485 ], 493 ],
486 }, 494 },
487 ], 495 ],
488 }, 496 },
489 { 497 {
490 'target_name': 'test_support_perf', 498 'target_name': 'test_support_perf',
491 'type': 'static_library', 499 'type': 'static_library',
492 'dependencies': [ 500 'dependencies': [
493 'base', 501 'base',
494 '../testing/gtest.gyp:gtest', 502 '../testing/gtest.gyp:gtest',
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 # treated as weak imports in dependents, who still must 598 # treated as weak imports in dependents, who still must
591 # #include closure_blocks_leopard_compat.h to get weak imports. 599 # #include closure_blocks_leopard_compat.h to get weak imports.
592 'type': 'none', 600 'type': 'none',
593 }], 601 }],
594 ], 602 ],
595 }, 603 },
596 ], 604 ],
597 }], 605 }],
598 ], 606 ],
599 } 607 }
OLDNEW
« no previous file with comments | « no previous file | testing/test_env.py » ('j') | testing/xvfb.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698