summaryrefslogtreecommitdiffstats
path: root/liblog
diff options
context:
space:
mode:
authorAlan Stokes2017-08-25 11:50:50 -0500
committerandroid-build-merger2017-08-25 11:50:50 -0500
commite751059975101f94c13e7e27fd2284b6e13d4d47 (patch)
treed1453013d5a53c2ca70c9d59153f00d0537e586f /liblog
parent328ba7c8e64fff558c03d5f804d67d18e42a1adf (diff)
parent32636f0f4c6a5e0ac948c901544c653d137e6448 (diff)
downloadplatform-system-core-e751059975101f94c13e7e27fd2284b6e13d4d47.tar.gz
platform-system-core-e751059975101f94c13e7e27fd2284b6e13d4d47.tar.xz
platform-system-core-e751059975101f94c13e7e27fd2284b6e13d4d47.zip
Merge "Small liblog test fixes & readability improvements." am: 332370d14d am: 511cc67633
am: 32636f0f4c Change-Id: I5dd5e1b7267ff3f96aa264eede616dfb30b68884
Diffstat (limited to 'liblog')
-rw-r--r--liblog/tests/log_id_test.cpp4
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 }