0

Link the following tests against tcmalloc:

app_unittests
  browser_tests
  startup_tests
  media_unittests
  printing_unittests
  net_unittests
  googleurl_unittests
  ipc_tests
  unit_tests
  ui_tests

This patch was originally reviewed as http://codereview.chromium.org/466089

TBR=willchan

Review URL: http://codereview.chromium.org/488004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34247 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
glider@chromium.org
2009-12-10 12:06:15 +00:00
parent 0edc4631ed
commit d9df2b5065
8 changed files with 104 additions and 6 deletions
app
build/temp_gyp
chrome
ipc
media
net
printing
webkit/tools/test_shell

@ -77,6 +77,15 @@
'win_util_unittest.cc', 'win_util_unittest.cc',
], ],
}], }],
['OS =="linux" or OS =="freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
], ],
}, },
{ {

@ -69,6 +69,17 @@
'../../googleurl/src/url_util_unittest.cc', '../../googleurl/src/url_util_unittest.cc',
'../../googleurl/src/gurl_test_main.cc', '../../googleurl/src/gurl_test_main.cc',
], ],
'conditions': [
['OS=="linux" or OS=="freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
],
}, },
], ],
} }

@ -387,6 +387,15 @@
'test/ui/sandbox_uitests.cc', 'test/ui/sandbox_uitests.cc',
], ],
}], }],
['OS=="linux" or OS=="freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
], ],
}, },
{ {
@ -1001,6 +1010,15 @@
'common/net/url_util_unittest.cc', 'common/net/url_util_unittest.cc',
], ],
}], }],
['OS=="linux" or OS=="freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
], ],
}, },
{ {
@ -1142,6 +1160,15 @@
], ],
}, },
}], }],
['OS=="linux" or OS=="freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
], # conditions ], # conditions
}, # target browser_tests }, # target browser_tests
{ {
@ -1182,6 +1209,15 @@
'<(allocator_target)', '<(allocator_target)',
], ],
},], },],
['OS=="linux" or OS=="freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
], ],
}, },
{ {

@ -63,6 +63,15 @@
'../views/views.gyp:views', '../views/views.gyp:views',
], ],
}], }],
['OS=="linux" or OS=="freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}]
], ],
}, },
], ],

@ -211,6 +211,13 @@
# gtk/gtk.h # gtk/gtk.h
'../build/linux/system.gyp:gtk', '../build/linux/system.gyp:gtk',
], ],
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}], }],
], ],
}, },

@ -686,6 +686,15 @@
], ],
}, },
], ],
['OS == "linux" or OS == "freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
[ 'OS == "mac"', { [ 'OS == "mac"', {
'sources/': [ ['exclude', '_(linux|win)_unittest\\.cc$'] ], 'sources/': [ ['exclude', '_(linux|win)_unittest\\.cc$'] ],
}, },

@ -112,6 +112,15 @@
'../build/linux/system.gyp:gtk', '../build/linux/system.gyp:gtk',
], ],
}], }],
['OS=="linux" or OS=="freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
], ],
}, },
], ],

@ -291,12 +291,11 @@
}], }],
['OS=="linux"', { ['OS=="linux"', {
'conditions': [ 'conditions': [
[ 'linux_use_tcmalloc==1', { ['linux_use_tcmalloc==1', {
'dependencies': [ 'dependencies': [
'../../../base/allocator/allocator.gyp:allocator', '../../../base/allocator/allocator.gyp:allocator',
], ],
}, }],
],
], ],
'dependencies': [ 'dependencies': [
'../../../build/linux/system.gyp:gtk', '../../../build/linux/system.gyp:gtk',
@ -478,6 +477,15 @@
'../webcore_unit_tests/TransparencyWin_unittest.cpp', '../webcore_unit_tests/TransparencyWin_unittest.cpp',
], ],
}], }],
['OS=="linux" or OS=="freebsd"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
'../../../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
], ],
}, },
{ {