summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2013-03-06 15:41:35 +0000
committerReid Kleckner <reid@kleckner.net>2013-03-06 15:41:35 +0000
commit3c27d7f4e3413dd4f2e50eebac7c8f9bd916c1ca (patch)
treeabc794122dfdd019f6a9f47549d8d62423b57822
parent5d3dcb8fa4947ebeab61bcf512ab352576d0fb41 (diff)
[msan] pthread_join() returns int, not void*
pthread_join() returns an error code, not the result of the pthread_create() function like I thought. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@176554 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/sanitizer_common/tests/sanitizer_allocator_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sanitizer_common/tests/sanitizer_allocator_test.cc b/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
index 8b8fb7ead..ad1aa593e 100644
--- a/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
@@ -516,7 +516,7 @@ TEST(Allocator, AllocatorCacheDeallocNewThread) {
params->class_id = class_id;
pthread_t t;
EXPECT_EQ(0, pthread_create(&t, 0, DeallocNewThreadWorker, params));
- EXPECT_EQ(NULL, pthread_join(t, 0));
+ EXPECT_EQ(0, pthread_join(t, 0));
}
#endif