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

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: expectation logic fix 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
« no previous file with comments | « no previous file | base/base_unittests.isolate » ('j') | base/files/file_enumerator_win.cc » ('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 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 ], 761 ],
762 }, 762 },
763 ], 763 ],
764 ['OS == "win"', { 764 ['OS == "win"', {
765 'sources!': [ 765 'sources!': [
766 'file_descriptor_shuffle_unittest.cc', 766 'file_descriptor_shuffle_unittest.cc',
767 'files/dir_reader_posix_unittest.cc', 767 'files/dir_reader_posix_unittest.cc',
768 'message_loop/message_pump_libevent_unittest.cc', 768 'message_loop/message_pump_libevent_unittest.cc',
769 'threading/worker_pool_posix_unittest.cc', 769 'threading/worker_pool_posix_unittest.cc',
770 ], 770 ],
771 'dependencies': [
772 'pe_image_test',
773 ],
771 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 774 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
772 'msvs_disabled_warnings': [ 775 'msvs_disabled_warnings': [
773 4267, 776 4267,
774 ], 777 ],
775 'conditions': [ 778 'conditions': [
776 # This is needed so base_unittests uses the allocator shim, as 779 # This is needed so base_unittests uses the allocator shim, as
777 # SecurityTest.MemoryAllocationRestriction* tests are dependent 780 # SecurityTest.MemoryAllocationRestriction* tests are dependent
778 # on tcmalloc. 781 # on tcmalloc.
779 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into 782 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
780 # their own test suite. 783 # their own test suite.
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1529 'type': 'executable', 1532 'type': 'executable',
1530 'sources': [ 1533 'sources': [
1531 'debug_message.cc', 1534 'debug_message.cc',
1532 ], 1535 ],
1533 'msvs_settings': { 1536 'msvs_settings': {
1534 'VCLinkerTool': { 1537 'VCLinkerTool': {
1535 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1538 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1536 }, 1539 },
1537 }, 1540 },
1538 }, 1541 },
1542 {
1543 'target_name': 'pe_image_test',
rvargas (doing something else) 2015/02/24 01:52:20 build.gn?
Will Harris 2015/02/24 19:00:28 Done.
1544 'type': 'shared_library',
1545 'sources': [
1546 'win/pe_image_test.cc',
1547 ],
1548 'msvs_settings': {
1549 'VCLinkerTool': {
1550 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1551 'DelayLoadDLLs': [
1552 'user32.dll',
1553 ],
1554 },
1555 },
1556 },
1539 ], 1557 ],
1540 }], 1558 }],
1541 ['test_isolation_mode != "noop"', { 1559 ['test_isolation_mode != "noop"', {
1542 'targets': [ 1560 'targets': [
1543 { 1561 {
1544 'target_name': 'base_unittests_run', 1562 'target_name': 'base_unittests_run',
1545 'type': 'none', 1563 'type': 'none',
1546 'dependencies': [ 1564 'dependencies': [
1547 'base_unittests', 1565 'base_unittests',
1548 ], 1566 ],
1549 'includes': [ 1567 'includes': [
1550 '../build/isolate.gypi', 1568 '../build/isolate.gypi',
1551 ], 1569 ],
1552 'sources': [ 1570 'sources': [
1553 'base_unittests.isolate', 1571 'base_unittests.isolate',
1554 ], 1572 ],
1555 'conditions': [ 1573 'conditions': [
1556 ['use_x11 == 1', { 1574 ['use_x11 == 1', {
1557 'dependencies': [ 1575 'dependencies': [
1558 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1576 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1559 ], 1577 ],
1560 }], 1578 }],
1561 ], 1579 ],
1562 }, 1580 },
1563 ], 1581 ],
1564 }], 1582 }],
1565 ], 1583 ],
1566 } 1584 }
OLDNEW
« no previous file with comments | « no previous file | base/base_unittests.isolate » ('j') | base/files/file_enumerator_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698