| 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 aee91375c0c37517a08f6ec1750a2ba719b8fd53..e607879883d112fe6519e701ac42b23d271cb14b 100644
|
| --- a/third_party/mojo/mojo_edk_tests.gyp
|
| +++ b/third_party/mojo/mojo_edk_tests.gyp
|
| @@ -45,25 +45,25 @@
|
| 'mojo_public.gyp:mojo_utility',
|
| ],
|
| 'sources': [
|
| - '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/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',
|
| - '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',
|
| + '../../mojo/public/cpp/bindings/tests/array_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/buffer_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/connector_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/container_test_util.cc',
|
| + '../../mojo/public/cpp/bindings/tests/equals_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/handle_passing_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/map_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/message_queue.cc',
|
| + '../../mojo/public/cpp/bindings/tests/message_queue.h',
|
| + '../../mojo/public/cpp/bindings/tests/request_response_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/router_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/sample_service_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/string_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/struct_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/type_conversion_unittest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/validation_unittest.cc',
|
| ],
|
| },
|
| {
|
| @@ -81,7 +81,7 @@
|
| 'mojo_public.gyp:mojo_utility',
|
| ],
|
| 'sources': [
|
| - 'src/mojo/public/cpp/bindings/tests/bindings_perftest.cc',
|
| + '../../mojo/public/cpp/bindings/tests/bindings_perftest.cc',
|
| ],
|
| },
|
| {
|
| @@ -98,10 +98,10 @@
|
| ],
|
| 'include_dirs': [ '../..' ],
|
| 'sources': [
|
| - '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',
|
| + '../../mojo/public/cpp/environment/tests/async_wait_unittest.cc',
|
| + '../../mojo/public/cpp/environment/tests/async_waiter_unittest.cc',
|
| + '../../mojo/public/cpp/environment/tests/logger_unittest.cc',
|
| + '../../mojo/public/cpp/environment/tests/logging_unittest.cc',
|
| ],
|
| },
|
| {
|
| @@ -132,16 +132,16 @@
|
| ],
|
| 'include_dirs': [ '../..' ],
|
| 'sources': [
|
| - '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',
|
| + '../../mojo/public/cpp/utility/tests/mutex_unittest.cc',
|
| + '../../mojo/public/cpp/utility/tests/run_loop_unittest.cc',
|
| + '../../mojo/public/cpp/utility/tests/thread_unittest.cc',
|
| ],
|
| 'conditions': [
|
| # See crbug.com/342893:
|
| ['OS=="win"', {
|
| 'sources!': [
|
| - 'src/mojo/public/cpp/utility/tests/mutex_unittest.cc',
|
| - 'src/mojo/public/cpp/utility/tests/thread_unittest.cc',
|
| + '../../mojo/public/cpp/utility/tests/mutex_unittest.cc',
|
| + '../../mojo/public/cpp/utility/tests/thread_unittest.cc',
|
| ],
|
| }],
|
| ],
|
| @@ -158,7 +158,7 @@
|
| 'mojo_public.gyp:mojo_utility',
|
| ],
|
| 'sources': [
|
| - 'src/mojo/public/c/system/tests/core_perftest.cc',
|
| + '../../mojo/public/c/system/tests/core_perftest.cc',
|
| ],
|
| },
|
| {
|
| @@ -182,9 +182,9 @@
|
| 'src/mojo/edk/system/channel_test_base.cc',
|
| 'src/mojo/edk/system/channel_test_base.h',
|
| '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/core_unittest.cc',
|
| 'src/mojo/edk/system/data_pipe_impl_unittest.cc',
|
| 'src/mojo/edk/system/data_pipe_unittest.cc',
|
| 'src/mojo/edk/system/dispatcher_unittest.cc',
|
|
|