diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 15:13:37 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 15:13:37 +0000 |
| commit | 0cb7d8c8ce8a7261743dbe613ad93495457dd174 (patch) | |
| tree | 1b7fe8dc10f5b0c06c40466d2c7ecfe7466352a8 /ipc/ipc.gyp | |
| parent | a3c07c2082a2347b5c74d8b0c0bb9240812d331e (diff) | |
| download | chromium_src-0cb7d8c8ce8a7261743dbe613ad93495457dd174.zip chromium_src-0cb7d8c8ce8a7261743dbe613ad93495457dd174.tar.gz chromium_src-0cb7d8c8ce8a7261743dbe613ad93495457dd174.tar.bz2 | |
Make ipc_tests file structure a little saner and add an ipc_perftests target.
This means that the (one, semi-manual) IPC perf test that we have will build
without manual hackery (and do so separately from the ipc_tests target).
Review URL: https://chromiumcodereview.appspot.com/11819041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc.gyp')
| -rw-r--r-- | ipc/ipc.gyp | 49 |
1 files changed, 47 insertions, 2 deletions
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp index 678d166..c56f68a 100644 --- a/ipc/ipc.gyp +++ b/ipc/ipc.gyp @@ -37,6 +37,7 @@ 'test_support_ipc', '../base/base.gyp:base', '../base/base.gyp:base_i18n', + '../base/base.gyp:run_all_unittests', '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], @@ -46,6 +47,7 @@ 'sources': [ 'file_descriptor_set_posix_unittest.cc', 'ipc_channel_posix_unittest.cc', + 'ipc_channel_unittest.cc', 'ipc_fuzzing_tests.cc', 'ipc_message_unittest.cc', 'ipc_message_utils_unittest.cc', @@ -53,8 +55,8 @@ 'ipc_sync_channel_unittest.cc', 'ipc_sync_message_unittest.cc', 'ipc_sync_message_unittest.h', - 'ipc_tests.cc', - 'ipc_tests.h', + 'ipc_test_base.cc', + 'ipc_test_base.h', 'sync_socket_unittest.cc', ], 'conditions': [ @@ -80,6 +82,49 @@ ], }, { + 'target_name': 'ipc_perftests', + 'type': '<(gtest_target_type)', + # TODO(viettrungluu): Figure out which dependencies are really needed. + 'dependencies': [ + 'ipc', + 'test_support_ipc', + '../base/base.gyp:base', + '../base/base.gyp:base_i18n', + '../base/base.gyp:test_support_base', + '../base/base.gyp:test_support_perf', + '../testing/gtest.gyp:gtest', + ], + 'include_dirs': [ + '..' + ], + 'sources': [ + 'ipc_perftests.cc', + 'ipc_test_base.cc', + 'ipc_test_base.h', + ], + 'conditions': [ + ['toolkit_uses_gtk == 1', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }], + ['OS == "android" and gtest_target_type == "shared_library"', { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + }], + ['os_posix == 1 and OS != "mac" and OS != "android"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }] + ], + }, + { 'target_name': 'test_support_ipc', 'type': 'static_library', 'dependencies': [ |