From 6ce6fb5acd3c68f0146c938fb7a669a6a2a44f28 Mon Sep 17 00:00:00 2001 From: ssid Date: Fri, 4 Dec 2015 16:47:01 -0800 Subject: 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} --- build/gn_migration.gypi | 5 ----- 1 file changed, 5 deletions(-) (limited to 'build/gn_migration.gypi') 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. -- cgit v1.1