diff options
| author | ssid <ssid@chromium.org> | 2015-12-04 16:47:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-05 00:48:28 +0000 |
| commit | 6ce6fb5acd3c68f0146c938fb7a669a6a2a44f28 (patch) | |
| tree | 253dded949171aa84f1ce225d08723e361d7e9e2 /build/gn_migration.gypi | |
| parent | fd64d4948c3429296b8992bb02743b019a0dce79 (diff) | |
| download | chromium_src-6ce6fb5acd3c68f0146c938fb7a669a6a2a44f28.zip chromium_src-6ce6fb5acd3c68f0146c938fb7a669a6a2a44f28.tar.gz chromium_src-6ce6fb5acd3c68f0146c938fb7a669a6a2a44f28.tar.bz2 | |
Merge allocator and tcmalloc unittests and move to base_unittests
tcmalloc_unittests.cc was introduced to test tcmalloc's internals.
Later allocator_unittest.cc added some extra tcmalloc-specific
tests.
As a matter of facts neither tcmalloc_unittests nor allocator_unittest
is being run by any bot.
This CL is merging them into a single translation unit and making them
part of base_unittests since we don't want to add one more set of unittests
on the bots.
The recalloc test and aligned malloc for windows is removed since it
was introduced to check the _aligned_malloc re-defined in
allocator_shim.c (introduced in crrev.com/10828054), which has been
later removed.
Also, disabling some test in debug mode which are failing because
the error messages in debug builds are different due to the
debugallocation shim.
BUG=564618
Review URL: https://codereview.chromium.org/1500733002
Cr-Commit-Position: refs/heads/master@{#363322}
Diffstat (limited to 'build/gn_migration.gypi')
| -rw-r--r-- | build/gn_migration.gypi | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index dc2a6c5..3861cef 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -727,11 +727,6 @@ '../tools/win/static_initializers/static_initializers.gyp:static_initializers', ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator_unittests', - ] - }], ['OS=="win" and target_arch=="ia32"', { 'dependencies': [ # TODO(GYP): All of these targets need to be ported over. |