11 files changed, 16 insertions, 3 deletions
diff --git a/compiler-rt/test/msan/dtls_test.c b/compiler-rt/test/msan/dtls_test.c
index 49d95c44c1d..a69c45f07c2 100644
--- a/compiler-rt/test/msan/dtls_test.c
+++ b/compiler-rt/test/msan/dtls_test.c
@@ -5,6 +5,8 @@
    Regression test for a bug in msan/glibc integration,
    see https://sourceware.org/bugzilla/show_bug.cgi?id=16291
    and https://github.com/google/sanitizers/issues/547
+
+   XFAIL: freebsd
 */
 
 #ifndef BUILD_SO
diff --git a/compiler-rt/test/msan/getutent.cc b/compiler-rt/test/msan/getutent.cc
index 36f9e1f1f7e..b57101068dd 100644
--- a/compiler-rt/test/msan/getutent.cc
+++ b/compiler-rt/test/msan/getutent.cc
@@ -1,14 +1,18 @@
 // RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
 
+#ifndef __FreeBSD__
 #include <utmp.h>
+#endif
 #include <utmpx.h>
 #include <sanitizer/msan_interface.h>
 
 int main(void) {
+#ifndef __FreeBSD__
   setutent();
   while (struct utmp *ut = getutent())
     __msan_check_mem_is_initialized(ut, sizeof(*ut));
   endutent();
+#endif
 
   setutxent();
   while (struct utmpx *utx = getutxent())
diff --git a/compiler-rt/test/msan/iconv.cc b/compiler-rt/test/msan/iconv.cc
index 7beb6a01877..7713cb8e5f4 100644
--- a/compiler-rt/test/msan/iconv.cc
+++ b/compiler-rt/test/msan/iconv.cc
@@ -15,7 +15,7 @@ int main(void) {
   char inbuf_[100];
   strcpy(inbuf_, "sample text");
   char outbuf_[100];
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__NetBSD__)
   // Some OSes expect the 2nd argument of iconv(3) to be of type const char **
   const char *inbuf = inbuf_;
 #else
diff --git a/compiler-rt/test/msan/lit.cfg b/compiler-rt/test/msan/lit.cfg
index cac26099987..550d04d0812 100644
--- a/compiler-rt/test/msan/lit.cfg
+++ b/compiler-rt/test/msan/lit.cfg
@@ -29,7 +29,7 @@ config.substitutions.append( ("%clangxx_msan ", build_invocation(clang_msan_cxxf
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
 
-if config.host_os not in ['Linux', 'NetBSD']:
+if config.host_os not in ['Linux', 'NetBSD', 'FreeBSD']:
   config.unsupported = True
 
 # For mips64, mips64el we have forced store_context_size to 1 because these
diff --git a/compiler-rt/test/msan/pthread_getattr_np_deadlock.cc b/compiler-rt/test/msan/pthread_getattr_np_deadlock.cc
index 0f52280856c..98eaf14150b 100644
--- a/compiler-rt/test/msan/pthread_getattr_np_deadlock.cc
+++ b/compiler-rt/test/msan/pthread_getattr_np_deadlock.cc
@@ -1,6 +1,7 @@
 // RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && %run %t
 
 // Regression test for a deadlock in pthread_getattr_np
+// UNSUPPORTED: freebsd
 
 #include <assert.h>
 #include <pthread.h>
diff --git a/compiler-rt/test/msan/pvalloc.cc b/compiler-rt/test/msan/pvalloc.cc
index 7c406df79bb..649719a88cb 100644
--- a/compiler-rt/test/msan/pvalloc.cc
+++ b/compiler-rt/test/msan/pvalloc.cc
@@ -4,6 +4,7 @@
 // RUN: MSAN_OPTIONS=allocator_may_return_null=0 not %run %t psm1 2>&1 | FileCheck %s
 // RUN: MSAN_OPTIONS=allocator_may_return_null=1     %run %t psm1 2>&1
 
+// pvalloc is Linux only
 // UNSUPPORTED: win32, freebsd, netbsd
 
 // Checks that pvalloc overflows are caught. If the allocator is allowed to
diff --git a/compiler-rt/test/msan/strlen_of_shadow.cc b/compiler-rt/test/msan/strlen_of_shadow.cc
index b9cf5f065d2..718cc08dc1f 100644
--- a/compiler-rt/test/msan/strlen_of_shadow.cc
+++ b/compiler-rt/test/msan/strlen_of_shadow.cc
@@ -2,6 +2,8 @@
 
 // Check that strlen() and similar intercepted functions can be called on shadow
 // memory.
+// The mem_to_shadow's part might need rework
+// XFAIL: freebsd
 
 #include <assert.h>
 #include <stdint.h>
diff --git a/compiler-rt/test/msan/textdomain.cc b/compiler-rt/test/msan/textdomain.cc
index 0a81542319d..478b0993f83 100644
--- a/compiler-rt/test/msan/textdomain.cc
+++ b/compiler-rt/test/msan/textdomain.cc
@@ -1,4 +1,5 @@
 // RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
+// textdomain() is not a part of libc on FreeBSD and NetBSD.
 // UNSUPPORTED: netbsd, freebsd
 
 #include <libintl.h>
diff --git a/compiler-rt/test/msan/tls_reuse.cc b/compiler-rt/test/msan/tls_reuse.cc
index 78a328fa3ce..9c2ee975cb5 100644
--- a/compiler-rt/test/msan/tls_reuse.cc
+++ b/compiler-rt/test/msan/tls_reuse.cc
@@ -1,6 +1,7 @@
 // RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 // Check that when TLS block is reused between threads, its shadow is cleaned.
+// XFAIL: freebsd
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/msan/tsearch.cc b/compiler-rt/test/msan/tsearch.cc
index 0d8ee8f35b2..50a2efb31fa 100644
--- a/compiler-rt/test/msan/tsearch.cc
+++ b/compiler-rt/test/msan/tsearch.cc
@@ -1,7 +1,7 @@
 // RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
 
 // tdestroy is a GNU extension
-// UNSUPPORTED: netbsd
+// UNSUPPORTED: netbsd, freebsd
 
 #include <assert.h>
 #include <search.h>
diff --git a/compiler-rt/test/msan/tzset.cc b/compiler-rt/test/msan/tzset.cc
index 05915e047e1..86805cd56c5 100644
--- a/compiler-rt/test/msan/tzset.cc
+++ b/compiler-rt/test/msan/tzset.cc
@@ -1,4 +1,5 @@
 // RUN: %clangxx_msan -O0 %s -o %t && %run %t
+// XFAIL: freebsd
 
 #include <stdlib.h>
 #include <string.h>