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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/edk/mojo_edk_tests.gyp

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month 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 | « mojo/edk/mojo_edk.gyp ('k') | mojo/edk/system/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/mojo_edk_tests.gyp
diff --git a/mojo/edk/mojo_edk.gyp b/mojo/edk/mojo_edk_tests.gyp
similarity index 52%
copy from mojo/edk/mojo_edk.gyp
copy to mojo/edk/mojo_edk_tests.gyp
index e82689372a52aef96b22ccb5945d3121be2a4d95..943cad38e6cf83e252d3c6dfcbca97bc78e4efcd 100644
--- a/mojo/edk/mojo_edk.gyp
+++ b/mojo/edk/mojo_edk_tests.gyp
@@ -2,16 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# Essential components (and their tests) that are needed to build
-# Chrome should be here. Other components that are useful only in
-# Mojo land like mojo_shell should be in mojo.gyp.
{
'includes': [
'../mojo_variables.gypi',
],
'targets': [
{
- 'target_name': 'mojo_edk',
+ 'target_name': 'mojo_edk_tests',
'type': 'none',
'dependencies': [
# NOTE: If adding a new dependency here, please consider whether it
@@ -26,43 +23,9 @@
'mojo_public_system_perftests',
'mojo_public_system_unittests',
'mojo_public_utility_unittests',
- 'mojo_system_impl',
'mojo_system_unittests',
'mojo_js_unittests',
- ],
- },
- {
- 'target_name': 'mojo_none',
- 'type': 'none',
- },
- {
- # GN version: //mojo/edk/test:run_all_unittests
- 'target_name': 'mojo_run_all_unittests',
- 'type': 'static_library',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../base/base.gyp:test_support_base',
- '../../testing/gtest.gyp:gtest',
- 'mojo_system_impl',
- 'mojo_test_support_impl',
- '../public/mojo_public.gyp:mojo_test_support',
- ],
- 'sources': [
- 'test/run_all_unittests.cc',
- ],
- },
- {
- # GN version: //mojo/edk/test:run_all_perftests
- 'target_name': 'mojo_run_all_perftests',
- 'type': 'static_library',
- 'dependencies': [
- '../../base/base.gyp:test_support_base',
- 'mojo_system_impl',
- 'mojo_test_support_impl',
- '../public/mojo_public.gyp:mojo_test_support',
- ],
- 'sources': [
- 'test/run_all_perftests.cc',
+ 'mojo_js_integration_tests',
],
},
# TODO(vtl): Reorganize the mojo_public_*_unittests.
@@ -72,7 +35,7 @@
'type': 'executable',
'dependencies': [
'../../testing/gtest.gyp:gtest',
- 'mojo_run_all_unittests',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
'../public/mojo_public.gyp:mojo_cpp_bindings',
'../public/mojo_public.gyp:mojo_environment_standalone',
'../public/mojo_public.gyp:mojo_public_bindings_test_utils',
@@ -106,7 +69,7 @@
'type': 'executable',
'dependencies': [
'../../testing/gtest.gyp:gtest',
- 'mojo_run_all_unittests',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
'../public/mojo_public.gyp:mojo_environment_standalone',
'../public/mojo_public.gyp:mojo_public_test_utils',
'../public/mojo_public.gyp:mojo_utility',
@@ -126,7 +89,7 @@
'dependencies': [
'../../base/base.gyp:base',
'../../testing/gtest.gyp:gtest',
- 'mojo_run_all_unittests',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
'../public/mojo_public.gyp:mojo_application_standalone',
'../public/mojo_public.gyp:mojo_utility',
'../public/mojo_public.gyp:mojo_environment_standalone',
@@ -136,12 +99,13 @@
],
},
{
- # GN version: //mojo/public/cpp/application/tests:mojo_public_system_unittests
+ # GN version: //mojo/public/cpp/system/tests:mojo_public_system_unittests
+ # and //mojo/public/c/system/tests
'target_name': 'mojo_public_system_unittests',
'type': 'executable',
'dependencies': [
'../../testing/gtest.gyp:gtest',
- 'mojo_run_all_unittests',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
'../public/mojo_public.gyp:mojo_public_test_utils',
],
'include_dirs': [ '../..' ],
@@ -155,7 +119,7 @@
'type': 'executable',
'dependencies': [
'../../testing/gtest.gyp:gtest',
- 'mojo_run_all_unittests',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
'../public/mojo_public.gyp:mojo_public_test_utils',
'../public/mojo_public.gyp:mojo_utility',
],
@@ -182,7 +146,7 @@
'dependencies': [
'../../base/base.gyp:base',
'../../testing/gtest.gyp:gtest',
- 'mojo_run_all_perftests',
+ 'mojo_edk.gyp:mojo_run_all_perftests',
'../public/mojo_public.gyp:mojo_public_test_utils',
'../public/mojo_public.gyp:mojo_utility',
],
@@ -190,119 +154,6 @@
'../public/c/system/tests/core_perftest.cc',
],
},
-
- {
- # GN version: //mojo/edk/system
- 'target_name': 'mojo_system_impl',
- 'type': '<(component)',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- ],
- 'defines': [
- 'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
- 'MOJO_SYSTEM_IMPLEMENTATION',
- 'MOJO_USE_SYSTEM_IMPL',
- ],
- 'sources': [
- 'embedder/channel_info_forward.h',
- 'embedder/channel_init.cc',
- 'embedder/channel_init.h',
- 'embedder/embedder.cc',
- 'embedder/embedder.h',
- 'embedder/platform_channel_pair.cc',
- 'embedder/platform_channel_pair.h',
- 'embedder/platform_channel_pair_posix.cc',
- 'embedder/platform_channel_pair_win.cc',
- 'embedder/platform_channel_utils_posix.cc',
- 'embedder/platform_channel_utils_posix.h',
- 'embedder/platform_handle.cc',
- 'embedder/platform_handle.h',
- 'embedder/platform_handle_utils.h',
- 'embedder/platform_handle_utils_posix.cc',
- 'embedder/platform_handle_utils_win.cc',
- 'embedder/platform_handle_vector.h',
- 'embedder/platform_shared_buffer.h',
- 'embedder/platform_support.h',
- 'embedder/scoped_platform_handle.h',
- 'embedder/simple_platform_shared_buffer.cc',
- 'embedder/simple_platform_shared_buffer.h',
- 'embedder/simple_platform_shared_buffer_posix.cc',
- 'embedder/simple_platform_shared_buffer_win.cc',
- 'embedder/simple_platform_support.cc',
- 'embedder/simple_platform_support.h',
- 'system/channel.cc',
- 'system/channel.h',
- 'system/channel_endpoint.cc',
- 'system/channel_endpoint.h',
- 'system/channel_endpoint_id.cc',
- 'system/channel_endpoint_id.h',
- 'system/channel_info.cc',
- 'system/channel_info.h',
- 'system/constants.h',
- 'system/core.cc',
- 'system/core.h',
- 'system/data_pipe.cc',
- 'system/data_pipe.h',
- 'system/data_pipe_consumer_dispatcher.cc',
- 'system/data_pipe_consumer_dispatcher.h',
- 'system/data_pipe_producer_dispatcher.cc',
- 'system/data_pipe_producer_dispatcher.h',
- 'system/dispatcher.cc',
- 'system/dispatcher.h',
- 'system/entrypoints.cc',
- 'system/handle_signals_state.h',
- 'system/handle_table.cc',
- 'system/handle_table.h',
- 'system/local_data_pipe.cc',
- 'system/local_data_pipe.h',
- 'system/local_message_pipe_endpoint.cc',
- 'system/local_message_pipe_endpoint.h',
- 'system/mapping_table.cc',
- 'system/mapping_table.h',
- 'system/memory.cc',
- 'system/memory.h',
- 'system/message_in_transit.cc',
- 'system/message_in_transit.h',
- 'system/message_in_transit_queue.cc',
- 'system/message_in_transit_queue.h',
- 'system/message_pipe.cc',
- 'system/message_pipe.h',
- 'system/message_pipe_dispatcher.cc',
- 'system/message_pipe_dispatcher.h',
- 'system/message_pipe_endpoint.cc',
- 'system/message_pipe_endpoint.h',
- 'system/options_validation.h',
- 'system/platform_handle_dispatcher.cc',
- 'system/platform_handle_dispatcher.h',
- 'system/proxy_message_pipe_endpoint.cc',
- 'system/proxy_message_pipe_endpoint.h',
- 'system/raw_channel.cc',
- 'system/raw_channel.h',
- 'system/raw_channel_posix.cc',
- 'system/raw_channel_win.cc',
- 'system/shared_buffer_dispatcher.cc',
- 'system/shared_buffer_dispatcher.h',
- 'system/simple_dispatcher.cc',
- 'system/simple_dispatcher.h',
- 'system/transport_data.cc',
- 'system/transport_data.h',
- 'system/waiter.cc',
- 'system/waiter.h',
- 'system/waiter_list.cc',
- 'system/waiter_list.h',
- # Test-only code:
- # TODO(vtl): It's a little unfortunate that these end up in the same
- # component as non-test-only code. In the static build, this code should
- # hopefully be dead-stripped.
- 'embedder/test_embedder.cc',
- 'embedder/test_embedder.h',
- ],
- 'all_dependent_settings': {
- # Ensures that dependent projects import the core functions on Windows.
- 'defines': ['MOJO_USE_SYSTEM_IMPL'],
- }
- },
{
# GN version: //mojo/edk/system:mojo_system_unittests
'target_name': 'mojo_system_unittests',
@@ -310,8 +161,8 @@
'dependencies': [
'../../base/base.gyp:base',
'../../testing/gtest.gyp:gtest',
- 'mojo_common_test_support',
- 'mojo_system_impl',
+ 'mojo_edk.gyp:mojo_common_test_support',
+ 'mojo_edk.gyp:mojo_system_impl',
],
'sources': [
'embedder/embedder_unittest.cc',
@@ -344,12 +195,14 @@
'system/waiter_test_utils.cc',
'system/waiter_test_utils.h',
'system/waiter_unittest.cc',
+ 'test/multiprocess_test_helper_unittest.cc',
],
'conditions': [
['OS=="ios"', {
'sources!': [
'embedder/embedder_unittest.cc',
'system/multiprocess_message_pipe_unittest.cc',
+ 'test/multiprocess_test_helper_unittest.cc',
],
}],
],
@@ -363,8 +216,8 @@
'../../base/base.gyp:test_support_base',
'../../base/base.gyp:test_support_perf',
'../../testing/gtest.gyp:gtest',
- 'mojo_common_test_support',
- 'mojo_system_impl',
+ 'mojo_edk.gyp:mojo_common_test_support',
+ 'mojo_edk.gyp:mojo_system_impl',
],
'sources': [
'system/message_pipe_perftest.cc',
@@ -375,87 +228,51 @@
],
},
{
- # GN version: //mojo/edk/js
- 'target_name': 'mojo_js_lib',
- 'type': 'static_library',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../gin/gin.gyp:gin',
- '../../v8/tools/gyp/v8.gyp:v8',
- ],
- 'export_dependent_settings': [
- '../../base/base.gyp:base',
- '../../gin/gin.gyp:gin',
- ],
- 'sources': [
- # Sources list duplicated in GN build.
- 'js/core.cc',
- 'js/core.h',
- 'js/drain_data.cc',
- 'js/drain_data.h',
- 'js/handle.cc',
- 'js/handle.h',
- 'js/handle_close_observer.h',
- 'js/support.cc',
- 'js/support.h',
- 'js/waiting_callback.cc',
- 'js/waiting_callback.h',
- ],
- },
- {
- # GN version: //mojo/edk/js:js_unittests
+ # GN version: //mojo/edk/js/test:js_unittests
'target_name': 'mojo_js_unittests',
'type': 'executable',
'dependencies': [
'../../gin/gin.gyp:gin_test',
- 'mojo_common_test_support',
- 'mojo_run_all_unittests',
- 'mojo_js_lib',
+ 'mojo_edk.gyp:mojo_common_test_support',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
+ 'mojo_edk.gyp:mojo_js_lib',
'../public/mojo_public.gyp:mojo_environment_standalone',
'../public/mojo_public.gyp:mojo_public_test_interfaces',
'../public/mojo_public.gyp:mojo_utility',
],
'sources': [
'js/handle_unittest.cc',
- 'js/tests/run_js_tests.cc',
+ 'js/test/run_js_tests.cc',
],
},
{
- # GN version: //mojo/common/test:test_support_impl
- 'target_name': 'mojo_test_support_impl',
- 'type': 'static_library',
+ # GN version: //mojo/edk/js/test:js_integration_tests
+ 'target_name': 'mojo_js_integration_tests',
+ 'type': 'executable',
'dependencies': [
'../../base/base.gyp:base',
+ '../../gin/gin.gyp:gin_test',
+ '../public/mojo_public.gyp:mojo_environment_standalone',
+ '../public/mojo_public.gyp:mojo_public_test_interfaces',
+ '../public/mojo_public.gyp:mojo_utility',
+ 'mojo_edk.gyp:mojo_js_lib',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
+ 'mojo_js_to_cpp_bindings',
],
'sources': [
- 'test/test_support_impl.cc',
- 'test/test_support_impl.h',
+ 'js/test/run_js_integration_tests.cc',
+ 'js/tests/js_to_cpp_tests',
],
},
{
- # GN version: //mojo/edk/test:test_support
- 'target_name': 'mojo_common_test_support',
- 'type': 'static_library',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../base/base.gyp:test_support_base',
- '../../testing/gtest.gyp:gtest',
- 'mojo_system_impl',
- ],
- 'sources': [
- 'test/multiprocess_test_helper.cc',
- 'test/multiprocess_test_helper.h',
- 'test/test_utils.h',
- 'test/test_utils_posix.cc',
- 'test/test_utils_win.cc',
- ],
- 'conditions': [
- ['OS=="ios"', {
- 'sources!': [
- 'test/multiprocess_test_helper.cc',
- ],
- }],
- ],
+ 'target_name': 'mojo_js_to_cpp_bindings',
+ 'type': 'none',
+ 'variables': {
+ 'mojom_files': [
+ 'js/tests/js_to_cpp.mojom',
+ ],
+ },
+ 'includes': [ '../public/tools/bindings/mojom_bindings_generator_explicit.gypi' ],
},
],
}
« no previous file with comments | « mojo/edk/mojo_edk.gyp ('k') | mojo/edk/system/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698