Chromium Code Reviews| Index: Source/heap/blink_heap_tests.gyp |
| diff --git a/Source/heap/blink_heap_tests.gyp b/Source/heap/blink_heap_tests.gyp |
| index caecf97a5a4731b142a17487dc87e7d974dda19e..513d23c467f9e9808ed84e0e67fc3b9f785519e1 100644 |
| --- a/Source/heap/blink_heap_tests.gyp |
| +++ b/Source/heap/blink_heap_tests.gyp |
| @@ -32,26 +32,44 @@ |
| '../build/win/precompile.gypi', |
| 'blink_heap.gypi', |
| ], |
| - 'targets': [{ |
| - 'target_name': 'blink_heap_unittests', |
| - 'type': 'executable', |
| - 'dependencies': [ |
| - '../config.gyp:unittest_config', |
| - '../wtf/wtf.gyp:wtf', |
| - '../wtf/wtf_tests.gyp:run_all_tests', |
| - '../wtf/wtf_tests.gyp:wtf_unittest_helpers', |
| - 'blink_heap.gyp:blink_heap', |
| - ], |
| - 'sources': [ |
| - '<@(heap_test_files)', |
| - ], |
| - 'conditions': [ |
| - ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_tcmalloc==1', { |
| - 'dependencies': [ |
| - '<(DEPTH)/base/base.gyp:base', |
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| - ] |
| - }], |
| - ] |
| - }], |
| + 'targets': [ |
| + { |
| + 'target_name': 'blink_heap_unittests', |
| + 'type': 'executable', |
| + 'dependencies': [ |
| + 'blink_heap_run_all_tests', |
| + '../config.gyp:unittest_config', |
| + '../wtf/wtf.gyp:wtf', |
| + '../wtf/wtf_tests.gyp:wtf_unittest_helpers', |
| + 'blink_heap.gyp:blink_heap', |
| + ], |
| + 'sources': [ |
| + '<@(heap_test_files)', |
| + ], |
| + 'conditions': [ |
| + ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_tcmalloc==1', { |
| + 'dependencies': [ |
| + '<(DEPTH)/base/base.gyp:base', |
| + '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| + ] |
| + }], |
| + ] |
| + }, |
| + { |
| + 'target_name': 'blink_heap_run_all_tests', |
|
tfarina
2014/02/08 04:47:47
you certainly do not need this to be a separate ta
|
| + 'type': 'static_library', |
| + 'dependencies': [ |
| + '../config.gyp:unittest_config', |
| + '<(DEPTH)/base/base.gyp:test_support_base', |
| + ], |
| + 'export_dependent_settings': [ |
| + '<(DEPTH)/base/base.gyp:test_support_base', |
| + ], |
| + # Disable c4267 warnings until we fix size_t to int truncations. See wtf.gyp for details. |
| + 'msvs_disabled_warnings': [4267], |
| + 'sources': [ |
| + 'RunAllTests.cpp', |
| + ] |
| + }, |
| + ], |
| } |