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

Unified Diff: ipc/ipc.gyp

Issue 11819041: Make ipc_tests file structure a little saner and add an ipc_perftests target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ugh Created 7 years, 11 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 | « build/android/gtest_filter/ipc_tests_disabled ('k') | ipc/ipc_channel_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc.gyp
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index 678d166ee2bbf9497311177c3d3ade1ce4b353f3..c56f68a4a37cb10507d7cd2cbd2362d2ab2c2fd9 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': [
« no previous file with comments | « build/android/gtest_filter/ipc_tests_disabled ('k') | ipc/ipc_channel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698