diff options
| author | Alan Stokes | 2017-08-25 11:46:22 -0500 |
|---|---|---|
| committer | android-build-merger | 2017-08-25 11:46:22 -0500 |
| commit | 32636f0f4c6a5e0ac948c901544c653d137e6448 (patch) | |
| tree | 6b66406f5f85c3c9b47299e874ecf906008e8370 /liblog | |
| parent | 50289204e55d33a1fe0c6c2a291f14167638b6e5 (diff) | |
| parent | 511cc676331b3bdf9fdd68b8641ac39e01cbc824 (diff) | |
| download | platform-system-core-32636f0f4c6a5e0ac948c901544c653d137e6448.tar.gz platform-system-core-32636f0f4c6a5e0ac948c901544c653d137e6448.tar.xz platform-system-core-32636f0f4c6a5e0ac948c901544c653d137e6448.zip | |
Merge "Small liblog test fixes & readability improvements." am: 332370d14d
am: 511cc67633
Change-Id: I9495eb03997b7759786f02d24b92657381053f2f
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/tests/log_id_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/liblog/tests/log_id_test.cpp b/liblog/tests/log_id_test.cpp index c56fa8b8a..9fb5a2c75 100644 --- a/liblog/tests/log_id_test.cpp +++ b/liblog/tests/log_id_test.cpp | |||
| @@ -89,12 +89,12 @@ TEST(liblog, concurrent_name(__android_log_buf_print, NUM_CONCURRENT)) { | |||
| 89 | ASSERT_EQ(0, pthread_create(&t[i], NULL, ConcurrentPrintFn, | 89 | ASSERT_EQ(0, pthread_create(&t[i], NULL, ConcurrentPrintFn, |
| 90 | reinterpret_cast<void*>(i))); | 90 | reinterpret_cast<void*>(i))); |
| 91 | } | 91 | } |
| 92 | int ret = 0; | 92 | int ret = 1; |
| 93 | for (i = 0; i < NUM_CONCURRENT; i++) { | 93 | for (i = 0; i < NUM_CONCURRENT; i++) { |
| 94 | void* result; | 94 | void* result; |
| 95 | ASSERT_EQ(0, pthread_join(t[i], &result)); | 95 | ASSERT_EQ(0, pthread_join(t[i], &result)); |
| 96 | int this_result = reinterpret_cast<uintptr_t>(result); | 96 | int this_result = reinterpret_cast<uintptr_t>(result); |
| 97 | if ((0 == ret) && (0 != this_result)) { | 97 | if ((0 < ret) && (ret != this_result)) { |
| 98 | ret = this_result; | 98 | ret = this_result; |
| 99 | } | 99 | } |
| 100 | } | 100 | } |