Chromium Code Reviews| Index: Source/wtf/wtf_tests.gyp |
| diff --git a/Source/modules/modules.gyp b/Source/wtf/wtf_tests.gyp |
| similarity index 55% |
| copy from Source/modules/modules.gyp |
| copy to Source/wtf/wtf_tests.gyp |
| index 5febaa82c5fc05df1d4fb1b240424f50c8edf60a..88b03c44115d5ba9a3064e781f5151f36354fee6 100644 |
| --- a/Source/modules/modules.gyp |
| +++ b/Source/wtf/wtf_tests.gyp |
| @@ -1,4 +1,3 @@ |
| -# |
| # Copyright (C) 2013 Google Inc. All rights reserved. |
| # |
| # Redistribution and use in source and binary forms, with or without |
| @@ -26,24 +25,56 @@ |
| # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| -# |
| { |
| 'includes': [ |
| '../WebKit/chromium/WinPrecompile.gypi', |
| - 'modules.gypi', |
| + 'wtf.gypi', |
| ], |
| - 'targets': [{ |
| - 'target_name': 'modules', |
| - 'type': 'static_library', |
| - 'dependencies': [ |
| - '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', |
| - '../config.gyp:config', |
| - '../core/core.gyp/core.gyp:webcore', |
| - ], |
| - 'sources': [ |
| - '<@(modules_files)', |
| - ], |
| - # Disable c4267 warnings until we fix size_t to int truncations. |
| - 'msvs_disabled_warnings': [ 4267, 4334, ] |
| - }], |
| + 'targets': [ |
| + { |
| + 'target_name': 'wtf_unittests', |
|
abarth-chromium
2013/05/28 06:28:24
Would you be willing to make a CL so that these sh
|
| + 'type': 'executable', |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'dependencies': [ |
| + 'run_all_tests', |
| + 'wtf.gyp:wtf', |
| + '../config.gyp:config', |
| + '<(DEPTH)/testing/gmock.gyp:gmock', |
| + '<(DEPTH)/testing/gtest.gyp:gtest', |
| + ], |
| + 'sources': [ |
| + '<@(wtf_unittest_files)', |
| + ], |
| + # Disable c4267 warnings until we fix size_t to int truncations. |
| + 'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267], |
| + 'cflags!': ['-Wglobal-constructors'], |
| + 'xcode_settings': { |
| + 'WARNING_CFLAGS!': ['-Wglobal-constructors'], |
| + }, |
| + 'conditions': [ |
| + ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_tcmalloc==1', { |
| + 'dependencies': [ |
| + '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| + ], |
| + }] |
| + ], |
| + }, |
| + { |
| + 'target_name': 'run_all_tests', |
| + 'type': 'static_library', |
| + 'dependencies': [ |
| + '../config.gyp:config', |
| + '<(DEPTH)/testing/gmock.gyp:gmock', |
| + '<(DEPTH)/testing/gtest.gyp:gtest', |
| + ], |
| + 'include_dirs': [ |
| + '..' |
|
abarth-chromium
2013/05/28 06:28:24
This could be exported by config.
|
| + ], |
| + 'sources': [ |
| + 'tests/RunAllTests.cpp', |
| + ] |
| + } |
| + ] |
| } |