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

Side by Side Diff: base/base.gyp

Issue 946183002: Add base_unittests to win8 trybot. Fix PEImage tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: namespace the callbacks Created 5 years, 10 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
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 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 ], 762 ],
763 }, 763 },
764 ], 764 ],
765 ['OS == "win"', { 765 ['OS == "win"', {
766 'sources!': [ 766 'sources!': [
767 'file_descriptor_shuffle_unittest.cc', 767 'file_descriptor_shuffle_unittest.cc',
768 'files/dir_reader_posix_unittest.cc', 768 'files/dir_reader_posix_unittest.cc',
769 'message_loop/message_pump_libevent_unittest.cc', 769 'message_loop/message_pump_libevent_unittest.cc',
770 'threading/worker_pool_posix_unittest.cc', 770 'threading/worker_pool_posix_unittest.cc',
771 ], 771 ],
772 'dependencies': [
773 'pe_image_test',
774 ],
772 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 775 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
773 'msvs_disabled_warnings': [ 776 'msvs_disabled_warnings': [
774 4267, 777 4267,
775 ], 778 ],
776 'conditions': [ 779 'conditions': [
777 # This is needed so base_unittests uses the allocator shim, as 780 # This is needed so base_unittests uses the allocator shim, as
778 # SecurityTest.MemoryAllocationRestriction* tests are dependent 781 # SecurityTest.MemoryAllocationRestriction* tests are dependent
779 # on tcmalloc. 782 # on tcmalloc.
780 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into 783 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
781 # their own test suite. 784 # their own test suite.
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
1531 'type': 'executable', 1534 'type': 'executable',
1532 'sources': [ 1535 'sources': [
1533 'debug_message.cc', 1536 'debug_message.cc',
1534 ], 1537 ],
1535 'msvs_settings': { 1538 'msvs_settings': {
1536 'VCLinkerTool': { 1539 'VCLinkerTool': {
1537 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1540 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1538 }, 1541 },
1539 }, 1542 },
1540 }, 1543 },
1544 {
1545 'target_name': 'pe_image_test',
1546 'type': 'shared_library',
1547 'sources': [
1548 'win/pe_image_test.cc',
1549 ],
1550 'msvs_settings': {
1551 'VCLinkerTool': {
1552 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1553 'DelayLoadDLLs': [
1554 'cfgmgr32.dll',
1555 'shell32.dll',
1556 ],
1557 'AdditionalDependencies': [
1558 'cfgmgr32.lib',
1559 'shell32.lib',
1560 ],
1561 },
1562 },
1563 },
1541 ], 1564 ],
1542 }], 1565 }],
1543 ['test_isolation_mode != "noop"', { 1566 ['test_isolation_mode != "noop"', {
1544 'targets': [ 1567 'targets': [
1545 { 1568 {
1546 'target_name': 'base_unittests_run', 1569 'target_name': 'base_unittests_run',
1547 'type': 'none', 1570 'type': 'none',
1548 'dependencies': [ 1571 'dependencies': [
1549 'base_unittests', 1572 'base_unittests',
1550 ], 1573 ],
1551 'includes': [ 1574 'includes': [
1552 '../build/isolate.gypi', 1575 '../build/isolate.gypi',
1553 ], 1576 ],
1554 'sources': [ 1577 'sources': [
1555 'base_unittests.isolate', 1578 'base_unittests.isolate',
1556 ], 1579 ],
1557 'conditions': [ 1580 'conditions': [
1558 ['use_x11 == 1', { 1581 ['use_x11 == 1', {
1559 'dependencies': [ 1582 'dependencies': [
1560 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1583 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1561 ], 1584 ],
1562 }], 1585 }],
1563 ], 1586 ],
1564 }, 1587 },
1565 ], 1588 ],
1566 }], 1589 }],
1567 ], 1590 ],
1568 } 1591 }
OLDNEW
« no previous file with comments | « base/BUILD.gn ('k') | base/base_unittests.isolate » ('j') | base/win/pe_image_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698