Author: ericwf Date: Sun Jul 24 19:50:32 2016 New Revision: 276595 URL: http://llvm.org/viewvc/llvm-project?rev=276595&view=rev Log: Make dtor_noexcept.pass.cpp tests more portable. Patch from s...@microsoft.com
Modified: libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp libcxx/trunk/test/std/strings/basic.string/string.cons/dtor_noexcept.pass.cpp Modified: libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -44,6 +45,6 @@ int main() } { typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -44,6 +45,6 @@ int main() } { typedef std::multimap<MoveOnly, MoveOnly, some_comp<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -43,6 +44,6 @@ int main() } { typedef std::multiset<MoveOnly, some_comp<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -43,6 +44,6 @@ int main() } { typedef std::set<MoveOnly, some_comp<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <deque> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -43,6 +44,6 @@ int main() } { typedef std::deque<MoveOnly, some_alloc<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <forward_list> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -43,6 +44,6 @@ int main() } { typedef std::forward_list<MoveOnly, some_alloc<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <list> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -43,6 +44,6 @@ int main() } { typedef std::list<MoveOnly, some_alloc<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <vector> #include <cassert> +#include "test_macros.h" #include "test_allocator.h" template <class T> @@ -42,6 +43,6 @@ int main() } { typedef std::vector<bool, some_alloc<bool>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <vector> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -43,6 +44,6 @@ int main() } { typedef std::vector<MoveOnly, some_alloc<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -54,11 +55,11 @@ int main() } { typedef std::unordered_map<MoveOnly, MoveOnly, some_hash<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } { typedef std::unordered_map<MoveOnly, MoveOnly, std::hash<MoveOnly>, some_comp<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -54,11 +55,11 @@ int main() } { typedef std::unordered_multimap<MoveOnly, MoveOnly, some_hash<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } { typedef std::unordered_multimap<MoveOnly, MoveOnly, std::hash<MoveOnly>, some_comp<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -54,11 +55,11 @@ int main() } { typedef std::unordered_multiset<MoveOnly, some_hash<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } { typedef std::unordered_multiset<MoveOnly, std::hash<MoveOnly>, some_comp<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -54,11 +55,11 @@ int main() } { typedef std::unordered_set<MoveOnly, some_hash<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } { typedef std::unordered_set<MoveOnly, std::hash<MoveOnly>, some_comp<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } Modified: libcxx/trunk/test/std/strings/basic.string/string.cons/dtor_noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.cons/dtor_noexcept.pass.cpp?rev=276595&r1=276594&r2=276595&view=diff ============================================================================== --- libcxx/trunk/test/std/strings/basic.string/string.cons/dtor_noexcept.pass.cpp (original) +++ libcxx/trunk/test/std/strings/basic.string/string.cons/dtor_noexcept.pass.cpp Sun Jul 24 19:50:32 2016 @@ -16,6 +16,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "test_allocator.h" template <class T> @@ -38,6 +39,6 @@ int main() } { typedef std::basic_string<char, std::char_traits<char>, some_alloc<char>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits