From 07a4bec1dd600078aa8ec64f5aaeae9a7cc5d7d8 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Tue, 10 Mar 2015 20:46:04 +0000 Subject: [PATCH] Use generic feature name for sanitizers that replace new and delete git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@231841 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/libcxx/test/config.py | 3 +++ .../list/list.modifiers/insert_iter_iter_iter.pass.cpp | 2 +- .../list/list.modifiers/insert_iter_size_value.pass.cpp | 2 +- .../sequences/list/list.modifiers/insert_iter_value.pass.cpp | 2 +- .../new.delete/new.delete.array/new_array.pass.cpp | 2 +- .../new.delete/new.delete.array/new_array_nothrow.pass.cpp | 2 +- .../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.array/sized_delete_array.pass.cpp | 2 +- .../new.delete.array/sized_delete_array_nothrow.pass.cpp | 2 +- .../sized_delete_array_nothrow_replace.pass.cpp | 2 +- .../new.delete.array/sized_delete_array_replace.pass.cpp | 2 +- .../support.dynamic/new.delete/new.delete.single/new.pass.cpp | 2 +- .../new.delete/new.delete.single/new_nothrow.pass.cpp | 2 +- .../new.delete/new.delete.single/new_nothrow_replace.pass.cpp | 2 +- .../new.delete/new.delete.single/new_replace.pass.cpp | 2 +- .../new.delete/new.delete.single/sized_delete.pass.cpp | 2 +- .../new.delete/new.delete.single/sized_delete_nothrow.pass.cpp | 2 +- .../new.delete.single/sized_delete_nothrow_replace.pass.cpp | 2 +- .../new.delete/new.delete.single/sized_delete_replace.pass.cpp | 2 +- .../localization/locales/locale/locale.cons/assign.pass.cpp | 2 +- .../locales/locale/locale.cons/char_pointer.pass.cpp | 2 +- test/std/localization/locales/locale/locale.cons/copy.pass.cpp | 2 +- .../locale/locale.cons/locale_char_pointer_cat.pass.cpp | 2 +- .../locales/locale/locale.cons/locale_facetptr.pass.cpp | 2 +- .../locales/locale/locale.cons/locale_locale_cat.pass.cpp | 2 +- .../locales/locale/locale.cons/locale_string_cat.pass.cpp | 2 +- .../localization/locales/locale/locale.cons/string.pass.cpp | 2 +- .../std/strings/basic.string/string.capacity/max_size.pass.cpp | 2 +- .../thread.thread.class/thread.thread.constr/F.pass.cpp | 2 +- .../util.smartptr.shared.const/auto_ptr.pass.cpp | 2 +- .../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.const/unique_ptr.pass.cpp | 2 +- test/support/count_new.hpp | 3 ++- 36 files changed, 39 insertions(+), 35 deletions(-) diff --git a/test/libcxx/test/config.py b/test/libcxx/test/config.py index 9fd974bb2..a974adf7f 100644 --- a/test/libcxx/test/config.py +++ b/test/libcxx/test/config.py @@ -544,6 +544,7 @@ class Configuration(object): if llvm_symbolizer is not None: self.env['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer self.config.available_features.add('asan') + self.config.available_features.add('sanitizer-new-delete') elif san == 'Memory' or san == 'MemoryWithOrigins': self.cxx.flags += ['-fsanitize=memory'] if san == 'MemoryWithOrigins': @@ -552,6 +553,7 @@ class Configuration(object): if llvm_symbolizer is not None: self.env['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer self.config.available_features.add('msan') + self.config.available_features.add('sanitizer-new-delete') elif san == 'Undefined': self.cxx.flags += ['-fsanitize=undefined', '-fno-sanitize=vptr,function', @@ -561,6 +563,7 @@ class Configuration(object): elif san == 'Thread': self.cxx.flags += ['-fsanitize=thread'] self.config.available_features.add('tsan') + self.config.available_features.add('sanitizer-new-delete') else: self.lit_config.fatal('unsupported value for ' 'use_sanitizer: {0}'.format(san)) diff --git a/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp b/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp index d69deac36..a7f1917ab 100644 --- a/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp +++ b/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp @@ -12,7 +12,7 @@ // template // iterator insert(const_iterator position, Iter first, Iter last); -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp b/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp index a552e1f83..eeb74b83e 100644 --- a/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp +++ b/test/std/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, msan +// UNSUPPORTED: sanitizer-new-delete #if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp b/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp index 093ad423c..406e93a37 100644 --- a/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp +++ b/test/std/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, msan +// UNSUPPORTED: sanitizer-new-delete #if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp index 052d88f19..5a87c0738 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp @@ -9,7 +9,7 @@ // test operator new[] // NOTE: asan and msan will not call the new handler. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp index 259f5b0e4..b0db4a8e5 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp @@ -9,7 +9,7 @@ // test operator new [] (nothrow) // NOTE: asan and msan will not call the new handler. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp index 3e3a00ca6..105c7a93f 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp +++ b/test/std/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, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp index acf972b13..92bd7b952 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp +++ b/test/std/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, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array.pass.cpp index 57e6cd6ff..d49915730 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array.pass.cpp @@ -9,7 +9,7 @@ // test sized operator delete[] by replacing unsized operator delete[]. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_nothrow.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_nothrow.pass.cpp index 05dc013a0..f73373d4a 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_nothrow.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_nothrow.pass.cpp @@ -10,7 +10,7 @@ // test nothrow sized operator delete[] by replacing // nothrow unsized operator delete[]. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_nothrow_replace.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_nothrow_replace.pass.cpp index 6a5320bf6..59e8637f2 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_nothrow_replace.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_nothrow_replace.pass.cpp @@ -12,7 +12,7 @@ // Note that sized delete operator definitions below are simply ignored // when sized deallocation is not supported, e.g., prior to C++14. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_replace.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_replace.pass.cpp index 752cd70d2..e09f31258 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_replace.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_replace.pass.cpp @@ -12,7 +12,7 @@ // Note that sized delete operator definitions below are simply ignored // when sized deallocation is not supported, e.g., prior to C++14. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp index 3ba71dd90..58aa3f2d5 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp @@ -10,7 +10,7 @@ // test operator new // asan and msan will not call the new handler. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp index c76bfa0bf..8c095ad32 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp @@ -10,7 +10,7 @@ // test operator new (nothrow) // asan and msan will not call the new handler. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp index f2dbb98f8..cd70f9094 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp +++ b/test/std/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, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp index 2d411b9e8..0df3a9370 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp @@ -9,7 +9,7 @@ // test operator new replacement -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete.pass.cpp index 6e3a2352b..82dc96065 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete.pass.cpp @@ -9,7 +9,7 @@ // test sized operator delete by replacing unsized operator delete. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_nothrow.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_nothrow.pass.cpp index 690e8afec..353ea8dba 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_nothrow.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_nothrow.pass.cpp @@ -10,7 +10,7 @@ // test nothrow sized operator delete by replacing // nothrow unsized operator delete. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_nothrow_replace.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_nothrow_replace.pass.cpp index b5eb9f259..2d39f433b 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_nothrow_replace.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_nothrow_replace.pass.cpp @@ -12,7 +12,7 @@ // Note that sized delete operator definitions below are simply ignored // when sized deallocation is not supported, e.g., prior to C++14. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_replace.pass.cpp b/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_replace.pass.cpp index 4e0d7c7ae..5cf99eacd 100644 --- a/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_replace.pass.cpp +++ b/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_replace.pass.cpp @@ -12,7 +12,7 @@ // Note that sized delete operator definitions below are simply ignored // when sized deallocation is not supported, e.g., prior to C++14. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/localization/locales/locale/locale.cons/assign.pass.cpp b/test/std/localization/locales/locale/locale.cons/assign.pass.cpp index 75ce9b565..80afe1e46 100644 --- a/test/std/localization/locales/locale/locale.cons/assign.pass.cpp +++ b/test/std/localization/locales/locale/locale.cons/assign.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: locale.ru_RU.UTF-8 -// UNSUPPORTED: msan, asan +// UNSUPPORTED: sanitizer-new-delete // diff --git a/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp b/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp index 01857a4c0..3567bf56c 100644 --- a/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp +++ b/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp @@ -9,7 +9,7 @@ // REQUIRES: locale.ru_RU.UTF-8 // REQUIRES: locale.zh_CN.UTF-8 -// UNSUPPORTED: msan, asan +// UNSUPPORTED: sanitizer-new-delete // diff --git a/test/std/localization/locales/locale/locale.cons/copy.pass.cpp b/test/std/localization/locales/locale/locale.cons/copy.pass.cpp index 629c9e6b9..0760cc46c 100644 --- a/test/std/localization/locales/locale/locale.cons/copy.pass.cpp +++ b/test/std/localization/locales/locale/locale.cons/copy.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: locale.fr_FR.UTF-8 -// UNSUPPORTED: msan, asan +// UNSUPPORTED: sanitizer-new-delete // diff --git a/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp b/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp index eaadbb9a2..2a9e20fcf 100644 --- a/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp +++ b/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp @@ -9,7 +9,7 @@ // REQUIRES: locale.en_US.UTF-8 // REQUIRES: locale.ru_RU.UTF-8 -// UNSUPPORTED: msan, asan +// UNSUPPORTED: sanitizer-new-delete // diff --git a/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp b/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp index 8b83bc0b8..fb6e39e57 100644 --- a/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp +++ b/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: locale.ru_RU.UTF-8 -// UNSUPPORTED: msan, asan +// UNSUPPORTED: sanitizer-new-delete // diff --git a/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp b/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp index 05f06198a..fa87eb20e 100644 --- a/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp +++ b/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp @@ -9,7 +9,7 @@ // REQUIRES: locale.en_US.UTF-8 // REQUIRES: locale.ru_RU.UTF-8 -// UNSUPPORTED: msan, asan +// UNSUPPORTED: sanitizer-new-delete // diff --git a/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp b/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp index 66be76d95..d48a572a2 100644 --- a/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp +++ b/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: locale.ru_RU.UTF-8 -// UNSUPPORTED: msan, asan +// UNSUPPORTED: sanitizer-new-delete // diff --git a/test/std/localization/locales/locale/locale.cons/string.pass.cpp b/test/std/localization/locales/locale/locale.cons/string.pass.cpp index 32c3507ff..c9f944196 100644 --- a/test/std/localization/locales/locale/locale.cons/string.pass.cpp +++ b/test/std/localization/locales/locale/locale.cons/string.pass.cpp @@ -9,7 +9,7 @@ // REQUIRES: locale.ru_RU.UTF-8 // REQUIRES: locale.zh_CN.UTF-8 -// UNSUPPORTED: msan, asan +// UNSUPPORTED: sanitizer-new-delete // diff --git a/test/std/strings/basic.string/string.capacity/max_size.pass.cpp b/test/std/strings/basic.string/string.capacity/max_size.pass.cpp index f42642563..e4ff556d9 100644 --- a/test/std/strings/basic.string/string.capacity/max_size.pass.cpp +++ b/test/std/strings/basic.string/string.capacity/max_size.pass.cpp @@ -16,7 +16,7 @@ // returns null. // 2. If allocator_may_return_null=1 then they will fail because the allocation // is too large to succeed. -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp index 0f5d5aa40..a8b4be16e 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp @@ -15,7 +15,7 @@ // template thread(F&& f, Args&&... args); -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp index 28e49d6ec..b2e61faff 100644 --- a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp +++ b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp @@ -11,7 +11,7 @@ // template explicit shared_ptr(auto_ptr&& r); -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp index a8588cc67..97d3f69fb 100644 --- a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp +++ b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp @@ -13,7 +13,7 @@ // template shared_ptr(nullptr_t, D d); -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp index b024f7e15..ead081645 100644 --- a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp +++ b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp @@ -13,7 +13,7 @@ // template shared_ptr(Y* p, D d); -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp index 28fb8bfd9..041fe9a78 100644 --- a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp +++ b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp @@ -11,7 +11,7 @@ // template explicit shared_ptr(Y* p); -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp index dc2a6afef..68b9b2881 100644 --- a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp +++ b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp @@ -11,7 +11,7 @@ // template explicit shared_ptr(unique_ptr&&r); -// UNSUPPORTED: asan, msan +// UNSUPPORTED: sanitizer-new-delete #include #include diff --git a/test/support/count_new.hpp b/test/support/count_new.hpp index 00df7a125..ddaf036f7 100644 --- a/test/support/count_new.hpp +++ b/test/support/count_new.hpp @@ -10,7 +10,8 @@ #endif #if __has_feature(address_sanitizer) \ - || __has_feature(memory_sanitizer) + || __has_feature(memory_sanitizer) \ + || __has_feature(thread_sanitizer) #define DISABLE_NEW_COUNT #endif