Chromium Code Reviews| Index: mojo/public/c/system/tests/core_unittest_pure_c.c |
| diff --git a/mojo/public/c/system/tests/core_unittest_pure_c.c b/mojo/public/c/system/tests/core_unittest_pure_c.c |
| index 33de6883f9654b3e5fb59863a826d7acb83d8fea..2dbf4dfe1d610b8e39a0ee5605266fac8fb68613 100644 |
| --- a/mojo/public/c/system/tests/core_unittest_pure_c.c |
| +++ b/mojo/public/c/system/tests/core_unittest_pure_c.c |
| @@ -61,8 +61,15 @@ const char* MinimalCTest(void) { |
| EXPECT_EQ(MOJO_RESULT_OK, MojoCreateMessagePipe(NULL, &handle0, &handle1)); |
| signals = MOJO_HANDLE_SIGNAL_READABLE; |
| + uint32_t result_index; |
|
viettrungluu
2014/12/02 23:57:34
"
|
| + struct MojoHandleSignalsState states[1]; |
| EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, |
| - MojoWaitMany(&handle0, &signals, 1, 1)); |
| + MojoNewWaitMany(&handle0, &signals, 1, 1, &result_index, states)); |
| + |
| + EXPECT_EQ(0u, result_index); |
| + EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, states[0].satisfied_signals); |
| + EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE, |
| + states[0].satisfiable_signals); |
| EXPECT_EQ(MOJO_RESULT_OK, |
| MojoWriteMessage(handle0, |
| @@ -72,9 +79,16 @@ const char* MinimalCTest(void) { |
| 0u, |
| MOJO_WRITE_DATA_FLAG_NONE)); |
| + struct MojoHandleSignalsState state; |
| EXPECT_EQ( |
| MOJO_RESULT_OK, |
| - MojoWait(handle1, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); |
| + MojoNewWait(handle1, MOJO_HANDLE_SIGNAL_READABLE, |
| + MOJO_DEADLINE_INDEFINITE, &state)); |
| + |
| + EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE, |
| + state.satisfied_signals); |
| + EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE, |
| + state.satisfiable_signals); |
| num_bytes = (uint32_t)sizeof(buffer); |
| EXPECT_EQ(MOJO_RESULT_OK, |