summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 12:06:15 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 12:06:15 +0000
commitd9df2b506576b67796d44c024119b05b679658ca (patch)
tree2cf0e1041f8d34df3deba39b73adafa4776e6f5c
parent0edc4631ede0fe4cbc36b075249ea1fdeb4d9493 (diff)
downloadchromium_src-d9df2b506576b67796d44c024119b05b679658ca.zip
chromium_src-d9df2b506576b67796d44c024119b05b679658ca.tar.gz
chromium_src-d9df2b506576b67796d44c024119b05b679658ca.tar.bz2
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
-rw-r--r--app/app.gyp9
-rw-r--r--build/temp_gyp/googleurl.gyp11
-rwxr-xr-xchrome/chrome_tests.gypi36
-rw-r--r--ipc/ipc.gyp9
-rw-r--r--media/media.gyp7
-rw-r--r--net/net.gyp9
-rw-r--r--printing/printing.gyp9
-rw-r--r--webkit/tools/test_shell/test_shell.gyp20
8 files changed, 104 insertions, 6 deletions
diff --git a/app/app.gyp b/app/app.gyp
index 8984fa8..b7e31a6 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -77,6 +77,15 @@
'win_util_unittest.cc',
],
}],
+ ['OS =="linux" or OS =="freebsd"', {
+ 'conditions': [
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
+ }],
],
},
{
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp
index 0df561c..20da6ab 100644
--- a/build/temp_gyp/googleurl.gyp
+++ b/build/temp_gyp/googleurl.gyp
@@ -69,6 +69,17 @@
'../../googleurl/src/url_util_unittest.cc',
'../../googleurl/src/gurl_test_main.cc',
],
+ 'conditions': [
+ ['OS=="linux" or OS=="freebsd"', {
+ 'conditions': [
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
+ }],
+ ],
},
],
}
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d4e52cb..882de59 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -387,6 +387,15 @@
'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',
],
}],
+ ['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
}, # target browser_tests
{
@@ -1182,6 +1209,15 @@
'<(allocator_target)',
],
},],
+ ['OS=="linux" or OS=="freebsd"', {
+ 'conditions': [
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
+ }],
],
},
{
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index 0d7c5b7..d823bec 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -63,6 +63,15 @@
'../views/views.gyp:views',
],
}],
+ ['OS=="linux" or OS=="freebsd"', {
+ 'conditions': [
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
+ }]
],
},
],
diff --git a/media/media.gyp b/media/media.gyp
index bc071f4..f53c35d 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -211,6 +211,13 @@
# gtk/gtk.h
'../build/linux/system.gyp:gtk',
],
+ 'conditions': [
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
}],
],
},
diff --git a/net/net.gyp b/net/net.gyp
index f5adb65..3f12c697 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -686,6 +686,15 @@
],
},
],
+ ['OS == "linux" or OS == "freebsd"', {
+ 'conditions': [
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
+ }],
[ 'OS == "mac"', {
'sources/': [ ['exclude', '_(linux|win)_unittest\\.cc$'] ],
},
diff --git a/printing/printing.gyp b/printing/printing.gyp
index b483f0b..3f48ef7 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -112,6 +112,15 @@
'../build/linux/system.gyp:gtk',
],
}],
+ ['OS=="linux" or OS=="freebsd"', {
+ 'conditions': [
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
+ }],
],
},
],
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 7a7b61e..532da24 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -291,12 +291,11 @@
}],
['OS=="linux"', {
'conditions': [
- [ 'linux_use_tcmalloc==1', {
- 'dependencies': [
- '../../../base/allocator/allocator.gyp:allocator',
- ],
- },
- ],
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../../../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
],
'dependencies': [
'../../../build/linux/system.gyp:gtk',
@@ -478,6 +477,15 @@
'../webcore_unit_tests/TransparencyWin_unittest.cpp',
],
}],
+ ['OS=="linux" or OS=="freebsd"', {
+ 'conditions': [
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../../../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
+ }],
],
},
{