From 652a3f3257dcb824c9be061994c8f3e22394bb40 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Tue, 4 Nov 2014 05:36:15 +0000
Subject: [PATCH] Actually mark the tests an unsupported with MSAN (not just
 ASAN)

llvm-svn: 221240
---
 .../sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp        | 2 +-
 .../sequences/list/list.modifiers/insert_iter_size_value.pass.cpp       | 2 +-
 .../containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp | 2 +-
 .../new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp      | 2 +-
 .../new.delete/new.delete.array/new_array_replace.pass.cpp              | 2 +-
 .../new.delete/new.delete.single/new_nothrow_replace.pass.cpp           | 2 +-
 .../support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp   | 2 +-
 .../facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp             | 2 +-
 libcxx/test/localization/locale.stdcvt/codecvt_utf16.pass.cpp           | 2 +-
 libcxx/test/localization/locale.stdcvt/codecvt_utf8.pass.cpp            | 2 +-
 .../locale.convenience/conversions/conversions.buffer/ctor.pass.cpp     | 2 +-
 libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp    | 2 +-
 libcxx/test/localization/locales/locale/locale.members/combine.pass.cpp | 2 +-
 .../func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp           | 2 +-
 .../func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp              | 2 +-
 .../func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp       | 2 +-
 .../func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp | 2 +-
 .../func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp          | 2 +-
 .../func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp           | 2 +-
 .../func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp    | 2 +-
 .../func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp         | 2 +-
 .../func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp           | 2 +-
 .../memory/default.allocator/allocator.members/allocate.pass.cpp        | 2 +-
 .../memory/default.allocator/allocator.members/construct.pass.cpp       | 2 +-
 .../util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp   | 2 +-
 .../util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp         | 2 +-
 .../util.smartptr.shared.const/pointer_deleter_throw.pass.cpp           | 2 +-
 .../util.smartptr.shared.const/pointer_throw.pass.cpp                   | 2 +-
 .../util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp | 2 +-
 .../util.smartptr.shared.create/make_shared.pass.cpp                    | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
index 50a861b..d69deac 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
@@ -12,7 +12,7 @@
 // template <InputIterator Iter>
 //   iterator insert(const_iterator position, Iter first, Iter last);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #if _LIBCPP_DEBUG >= 1
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
index 7ac3672..a552e1f 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
@@ -11,7 +11,7 @@
 
 // iterator insert(const_iterator position, size_type n, const value_type& x);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #if _LIBCPP_DEBUG >= 1
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
index e8fd210..093ad42 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
@@ -11,7 +11,7 @@
 
 // iterator insert(const_iterator position, const value_type& x);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #if _LIBCPP_DEBUG >= 1
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
index 117a1a5..3e3a00c 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
@@ -9,7 +9,7 @@
 
 // test operator new [] nothrow by replacing only operator new
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <new>
 #include <cstddef>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
index 62b0940..acf972b 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
@@ -9,7 +9,7 @@
 
 // test operator new[] replacement by replacing only operator new
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <new>
 #include <cstddef>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
index 7f0a32e..f2dbb98 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
@@ -9,7 +9,7 @@
 
 // test operator new nothrow by replacing only operator new
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <new>
 #include <cstddef>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
index 8ac77b1..2d411b9 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
@@ -9,7 +9,7 @@
 
 // test operator new replacement
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <new>
 #include <cstddef>
diff --git a/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp
index 4f1292f..f7c957b 100644
--- a/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp
@@ -13,7 +13,7 @@
 
 // ~ctype();
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <locale>
 #include <cassert>
diff --git a/libcxx/test/localization/locale.stdcvt/codecvt_utf16.pass.cpp b/libcxx/test/localization/locale.stdcvt/codecvt_utf16.pass.cpp
index 60d5500..7e38021 100644
--- a/libcxx/test/localization/locale.stdcvt/codecvt_utf16.pass.cpp
+++ b/libcxx/test/localization/locale.stdcvt/codecvt_utf16.pass.cpp
@@ -17,7 +17,7 @@
 //     // unspecified
 // };
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 // Not a portable test
 
diff --git a/libcxx/test/localization/locale.stdcvt/codecvt_utf8.pass.cpp b/libcxx/test/localization/locale.stdcvt/codecvt_utf8.pass.cpp
index e3275d3..cc06e95 100644
--- a/libcxx/test/localization/locale.stdcvt/codecvt_utf8.pass.cpp
+++ b/libcxx/test/localization/locale.stdcvt/codecvt_utf8.pass.cpp
@@ -17,7 +17,7 @@
 //     // unspecified
 // };
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 // Not a portable test
 
diff --git a/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp b/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp
index 43b3235..3649f15 100644
--- a/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp
+++ b/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp
@@ -14,7 +14,7 @@
 // wbuffer_convert(streambuf *bytebuf = 0, Codecvt *pcvt = new Codecvt,
 //                 state_type state = state_type());
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <locale>
 #include <codecvt>
diff --git a/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp
index 6326ce8..25db9bb 100644
--- a/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp
+++ b/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp
@@ -11,7 +11,7 @@
 
 // locale() throw();
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <locale>
 #include <new>
diff --git a/libcxx/test/localization/locales/locale/locale.members/combine.pass.cpp b/libcxx/test/localization/locales/locale/locale.members/combine.pass.cpp
index 8dd7742..8f189c7 100644
--- a/libcxx/test/localization/locales/locale/locale.members/combine.pass.cpp
+++ b/libcxx/test/localization/locales/locale/locale.members/combine.pass.cpp
@@ -11,7 +11,7 @@
 
 // template <class Facet> locale combine(const locale& other) const;
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <locale>
 #include <new>
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp
index a0b5701..b8995bf 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp
@@ -14,7 +14,7 @@
 // template <MoveConstructible  R, MoveConstructible ... ArgTypes>
 //   void swap(function<R(ArgTypes...)>&, function<R(ArgTypes...)>&);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <functional>
 #include <new>
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp
index 88d9ae6..3a43be7 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp
@@ -13,7 +13,7 @@
 
 // function(nullptr_t);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <functional>
 #include <new>
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp
index f7fc552..ba65cd3 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp
@@ -16,7 +16,7 @@
 //         && Convertible<Callable<F, ArgTypes...>::result_type
 //   operator=(F f);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <functional>
 #include <new>
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
index a02f650..38e65fc 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
@@ -13,7 +13,7 @@
 
 // template<class A> function(allocator_arg_t, const A&, const function&);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <functional>
 #include <new>
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
index 10ee8fe..2180b89 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
@@ -13,7 +13,7 @@
 
 // template<class A> function(allocator_arg_t, const A&, function&&);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <functional>
 #include <cassert>
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp
index f49f31b..2fbd7cf 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp
@@ -13,7 +13,7 @@
 
 // function(const function& f);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <functional>
 #include <new>
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
index 5d72041..cfa79e2 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
@@ -13,7 +13,7 @@
 
 // function& operator=(const function& f);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <functional>
 #include <new>
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
index 9b2d9a7..b8c597b 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
@@ -13,7 +13,7 @@
 
 // function& operator=(nullptr_t);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <functional>
 #include <new>
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
index 8c3e0f8..3c012d1 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
@@ -13,7 +13,7 @@
 
 // void swap(function& other);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <functional>
 #include <new>
diff --git a/libcxx/test/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp b/libcxx/test/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
index 8e2efc3..a4a84e8 100644
--- a/libcxx/test/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
+++ b/libcxx/test/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
@@ -12,7 +12,7 @@
 // allocator:
 // pointer allocate(size_type n, allocator<void>::const_pointer hint=0);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <memory>
 #include <new>
diff --git a/libcxx/test/utilities/memory/default.allocator/allocator.members/construct.pass.cpp b/libcxx/test/utilities/memory/default.allocator/allocator.members/construct.pass.cpp
index 2da6fc3..b9a1749 100644
--- a/libcxx/test/utilities/memory/default.allocator/allocator.members/construct.pass.cpp
+++ b/libcxx/test/utilities/memory/default.allocator/allocator.members/construct.pass.cpp
@@ -12,7 +12,7 @@
 // allocator:
 // template <class... Args> void construct(pointer p, Args&&... args);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <memory>
 #include <new>
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
index fc3fd04..28e49d6 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
@@ -11,7 +11,7 @@
 
 // template<class Y> explicit shared_ptr(auto_ptr<Y>&& r);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <memory>
 #include <new>
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
index 04fea40..a8588cc 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
@@ -13,7 +13,7 @@
 
 // template<class D> shared_ptr(nullptr_t, D d);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <memory>
 #include <cassert>
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
index 9ce8feb..b024f7e 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
@@ -13,7 +13,7 @@
 
 // template<class Y, class D> shared_ptr(Y* p, D d);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <memory>
 #include <cassert>
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
index 17569ae..28fb8bf 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
@@ -11,7 +11,7 @@
 
 // template<class Y> explicit shared_ptr(Y* p);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <memory>
 #include <new>
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
index 58ea309..d3b2859 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
@@ -11,7 +11,7 @@
 
 // template <class Y, class D> explicit shared_ptr(unique_ptr<Y, D>&&r);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <memory>
 #include <new>
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
index a3bf838..30a4984 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
@@ -13,7 +13,7 @@
 
 // template<class T, class... Args> shared_ptr<T> make_shared(Args&&... args);
 
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan, msan
 
 #include <memory>
 #include <new>
-- 
2.7.4