From c9b8108260caab2c772a7966f0880718a8df3686 Mon Sep 17 00:00:00 2001 From: Viktor Kutuzov Date: Wed, 21 Jan 2015 09:46:21 +0000 Subject: [Msan] Fix the accept unit test to pass on FreeBSD Differential Revision: http://reviews.llvm.org/D7083 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@226650 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/msan/tests/msan_test.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/msan/tests') diff --git a/lib/msan/tests/msan_test.cc b/lib/msan/tests/msan_test.cc index e7b4a813a..6aba0de24 100644 --- a/lib/msan/tests/msan_test.cc +++ b/lib/msan/tests/msan_test.cc @@ -868,8 +868,11 @@ TEST(MemorySanitizer, accept) { res = fcntl(connect_socket, F_SETFL, O_NONBLOCK); ASSERT_EQ(0, res); res = connect(connect_socket, (struct sockaddr *)&sai, sizeof(sai)); - ASSERT_EQ(-1, res); - ASSERT_EQ(EINPROGRESS, errno); + // On FreeBSD this connection completes immediately. + if (res != 0) { + ASSERT_EQ(-1, res); + ASSERT_EQ(EINPROGRESS, errno); + } __msan_poison(&sai, sizeof(sai)); int new_sock = accept(listen_socket, (struct sockaddr *)&sai, &sz); -- cgit v1.2.3