diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-08-07 15:03:17 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-08-07 15:03:17 +0400 |
| commit | e49429ebd2fe0b7c24e2ee533311dd97f6febd1f (patch) | |
| tree | d958c7f24638bc13ce3f17211e914828bad2fc85 /deps/uv/test/test-barrier.c | |
| parent | aa3b4b4d106415b3afbc31df0db2476a04c997f1 (diff) | |
| download | android-node-v8-e49429ebd2fe0b7c24e2ee533311dd97f6febd1f.tar.gz android-node-v8-e49429ebd2fe0b7c24e2ee533311dd97f6febd1f.tar.bz2 android-node-v8-e49429ebd2fe0b7c24e2ee533311dd97f6febd1f.zip | |
deps: update libuv to v0.11.28
Diffstat (limited to 'deps/uv/test/test-barrier.c')
| -rw-r--r-- | deps/uv/test/test-barrier.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/deps/uv/test/test-barrier.c b/deps/uv/test/test-barrier.c index 25a55d6cfe..dfd2dbdef1 100644 --- a/deps/uv/test/test-barrier.c +++ b/deps/uv/test/test-barrier.c @@ -41,10 +41,6 @@ static void worker(void* arg) { uv_sleep(c->delay); c->worker_barrier_wait_rval = uv_barrier_wait(&c->barrier); - if (c->worker_barrier_wait_rval == 1) { - uv_barrier_destroy(&c->barrier); - ASSERT(c->main_barrier_wait_rval == 0); - } } @@ -53,21 +49,16 @@ TEST_IMPL(barrier_1) { worker_config wc; memset(&wc, 0, sizeof(wc)); - wc.main_barrier_wait_rval = -1; - wc.worker_barrier_wait_rval = -1; ASSERT(0 == uv_barrier_init(&wc.barrier, 2)); ASSERT(0 == uv_thread_create(&thread, worker, &wc)); uv_sleep(100); - wc.main_barrier_wait_rval = uv_barrier_wait(&wc.barrier); - if (wc.main_barrier_wait_rval == 1) { - uv_barrier_destroy(&wc.barrier); - ASSERT(wc.worker_barrier_wait_rval == 0); - } ASSERT(0 == uv_thread_join(&thread)); + uv_barrier_destroy(&wc.barrier); + ASSERT(1 == (wc.main_barrier_wait_rval ^ wc.worker_barrier_wait_rval)); return 0; @@ -80,19 +71,15 @@ TEST_IMPL(barrier_2) { memset(&wc, 0, sizeof(wc)); wc.delay = 100; - wc.main_barrier_wait_rval = -1; - wc.worker_barrier_wait_rval = -1; ASSERT(0 == uv_barrier_init(&wc.barrier, 2)); ASSERT(0 == uv_thread_create(&thread, worker, &wc)); wc.main_barrier_wait_rval = uv_barrier_wait(&wc.barrier); - if (wc.main_barrier_wait_rval == 1) { - uv_barrier_destroy(&wc.barrier); - ASSERT(wc.worker_barrier_wait_rval == 0); - } ASSERT(0 == uv_thread_join(&thread)); + uv_barrier_destroy(&wc.barrier); + ASSERT(1 == (wc.main_barrier_wait_rval ^ wc.worker_barrier_wait_rval)); return 0; @@ -104,19 +91,15 @@ TEST_IMPL(barrier_3) { worker_config wc; memset(&wc, 0, sizeof(wc)); - wc.main_barrier_wait_rval = -1; - wc.worker_barrier_wait_rval = -1; ASSERT(0 == uv_barrier_init(&wc.barrier, 2)); ASSERT(0 == uv_thread_create(&thread, worker, &wc)); wc.main_barrier_wait_rval = uv_barrier_wait(&wc.barrier); - if (wc.main_barrier_wait_rval == 1) { - uv_barrier_destroy(&wc.barrier); - ASSERT(wc.worker_barrier_wait_rval == 0); - } ASSERT(0 == uv_thread_join(&thread)); + uv_barrier_destroy(&wc.barrier); + ASSERT(1 == (wc.main_barrier_wait_rval ^ wc.worker_barrier_wait_rval)); return 0; |