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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_edk_tests.gyp

Issue 1676913002: [mojo] Delete third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: let's try that again Created 4 years, 10 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 | « mojo/mojo_edk.gyp ('k') | mojo/mojo_public.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_edk_tests.gyp
diff --git a/mojo/mojo_edk_tests.gyp b/mojo/mojo_edk_tests.gyp
index fc185e3122aa9fa2c13e1e41dc07f38cf493f378..9d8b1af3f789081f81c4f7131f2d760b76d16994 100644
--- a/mojo/mojo_edk_tests.gyp
+++ b/mojo/mojo_edk_tests.gyp
@@ -4,7 +4,7 @@
{
'includes': [
- '../third_party/mojo/mojo_variables.gypi',
+ 'mojo_variables.gypi',
],
'targets': [
{
@@ -16,8 +16,14 @@
# build/all.gyp:All on iOS, as All cannot depend on the mojo_base
# target on iOS due to the presence of the js targets, which cause v8
# to be built.
- 'mojo_message_pipe_perftests2',
- 'mojo_system_unittests2',
+ 'mojo_message_pipe_perftests',
+ 'mojo_public_bindings_perftests',
+ 'mojo_public_bindings_unittests',
+ 'mojo_public_environment_unittests',
+ 'mojo_public_system_perftests',
+ 'mojo_public_system_unittests',
+ 'mojo_public_utility_unittests',
+ 'mojo_system_unittests',
'mojo_js_unittests',
'mojo_js_integration_tests',
],
@@ -29,21 +35,172 @@
'dependencies': [
'../testing/gtest.gyp:gtest',
'../testing/gtest.gyp:gtest_main',
- 'mojo_edk.gyp:mojo_system_impl2',
+ 'mojo_edk.gyp:mojo_system_impl',
],
'sources': [
'edk/system/ports/ports_unittest.cc',
],
- }
+ },
+ {
+ # GN version: //mojo/edk/test:mojo_public_bindings_unittests
+ 'target_name': 'mojo_public_bindings_unittests',
+ 'type': 'executable',
+ 'dependencies': [
+ '../testing/gtest.gyp:gtest',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_message_pump_lib',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
+ 'mojo_public.gyp:mojo_cpp_bindings',
+ 'mojo_public.gyp:mojo_public_bindings_test_utils',
+ 'mojo_public.gyp:mojo_public_test_associated_interfaces',
+ 'mojo_public.gyp:mojo_public_test_interfaces',
+ 'mojo_public.gyp:mojo_public_test_interfaces_blink',
+ 'mojo_public.gyp:mojo_public_test_interfaces_chromium',
+ 'mojo_public.gyp:mojo_public_test_utils',
+ 'mojo_public.gyp:mojo_utility',
+ ],
+ 'sources': [
+ 'public/cpp/bindings/tests/array_unittest.cc',
+ 'public/cpp/bindings/tests/associated_interface_unittest.cc',
+ 'public/cpp/bindings/tests/binding_callback_unittest.cc',
+ 'public/cpp/bindings/tests/binding_unittest.cc',
+ 'public/cpp/bindings/tests/bounds_checker_unittest.cc',
+ 'public/cpp/bindings/tests/buffer_unittest.cc',
+ 'public/cpp/bindings/tests/callback_unittest.cc',
+ 'public/cpp/bindings/tests/connector_unittest.cc',
+ 'public/cpp/bindings/tests/constant_unittest.cc',
+ 'public/cpp/bindings/tests/container_test_util.cc',
+ 'public/cpp/bindings/tests/equals_unittest.cc',
+ 'public/cpp/bindings/tests/handle_passing_unittest.cc',
+ 'public/cpp/bindings/tests/interface_ptr_unittest.cc',
+ 'public/cpp/bindings/tests/map_unittest.cc',
+ 'public/cpp/bindings/tests/message_queue.cc',
+ 'public/cpp/bindings/tests/message_queue.h',
+ 'public/cpp/bindings/tests/multiplex_router_unittest.cc',
+ 'public/cpp/bindings/tests/pickle_unittest.cc',
+ 'public/cpp/bindings/tests/pickled_struct_blink.cc',
+ 'public/cpp/bindings/tests/pickled_struct_blink.h',
+ 'public/cpp/bindings/tests/pickled_struct_chromium.cc',
+ 'public/cpp/bindings/tests/pickled_struct_chromium.h',
+ 'public/cpp/bindings/tests/rect_blink.h',
+ 'public/cpp/bindings/tests/rect_chromium.h',
+ 'public/cpp/bindings/tests/request_response_unittest.cc',
+ 'public/cpp/bindings/tests/router_test_util.cc',
+ 'public/cpp/bindings/tests/router_test_util.h',
+ 'public/cpp/bindings/tests/router_unittest.cc',
+ 'public/cpp/bindings/tests/sample_service_unittest.cc',
+ 'public/cpp/bindings/tests/serialization_warning_unittest.cc',
+ 'public/cpp/bindings/tests/string_unittest.cc',
+ 'public/cpp/bindings/tests/struct_traits_unittest.cc',
+ 'public/cpp/bindings/tests/struct_unittest.cc',
+ 'public/cpp/bindings/tests/type_conversion_unittest.cc',
+ 'public/cpp/bindings/tests/union_unittest.cc',
+ 'public/cpp/bindings/tests/validation_unittest.cc',
+ ],
+ },
+ {
+ # GN version: //mojo/edk/test:mojo_public_bindings_perftests
+ 'target_name': 'mojo_public_bindings_perftests',
+ 'type': 'executable',
+ 'dependencies': [
+ '../testing/gtest.gyp:gtest',
+ 'mojo_base.gyp:mojo_common_lib',
+ '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': [
+ 'public/cpp/bindings/tests/bindings_perftest.cc',
+ ],
+ },
+ {
+ # GN version: //mojo/edk/test:mojo_public_environment_unittests
+ 'target_name': 'mojo_public_environment_unittests',
+ '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_test_utils',
+ 'mojo_public.gyp:mojo_utility',
+ ],
+ 'sources': [
+ 'public/cpp/environment/tests/async_wait_unittest.cc',
+ 'public/cpp/environment/tests/async_waiter_unittest.cc',
+ 'public/cpp/environment/tests/logger_unittest.cc',
+ 'public/cpp/environment/tests/logging_unittest.cc',
+ ],
+ },
+ {
+ # 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_edk.gyp:mojo_run_all_unittests',
+ 'mojo_public.gyp:mojo_public_test_utils',
+ ],
+ 'sources': [
+ '<@(mojo_public_system_unittest_sources)',
+ ],
+ },
+ {
+ # GN version: //mojo/public/cpp/application/tests:mojo_public_utility_unittests
+ 'target_name': 'mojo_public_utility_unittests',
+ 'type': 'executable',
+ 'dependencies': [
+ '../testing/gtest.gyp:gtest',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
+ 'mojo_public.gyp:mojo_cpp_bindings',
+ 'mojo_public.gyp:mojo_public_test_utils',
+ 'mojo_public.gyp:mojo_utility',
+ ],
+ 'sources': [
+ 'public/cpp/utility/tests/mutex_unittest.cc',
+ 'public/cpp/utility/tests/run_loop_unittest.cc',
+ 'public/cpp/utility/tests/thread_unittest.cc',
+ ],
+ 'conditions': [
+ # See crbug.com/342893:
+ ['OS=="win"', {
+ 'sources!': [
+ 'public/cpp/utility/tests/mutex_unittest.cc',
+ 'public/cpp/utility/tests/thread_unittest.cc',
+ ],
+ }],
+ ],
+ },
+ {
+ # GN version: //mojo/edk/test:mojo_public_system_perftests
+ 'target_name': 'mojo_public_system_perftests',
+ 'type': 'executable',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../testing/gtest.gyp:gtest',
+ 'mojo_edk.gyp:mojo_run_all_perftests',
+ 'mojo_public.gyp:mojo_public_test_utils',
+ 'mojo_public.gyp:mojo_utility',
+ ],
+ 'sources': [
+ 'public/c/system/tests/core_perftest.cc',
+ ],
+ },
{
# GN version: //mojo/edk/system:mojo_system_unittests
- 'target_name': 'mojo_system_unittests2',
+ 'target_name': 'mojo_system_unittests',
'type': 'executable',
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
- 'mojo_edk.gyp:mojo_common_test_support2',
- 'mojo_edk.gyp:mojo_system_impl2',
+ 'mojo_edk.gyp:mojo_common_test_support',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
+ 'mojo_edk.gyp:mojo_system_impl',
],
'sources': [
'edk/embedder/embedder_unittest.cc',
@@ -53,14 +210,10 @@
'edk/system/core_test_base.cc',
'edk/system/core_test_base.h',
'edk/system/core_unittest.cc',
- 'edk/system/data_pipe_unittest.cc',
- 'edk/system/message_pipe_test_utils.cc',
- 'edk/system/message_pipe_test_utils.h',
'edk/system/message_pipe_unittest.cc',
'edk/system/multiprocess_message_pipe_unittest.cc',
'edk/system/options_validation_unittest.cc',
'edk/system/platform_handle_dispatcher_unittest.cc',
- 'edk/system/run_all_unittests.cc',
'edk/system/shared_buffer_dispatcher_unittest.cc',
'edk/system/shared_buffer_unittest.cc',
'edk/system/test_utils.cc',
@@ -69,34 +222,29 @@
'edk/system/waiter_test_utils.cc',
'edk/system/waiter_test_utils.h',
'edk/system/waiter_unittest.cc',
- 'edk/test/multiprocess_test_helper_unittest.cc',
],
'conditions': [
['OS=="ios"', {
'sources!': [
- 'edk/embedder/embedder_unittest.cc',
'edk/system/multiprocess_message_pipe_unittest.cc',
- 'edk/system/shared_buffer_unittest.cc',
],
}],
],
},
{
# GN version: //mojo/edk/system:mojo_message_pipe_perftests
- 'target_name': 'mojo_message_pipe_perftests2',
+ 'target_name': 'mojo_message_pipe_perftests',
'type': 'executable',
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
- '../base/base.gyp:test_support_perf',
'../testing/gtest.gyp:gtest',
- 'mojo_edk.gyp:mojo_common_test_support2',
- 'mojo_edk.gyp:mojo_system_impl2',
+ 'mojo_edk.gyp:mojo_common_test_support',
+ 'mojo_edk.gyp:mojo_run_all_perftests',
+ 'mojo_edk.gyp:mojo_system_impl',
],
'sources': [
'edk/system/message_pipe_perftest.cc',
- 'edk/system/message_pipe_test_utils.cc',
- 'edk/system/message_pipe_test_utils.h',
'edk/system/test_utils.cc',
'edk/system/test_utils.h',
],
@@ -108,12 +256,12 @@
'type': 'executable',
'dependencies': [
'../gin/gin.gyp:gin_test',
- '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
- '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
- '../third_party/mojo/mojo_public.gyp:mojo_utility',
- 'mojo_edk.gyp:mojo_common_test_support2',
- 'mojo_edk.gyp:mojo_run_all_unittests2',
- 'mojo_edk.gyp:mojo_js_lib2',
+ 'mojo_edk.gyp:mojo_common_test_support',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
+ 'mojo_edk.gyp:mojo_js_lib',
+ 'mojo_public.gyp:mojo_environment_standalone',
+ 'mojo_public.gyp:mojo_public_test_interfaces',
+ 'mojo_public.gyp:mojo_utility',
],
'sources': [
'edk/js/handle_unittest.cc',
@@ -127,17 +275,86 @@
'dependencies': [
'../base/base.gyp:base',
'../gin/gin.gyp:gin_test',
- '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
- '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
- '../third_party/mojo/mojo_public.gyp:mojo_utility',
- 'mojo_edk.gyp:mojo_js_lib2',
- 'mojo_edk.gyp:mojo_run_all_unittests2',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_edk.gyp:mojo_js_lib',
+ 'mojo_edk.gyp:mojo_run_all_unittests',
'mojo_js_to_cpp_bindings',
+ 'mojo_public.gyp:mojo_environment_standalone',
+ 'mojo_public.gyp:mojo_public_test_interfaces',
+ 'mojo_public.gyp:mojo_utility',
],
'sources': [
'edk/js/test/run_js_integration_tests.cc',
'edk/js/tests/js_to_cpp_tests.cc',
],
},
+ {
+ 'target_name': 'mojo_js_to_cpp_bindings',
+ 'type': 'none',
+ 'variables': {
+ 'mojom_files': [
+ 'edk/js/tests/js_to_cpp.mojom',
+ ],
+ },
+ 'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+ },
+ ],
+ 'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'mojo_public_bindings_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'mojo_public_bindings_unittests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'mojo_public_bindings_unittests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'mojo_public_environment_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'mojo_public_environment_unittests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'mojo_public_environment_unittests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'mojo_public_system_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'mojo_public_system_unittests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'mojo_public_system_unittests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'mojo_public_utility_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'mojo_public_utility_unittests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'mojo_public_utility_unittests.isolate',
+ ],
+ },
+ ],
+ }],
],
}
« no previous file with comments | « mojo/mojo_edk.gyp ('k') | mojo/mojo_public.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698