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

Unified Diff: third_party/mojo/mojo_edk_tests.gyp

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in Created 5 years, 4 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 | « third_party/mojo/mojo_edk_system_impl.gypi ('k') | third_party/mojo/mojo_public.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mojo/mojo_edk_tests.gyp
diff --git a/third_party/mojo/mojo_edk_tests.gyp b/third_party/mojo/mojo_edk_tests.gyp
index db1fc36615ab1d147ec09ec8b98f069459df4530..2e47591aa8e57b7a0a47b8ccaba578c4c7735506 100644
--- a/third_party/mojo/mojo_edk_tests.gyp
+++ b/third_party/mojo/mojo_edk_tests.gyp
@@ -17,6 +17,7 @@
# target on iOS due to the presence of the js targets, which cause v8
# to be built.
'mojo_message_pipe_perftests',
+ 'mojo_public_bindings_perftests',
'mojo_public_bindings_unittests',
'mojo_public_environment_unittests',
'mojo_public_system_perftests',
@@ -52,6 +53,8 @@
'src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc',
'src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc',
'src/mojo/public/cpp/bindings/tests/map_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/message_queue.cc',
+ 'src/mojo/public/cpp/bindings/tests/message_queue.h',
'src/mojo/public/cpp/bindings/tests/request_response_unittest.cc',
'src/mojo/public/cpp/bindings/tests/router_unittest.cc',
'src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc',
@@ -63,6 +66,24 @@
],
},
{
+ # GN version: //mojo/edk/test:mojo_public_bindings_perftests
+ 'target_name': 'mojo_public_bindings_perftests',
+ 'type': 'executable',
+ 'dependencies': [
+ '../../testing/gtest.gyp:gtest',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
+ 'mojo_public.gyp:mojo_cpp_bindings',
+ 'mojo_public.gyp:mojo_environment_standalone',
+ 'mojo_public.gyp:mojo_public_bindings_test_utils',
+ 'mojo_public.gyp:mojo_public_test_interfaces',
+ 'mojo_public.gyp:mojo_public_test_utils',
+ 'mojo_public.gyp:mojo_utility',
+ ],
+ 'sources': [
+ 'src/mojo/public/cpp/bindings/tests/bindings_perftest.cc',
+ ],
+ },
+ {
# GN version: //mojo/edk/test:mojo_public_environment_unittests
'target_name': 'mojo_public_environment_unittests',
'type': 'executable',
@@ -175,6 +196,7 @@
'src/mojo/edk/system/message_pipe_test_utils.h',
'src/mojo/edk/system/message_pipe_unittest.cc',
'src/mojo/edk/system/multiprocess_message_pipe_unittest.cc',
+ 'src/mojo/edk/system/mutex_unittest.cc',
'src/mojo/edk/system/options_validation_unittest.cc',
'src/mojo/edk/system/platform_handle_dispatcher_unittest.cc',
'src/mojo/edk/system/raw_channel_unittest.cc',
@@ -187,6 +209,7 @@
'src/mojo/edk/system/test_channel_endpoint_client.h',
'src/mojo/edk/system/test_utils.cc',
'src/mojo/edk/system/test_utils.h',
+ 'src/mojo/edk/system/thread_annotations_unittest.cc',
'src/mojo/edk/system/unique_identifier_unittest.cc',
'src/mojo/edk/system/waiter_test_utils.cc',
'src/mojo/edk/system/waiter_test_utils.h',
« no previous file with comments | « third_party/mojo/mojo_edk_system_impl.gypi ('k') | third_party/mojo/mojo_public.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698