Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/edk/embedder/embedder.h" | 5 #include "mojo/edk/embedder/embedder.h" |
| 6 | 6 |
| 7 #include <string.h> | 7 #include <string.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 275 // 3. "FOO" | 275 // 3. "FOO" |
| 276 // 4. "Bar"+mp1 | 276 // 4. "Bar"+mp1 |
| 277 // 5. (close) | 277 // 5. (close) |
| 278 // 6. (close) | 278 // 6. (close) |
| 279 // 7. "baz" | 279 // 7. "baz" |
| 280 // 8. (closed) | 280 // 8. (closed) |
| 281 // 9. "quux"+mp2 | 281 // 9. "quux"+mp2 |
| 282 // 10. (close) | 282 // 10. (close) |
| 283 // 11. (wait/cl.) | 283 // 11. (wait/cl.) |
| 284 // 12. (wait/cl.) | 284 // 12. (wait/cl.) |
| 285 TEST_F(EmbedderTest, MultiprocessChannels) { | 285 #if defined(OS_ANDROID) |
| 286 // Android multi-process tests are not executing the new process. This is flaky. | |
|
viettrungluu
2014/11/25 16:45:09
Maybe just say "On Android we can't exec(), so we
qsr
2014/11/25 17:17:49
We can exec, but with the current infrastructure f
| |
| 287 #define MAYBE_MultiprocessChannels DISABLED_MultiprocessChannels | |
| 288 #else | |
| 289 #define MAYBE_MultiprocessChannels MultiprocessChannels | |
| 290 #endif // defined(OS_ANDROID) | |
| 291 TEST_F(EmbedderTest, MAYBE_MultiprocessChannels) { | |
| 286 mojo::embedder::test::InitWithSimplePlatformSupport(); | 292 mojo::embedder::test::InitWithSimplePlatformSupport(); |
| 287 mojo::test::MultiprocessTestHelper multiprocess_test_helper; | 293 mojo::test::MultiprocessTestHelper multiprocess_test_helper; |
| 288 multiprocess_test_helper.StartChild("MultiprocessChannelsClient"); | 294 multiprocess_test_helper.StartChild("MultiprocessChannelsClient"); |
| 289 | 295 |
| 290 { | 296 { |
| 291 ScopedTestChannel server_channel( | 297 ScopedTestChannel server_channel( |
| 292 test_io_thread()->task_runner(), | 298 test_io_thread()->task_runner(), |
| 293 multiprocess_test_helper.server_platform_handle.Pass()); | 299 multiprocess_test_helper.server_platform_handle.Pass()); |
| 294 MojoHandle server_mp = server_channel.bootstrap_message_pipe(); | 300 MojoHandle server_mp = server_channel.bootstrap_message_pipe(); |
| 295 EXPECT_NE(server_mp, MOJO_HANDLE_INVALID); | 301 EXPECT_NE(server_mp, MOJO_HANDLE_INVALID); |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 484 | 490 |
| 485 EXPECT_TRUE(test::Shutdown()); | 491 EXPECT_TRUE(test::Shutdown()); |
| 486 } | 492 } |
| 487 | 493 |
| 488 // TODO(vtl): Test immediate write & close. | 494 // TODO(vtl): Test immediate write & close. |
| 489 // TODO(vtl): Test broken-connection cases. | 495 // TODO(vtl): Test broken-connection cases. |
| 490 | 496 |
| 491 } // namespace | 497 } // namespace |
| 492 } // namespace embedder | 498 } // namespace embedder |
| 493 } // namespace mojo | 499 } // namespace mojo |
| OLD | NEW |