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

Unified Diff: base/base.gyp

Issue 15979023: Redo r203907 base_unittests.exe to use allocator shims (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/allocator/prep_libc.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 19e8af177ab7b522a47d3f3686fc5a79018f1e95..47ab483cb2cf25b2d9b1f9e58b061099d5b266a4 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -754,9 +754,9 @@
'message_pump_glib_unittest.cc',
]
}],
- # This is needed to trigger the dll copy step on windows.
- # TODO(mark): This should not be necessary.
['OS == "win"', {
+ # This is needed to trigger the dll copy step on windows.
+ # TODO(mark): This should not be necessary.
'dependencies': [
'../third_party/icu/icu.gyp:icudata',
],
@@ -770,6 +770,18 @@
'msvs_disabled_warnings': [
4267,
],
+ # This is needed so base_unittests uses the allocator shim, as
+ # SecurityTest.MemoryAllocationRestriction* tests are dependent
+ # on tcmalloc.
+ # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
+ # their own test suite.
+ 'conditions': [
+ ['win_use_allocator_shim==1', {
+ 'dependencies': [
+ 'allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
}, { # OS != "win"
'dependencies': [
'../third_party/libevent/libevent.gyp:libevent'
« no previous file with comments | « base/allocator/prep_libc.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698