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

Side by Side Diff: syzygy/integration_tests/integration_tests.gyp

Issue 2998593002: Separate the dependencies in the gyp file and use conditional inclusion. (Closed)
Patch Set: Response to reviewer comments. Created 3 years, 4 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 Google Inc. All Rights Reserved. 1 # Copyright 2013 Google Inc. All Rights Reserved.
2 # 2 #
3 # Licensed under the Apache License, Version 2.0 (the "License"); 3 # Licensed under the Apache License, Version 2.0 (the "License");
4 # you may not use this file except in compliance with the License. 4 # you may not use this file except in compliance with the License.
5 # You may obtain a copy of the License at 5 # You may obtain a copy of the License at
6 # 6 #
7 # http://www.apache.org/licenses/LICENSE-2.0 7 # http://www.apache.org/licenses/LICENSE-2.0
8 # 8 #
9 # Unless required by applicable law or agreed to in writing, software 9 # Unless required by applicable law or agreed to in writing, software
10 # distributed under the License is distributed on an "AS IS" BASIS, 10 # distributed under the License is distributed on an "AS IS" BASIS,
(...skipping 21 matching lines...) Expand all
32 'behavior_tests.h', 32 'behavior_tests.h',
33 'behavior_tests.cc', 33 'behavior_tests.cc',
34 'coverage_tests.h', 34 'coverage_tests.h',
35 'coverage_tests.cc', 35 'coverage_tests.cc',
36 'deferred_free_tests.h', 36 'deferred_free_tests.h',
37 'integration_tests_dll.def', 37 'integration_tests_dll.def',
38 'integration_tests_dll.h', 38 'integration_tests_dll.h',
39 'integration_tests_dll.rc', 39 'integration_tests_dll.rc',
40 'profile_tests.h', 40 'profile_tests.h',
41 'profile_tests.cc', 41 'profile_tests.cc',
42 ] 42 ],
43 }, 43 },
44 'targets': [ 44 'targets': [
45 { 45 {
46 'target_name': 'integration_tests', 46 'target_name': 'integration_tests',
47 'type': 'executable', 47 'type': 'executable',
48 'sources': [ 48 'sources': [
49 'integration_tests.rc', 49 'integration_tests.rc',
50 'instrument_integration_test.cc', 50 'instrument_integration_test.cc',
51 '<(src)/syzygy/testing/run_all_unittests.cc', 51 '<(src)/syzygy/testing/run_all_unittests.cc',
52 ], 52 ],
53 'dependencies': [ 53 'dependencies': [
54 'crash_for_exception_harness', 54 'crash_for_exception_harness',
55 'integration_tests_clang_dll', 55 'integration_tests_clang_dll',
56 'integration_tests_dll',
57 'integration_tests_harness', 56 'integration_tests_harness',
58 '<(src)/base/base.gyp:test_support_base', 57 '<(src)/base/base.gyp:test_support_base',
59 '<(src)/syzygy/agent/asan/asan.gyp:syzyasan_rtl', 58 '<(src)/syzygy/agent/asan/asan.gyp:syzyasan_rtl',
60 '<(src)/syzygy/agent/basic_block_entry/basic_block_entry.gyp:'
61 'basic_block_entry_client',
62 '<(src)/syzygy/agent/call_trace/call_trace.gyp:call_trace_client',
63 '<(src)/syzygy/agent/coverage/coverage.gyp:coverage_client',
64 '<(src)/syzygy/agent/profiler/profiler.gyp:profile_client',
65 '<(src)/syzygy/core/core.gyp:core_unittest_utils', 59 '<(src)/syzygy/core/core.gyp:core_unittest_utils',
66 '<(src)/syzygy/grinder/grinder.gyp:grinder_lib',
67 '<(src)/syzygy/instrument/instrument.gyp:instrument_lib',
68 '<(src)/syzygy/pe/pe.gyp:pe_unittest_utils',
69 '<(src)/syzygy/poirot/poirot.gyp:poirot_lib', 60 '<(src)/syzygy/poirot/poirot.gyp:poirot_lib',
70 '<(src)/syzygy/testing/testing.gyp:testing_lib', 61 '<(src)/syzygy/testing/testing.gyp:testing_lib',
62 '<(src)/syzygy/trace/parse/parse.gyp:parse_lib',
71 '<(src)/syzygy/trace/agent_logger/agent_logger.gyp:agent_logger', 63 '<(src)/syzygy/trace/agent_logger/agent_logger.gyp:agent_logger',
72 '<(src)/syzygy/trace/common/common.gyp:trace_unittest_utils',
73 '<(src)/syzygy/trace/service/service.gyp:call_trace_service_exe',
74 '<(src)/testing/gmock.gyp:gmock', 64 '<(src)/testing/gmock.gyp:gmock',
75 '<(src)/third_party/pcre/pcre.gyp:pcre_lib', 65 '<(src)/third_party/pcre/pcre.gyp:pcre_lib',
76 '<(src)/third_party/protobuf/protobuf.gyp:protobuf_lite_lib', 66 '<(src)/third_party/protobuf/protobuf.gyp:protobuf_lite_lib',
77 ], 67 ],
68 'conditions': [
69 ['target_arch == "ia32"', {
70 'dependencies': [
71 'integration_tests_dll',
72 '<(src)/syzygy/agent/basic_block_entry/basic_block_entry.gyp:'
73 'basic_block_entry_client',
74 '<(src)/syzygy/agent/call_trace/call_trace.gyp:call_trace_client',
75 '<(src)/syzygy/agent/coverage/coverage.gyp:coverage_client',
76 '<(src)/syzygy/agent/profiler/profiler.gyp:profile_client',
77 '<(src)/syzygy/grinder/grinder.gyp:grinder_lib',
78 '<(src)/syzygy/instrument/instrument.gyp:instrument_lib',
79 '<(src)/syzygy/pe/pe.gyp:pe_unittest_utils',
80 '<(src)/syzygy/trace/common/common.gyp:trace_unittest_utils',
81 '<(src)/syzygy/trace/service/service.gyp:call_trace_service_exe',
82 ],
83 }],
84 ],
78 'msvs_settings': { 85 'msvs_settings': {
79 'VCLinkerTool': { 86 'VCLinkerTool': {
80 # This test binary is initially compiled without large address 87 # This test binary is initially compiled without large address
81 # support. A second version of it that is LAA aware is created by 88 # support. A second version of it that is LAA aware is created by
82 # another build step. 89 # another build step.
83 'LargeAddressAware': 1, 90 'LargeAddressAware': 1,
84 }, 91 },
85 }, 92 },
86 'defines': [ 93 'defines': [
87 'SYZYGY_UNITTESTS_CHECK_MEMORY_MODEL=1', 94 'SYZYGY_UNITTESTS_CHECK_MEMORY_MODEL=1',
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 }, 218 },
212 }, 219 },
213 }, 220 },
214 { 221 {
215 'target_name': 'integration_tests_harness', 222 'target_name': 'integration_tests_harness',
216 'type': 'executable', 223 'type': 'executable',
217 'sources': [ 224 'sources': [
218 'integration_tests_harness.cc', 225 'integration_tests_harness.cc',
219 ], 226 ],
220 'dependencies': [ 227 'dependencies': [
221 'integration_tests_dll',
222 '<(src)/base/base.gyp:base', 228 '<(src)/base/base.gyp:base',
223 '<(src)/syzygy/common/common.gyp:common_lib', 229 '<(src)/syzygy/common/common.gyp:common_lib',
224 ], 230 ],
231 'conditions': [
232 ['target_arch == "ia32"', {
233 'dependencies': [
234 'integration_tests_dll',
235 ],
236 },
237 ],
238 ],
225 'msvs_settings': { 239 'msvs_settings': {
226 'VCLinkerTool': { 240 'VCLinkerTool': {
227 # Asan agent is compiled without large address spaces to allow a 241 # Asan agent is compiled without large address spaces to allow a
228 # memory optimization on the shadow memory. Agents should run in both 242 # memory optimization on the shadow memory. Agents should run in both
229 # modes, thus in the long term, we should remove this. 243 # modes, thus in the long term, we should remove this.
230 # Disable support for large address spaces. 244 # Disable support for large address spaces.
231 'LargeAddressAware': 1, 245 'LargeAddressAware': 1,
232 }, 246 },
233 }, 247 },
234 }, 248 },
235 { 249 {
236 'target_name': 'crash_for_exception_harness', 250 'target_name': 'crash_for_exception_harness',
237 'type': 'executable', 251 'type': 'executable',
238 'sources': [ 252 'sources': [
239 'crash_for_exception_export.cc', 253 'crash_for_exception_export.cc',
240 'integration_tests_harness.cc', 254 'integration_tests_harness.cc',
241 ], 255 ],
242 'dependencies': [ 256 'dependencies': [
243 'integration_tests_dll',
244 '<(src)/base/base.gyp:base', 257 '<(src)/base/base.gyp:base',
245 '<(src)/syzygy/agent/asan/asan.gyp:syzyasan_rtl_lib', 258 '<(src)/syzygy/agent/asan/asan.gyp:syzyasan_rtl_lib',
246 '<(src)/syzygy/common/common.gyp:common_lib', 259 '<(src)/syzygy/common/common.gyp:common_lib',
247 ], 260 ],
261 'conditions': [
262 ['target_arch == "ia32"', {
263 'dependencies': [
264 'integration_tests_dll',
265 ],
266 },
267 ],
268 ],
248 'msvs_settings': { 269 'msvs_settings': {
249 'VCLinkerTool': { 270 'VCLinkerTool': {
250 # Asan agent is compiled without large address spaces to allow a 271 # Asan agent is compiled without large address spaces to allow a
251 # memory optimization on the shadow memory. Agents should run in both 272 # memory optimization on the shadow memory. Agents should run in both
252 # modes, thus in the long term, we should remove this. 273 # modes, thus in the long term, we should remove this.
253 # Disable support for large address spaces. 274 # Disable support for large address spaces.
254 'LargeAddressAware': 1, 275 'LargeAddressAware': 1,
255 }, 276 },
256 }, 277 },
257 }, 278 },
258 ], 279 ],
259 } 280 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698