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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/mojo/mojo_edk_tests.gyp

Issue 814543006: Move //mojo/{public, edk} underneath //third_party (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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 | « 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/mojo/mojo_edk_tests.gyp b/third_party/mojo/mojo_edk_tests.gyp
similarity index 52%
rename from mojo/mojo_edk_tests.gyp
rename to third_party/mojo/mojo_edk_tests.gyp
index f3809b4e9cbd7778f1890afa25d022e375b653cd..91a777fab34eeeb0497077e52db1e0a057c19edc 100644
--- a/mojo/mojo_edk_tests.gyp
+++ b/third_party/mojo/mojo_edk_tests.gyp
@@ -34,7 +34,7 @@
'target_name': 'mojo_public_bindings_unittests',
'type': 'executable',
'dependencies': [
- '../testing/gtest.gyp:gtest',
+ '../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
'mojo_public.gyp:mojo_cpp_bindings',
'mojo_public.gyp:mojo_environment_standalone',
@@ -44,23 +44,23 @@
'mojo_public.gyp:mojo_utility',
],
'sources': [
- 'public/cpp/bindings/tests/array_unittest.cc',
- 'public/cpp/bindings/tests/bounds_checker_unittest.cc',
- 'public/cpp/bindings/tests/buffer_unittest.cc',
- 'public/cpp/bindings/tests/connector_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/request_response_unittest.cc',
- '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_unittest.cc',
- 'public/cpp/bindings/tests/type_conversion_unittest.cc',
- 'public/cpp/bindings/tests/validation_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/array_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/buffer_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/connector_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/container_test_util.cc',
+ 'src/mojo/public/cpp/bindings/tests/equals_unittest.cc',
+ '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/request_response_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/router_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/string_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/struct_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc',
+ 'src/mojo/public/cpp/bindings/tests/validation_unittest.cc',
],
},
{
@@ -68,18 +68,18 @@
'target_name': 'mojo_public_environment_unittests',
'type': 'executable',
'dependencies': [
- '../testing/gtest.gyp:gtest',
+ '../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
'mojo_public.gyp:mojo_environment_standalone',
'mojo_public.gyp:mojo_public_test_utils',
'mojo_public.gyp:mojo_utility',
],
- 'include_dirs': [ '..' ],
+ 'include_dirs': [ '../..' ],
'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',
+ 'src/mojo/public/cpp/environment/tests/async_wait_unittest.cc',
+ 'src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc',
+ 'src/mojo/public/cpp/environment/tests/logger_unittest.cc',
+ 'src/mojo/public/cpp/environment/tests/logging_unittest.cc',
],
},
{
@@ -87,15 +87,15 @@
'target_name': 'mojo_public_application_unittests',
'type': 'executable',
'dependencies': [
- '../base/base.gyp:base',
- '../testing/gtest.gyp:gtest',
+ '../../base/base.gyp:base',
+ '../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
'mojo_public.gyp:mojo_application_standalone',
'mojo_public.gyp:mojo_utility',
'mojo_public.gyp:mojo_environment_standalone',
],
'sources': [
- 'public/cpp/application/tests/service_registry_unittest.cc',
+ 'src/mojo/public/cpp/application/tests/service_registry_unittest.cc',
],
},
{
@@ -104,11 +104,11 @@
'target_name': 'mojo_public_system_unittests',
'type': 'executable',
'dependencies': [
- '../testing/gtest.gyp:gtest',
+ '../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
'mojo_public.gyp:mojo_public_test_utils',
],
- 'include_dirs': [ '..' ],
+ 'include_dirs': [ '../..' ],
'sources': [
'<@(mojo_public_system_unittest_sources)',
],
@@ -118,23 +118,23 @@
'target_name': 'mojo_public_utility_unittests',
'type': 'executable',
'dependencies': [
- '../testing/gtest.gyp:gtest',
+ '../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
'mojo_public.gyp:mojo_public_test_utils',
'mojo_public.gyp:mojo_utility',
],
- 'include_dirs': [ '..' ],
+ 'include_dirs': [ '../..' ],
'sources': [
- 'public/cpp/utility/tests/mutex_unittest.cc',
- 'public/cpp/utility/tests/run_loop_unittest.cc',
- 'public/cpp/utility/tests/thread_unittest.cc',
+ 'src/mojo/public/cpp/utility/tests/mutex_unittest.cc',
+ 'src/mojo/public/cpp/utility/tests/run_loop_unittest.cc',
+ 'src/mojo/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',
+ 'src/mojo/public/cpp/utility/tests/mutex_unittest.cc',
+ 'src/mojo/public/cpp/utility/tests/thread_unittest.cc',
],
}],
],
@@ -144,14 +144,14 @@
'target_name': 'mojo_public_system_perftests',
'type': 'executable',
'dependencies': [
- '../base/base.gyp:base',
- '../testing/gtest.gyp:gtest',
+ '../../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',
+ 'src/mojo/public/c/system/tests/core_perftest.cc',
],
},
{
@@ -159,51 +159,51 @@
'target_name': 'mojo_system_unittests',
'type': 'executable',
'dependencies': [
- '../base/base.gyp:base',
- '../testing/gtest.gyp:gtest',
+ '../../base/base.gyp:base',
+ '../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_common_test_support',
'mojo_edk.gyp:mojo_system_impl',
],
'sources': [
- 'edk/embedder/embedder_unittest.cc',
- 'edk/embedder/platform_channel_pair_posix_unittest.cc',
- 'edk/embedder/simple_platform_shared_buffer_unittest.cc',
- 'edk/system/awakable_list_unittest.cc',
- 'edk/system/channel_endpoint_id_unittest.cc',
- 'edk/system/channel_manager_unittest.cc',
- 'edk/system/channel_unittest.cc',
- 'edk/system/core_unittest.cc',
- 'edk/system/core_test_base.cc',
- 'edk/system/core_test_base.h',
- 'edk/system/data_pipe_unittest.cc',
- 'edk/system/dispatcher_unittest.cc',
- 'edk/system/local_data_pipe_unittest.cc',
- 'edk/system/memory_unittest.cc',
- 'edk/system/message_pipe_dispatcher_unittest.cc',
- 'edk/system/message_pipe_test_utils.h',
- 'edk/system/message_pipe_test_utils.cc',
- '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/raw_channel_unittest.cc',
- 'edk/system/remote_message_pipe_unittest.cc',
- 'edk/system/run_all_unittests.cc',
- 'edk/system/shared_buffer_dispatcher_unittest.cc',
- 'edk/system/simple_dispatcher_unittest.cc',
- 'edk/system/test_utils.cc',
- 'edk/system/test_utils.h',
- 'edk/system/waiter_test_utils.cc',
- 'edk/system/waiter_test_utils.h',
- 'edk/system/waiter_unittest.cc',
- 'edk/test/multiprocess_test_helper_unittest.cc',
+ 'src/mojo/edk/embedder/embedder_unittest.cc',
+ 'src/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc',
+ 'src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc',
+ 'src/mojo/edk/system/awakable_list_unittest.cc',
+ 'src/mojo/edk/system/channel_endpoint_id_unittest.cc',
+ 'src/mojo/edk/system/channel_manager_unittest.cc',
+ 'src/mojo/edk/system/channel_unittest.cc',
+ 'src/mojo/edk/system/core_unittest.cc',
+ 'src/mojo/edk/system/core_test_base.cc',
+ 'src/mojo/edk/system/core_test_base.h',
+ 'src/mojo/edk/system/data_pipe_unittest.cc',
+ 'src/mojo/edk/system/dispatcher_unittest.cc',
+ 'src/mojo/edk/system/local_data_pipe_unittest.cc',
+ 'src/mojo/edk/system/memory_unittest.cc',
+ 'src/mojo/edk/system/message_pipe_dispatcher_unittest.cc',
+ 'src/mojo/edk/system/message_pipe_test_utils.h',
+ 'src/mojo/edk/system/message_pipe_test_utils.cc',
+ 'src/mojo/edk/system/message_pipe_unittest.cc',
+ 'src/mojo/edk/system/multiprocess_message_pipe_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',
+ 'src/mojo/edk/system/remote_message_pipe_unittest.cc',
+ 'src/mojo/edk/system/run_all_unittests.cc',
+ 'src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc',
+ 'src/mojo/edk/system/simple_dispatcher_unittest.cc',
+ 'src/mojo/edk/system/test_utils.cc',
+ 'src/mojo/edk/system/test_utils.h',
+ 'src/mojo/edk/system/waiter_test_utils.cc',
+ 'src/mojo/edk/system/waiter_test_utils.h',
+ 'src/mojo/edk/system/waiter_unittest.cc',
+ 'src/mojo/edk/test/multiprocess_test_helper_unittest.cc',
],
'conditions': [
['OS=="ios"', {
'sources!': [
- 'edk/embedder/embedder_unittest.cc',
- 'edk/system/multiprocess_message_pipe_unittest.cc',
- 'edk/test/multiprocess_test_helper_unittest.cc',
+ 'src/mojo/edk/embedder/embedder_unittest.cc',
+ 'src/mojo/edk/system/multiprocess_message_pipe_unittest.cc',
+ 'src/mojo/edk/test/multiprocess_test_helper_unittest.cc',
],
}],
],
@@ -213,19 +213,19 @@
'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',
+ '../../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_support',
'mojo_edk.gyp:mojo_system_impl',
],
'sources': [
- 'edk/system/message_pipe_perftest.cc',
- 'edk/system/message_pipe_test_utils.h',
- 'edk/system/message_pipe_test_utils.cc',
- 'edk/system/test_utils.cc',
- 'edk/system/test_utils.h',
+ 'src/mojo/edk/system/message_pipe_perftest.cc',
+ 'src/mojo/edk/system/message_pipe_test_utils.h',
+ 'src/mojo/edk/system/message_pipe_test_utils.cc',
+ 'src/mojo/edk/system/test_utils.cc',
+ 'src/mojo/edk/system/test_utils.h',
],
},
{
@@ -233,7 +233,7 @@
'target_name': 'mojo_js_unittests',
'type': 'executable',
'dependencies': [
- '../gin/gin.gyp:gin_test',
+ '../../gin/gin.gyp:gin_test',
'mojo_edk.gyp:mojo_common_test_support',
'mojo_edk.gyp:mojo_run_all_unittests',
'mojo_edk.gyp:mojo_js_lib',
@@ -242,8 +242,8 @@
'mojo_public.gyp:mojo_utility',
],
'sources': [
- 'edk/js/handle_unittest.cc',
- 'edk/js/test/run_js_tests.cc',
+ 'src/mojo/edk/js/handle_unittest.cc',
+ 'src/mojo/edk/js/test/run_js_tests.cc',
],
},
{
@@ -251,8 +251,8 @@
'target_name': 'mojo_js_integration_tests',
'type': 'executable',
'dependencies': [
- '../base/base.gyp:base',
- '../gin/gin.gyp:gin_test',
+ '../../base/base.gyp:base',
+ '../../gin/gin.gyp:gin_test',
'mojo_public.gyp:mojo_environment_standalone',
'mojo_public.gyp:mojo_public_test_interfaces',
'mojo_public.gyp:mojo_utility',
@@ -261,8 +261,8 @@
'mojo_js_to_cpp_bindings',
],
'sources': [
- 'edk/js/test/run_js_integration_tests.cc',
- 'edk/js/tests/js_to_cpp_tests',
+ 'src/mojo/edk/js/test/run_js_integration_tests.cc',
+ 'src/mojo/edk/js/tests/js_to_cpp_tests',
],
},
{
@@ -270,7 +270,7 @@
'type': 'none',
'variables': {
'mojom_files': [
- 'edk/js/tests/js_to_cpp.mojom',
+ 'src/mojo/edk/js/tests/js_to_cpp.mojom',
],
},
'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
« 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