diff options
author | James Zern <jzern@google.com> | 2013-10-28 07:58:04 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-28 07:58:04 -0700 |
commit | e5edad3dc7cb7c23ca435b5d8c9daec15ba80f07 (patch) | |
tree | 8be086b238878ed4f6ceff4f5ba2cccf1b5c139f /test | |
parent | b133cbf5f3a5be16bf3278c6c9c1490831acb9ab (diff) | |
parent | 00053aa6c4e6c6b5a879f8340d5b818548199dd0 (diff) | |
download | libvpx-e5edad3dc7cb7c23ca435b5d8c9daec15ba80f07.tar libvpx-e5edad3dc7cb7c23ca435b5d8c9daec15ba80f07.tar.gz libvpx-e5edad3dc7cb7c23ca435b5d8c9daec15ba80f07.tar.bz2 libvpx-e5edad3dc7cb7c23ca435b5d8c9daec15ba80f07.zip |
Merge "vp9_thread_test: quiet some msvc int->bool warnings"
Diffstat (limited to 'test')
-rw-r--r-- | test/vp9_thread_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/vp9_thread_test.cc b/test/vp9_thread_test.cc index 4fec46ad4..76fc9bbfb 100644 --- a/test/vp9_thread_test.cc +++ b/test/vp9_thread_test.cc @@ -39,10 +39,10 @@ int ThreadHook(void* data, void* return_value) { } TEST_P(VP9WorkerThreadTest, HookSuccess) { - EXPECT_TRUE(vp9_worker_sync(&worker_)); // should be a no-op. + EXPECT_NE(vp9_worker_sync(&worker_), 0); // should be a no-op. for (int i = 0; i < 2; ++i) { - EXPECT_TRUE(vp9_worker_reset(&worker_)); + EXPECT_NE(vp9_worker_reset(&worker_), 0); int hook_data = 0; int return_value = 1; // return successfully from the hook @@ -56,16 +56,16 @@ TEST_P(VP9WorkerThreadTest, HookSuccess) { } else { vp9_worker_launch(&worker_); } - EXPECT_TRUE(vp9_worker_sync(&worker_)); + EXPECT_NE(vp9_worker_sync(&worker_), 0); EXPECT_FALSE(worker_.had_error); EXPECT_EQ(5, hook_data); - EXPECT_TRUE(vp9_worker_sync(&worker_)); // should be a no-op. + EXPECT_NE(vp9_worker_sync(&worker_), 0); // should be a no-op. } } TEST_P(VP9WorkerThreadTest, HookFailure) { - EXPECT_TRUE(vp9_worker_reset(&worker_)); + EXPECT_NE(vp9_worker_reset(&worker_), 0); int hook_data = 0; int return_value = 0; // return failure from the hook @@ -80,14 +80,14 @@ TEST_P(VP9WorkerThreadTest, HookFailure) { vp9_worker_launch(&worker_); } EXPECT_FALSE(vp9_worker_sync(&worker_)); - EXPECT_TRUE(worker_.had_error); + EXPECT_EQ(1, worker_.had_error); // Ensure _reset() clears the error and _launch() can be called again. return_value = 1; - EXPECT_TRUE(vp9_worker_reset(&worker_)); + EXPECT_NE(vp9_worker_reset(&worker_), 0); EXPECT_FALSE(worker_.had_error); vp9_worker_launch(&worker_); - EXPECT_TRUE(vp9_worker_sync(&worker_)); + EXPECT_NE(vp9_worker_sync(&worker_), 0); EXPECT_FALSE(worker_.had_error); } |