From 6edc12c8867fe8d21f9abf97b160d12dc2fa3954 Mon Sep 17 00:00:00 2001 From: Asiri Rathnayake Date: Sat, 28 May 2016 08:57:35 +0000 Subject: [libcxx] Improve tests to use the UNSUPPORTED lit directive Quite a few libcxx tests seem to follow the format: #if _LIBCPP_STD_VER > X // Do test. #else // Empty test. #endif We should instead use the UNSUPPORTED lit directive to exclude the test on earlier C++ standards. This gives us a more accurate number of test passes for those standards and avoids unnecessary conflicts with other lit directives on the same tests. Reviewers: bcraig, ericwf, mclow.lists Differential revision: http://reviews.llvm.org/D20730 llvm-svn: 271108 --- .../test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp | 8 +------- .../test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp | 5 +---- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'libcxx/test/std/utilities/intseq') diff --git a/libcxx/test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp b/libcxx/test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp index 088531498dc..362a7e1b5d5 100644 --- a/libcxx/test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp +++ b/libcxx/test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp @@ -7,6 +7,7 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03, c++11 // // class make_integer_sequence @@ -16,19 +17,13 @@ #include #include -#if _LIBCPP_STD_VER > 11 - template auto extract ( const AtContainer &t, const std::integer_sequence ) -> decltype ( std::make_tuple ( std::get(t)... )) { return std::make_tuple ( std::get(t)... ); } -#endif // _LIBCPP_STD_VER > 11 - int main() { -#if _LIBCPP_STD_VER > 11 - // Make a couple of sequences using int3 = std::make_integer_sequence; // generates int: 0,1,2 using size7 = std::make_integer_sequence; // generates size_t: 0,1,2,3,4,5,6 @@ -82,5 +77,4 @@ int main() auto tsizemix = extract ( tup, sizemix ()); static_assert ( std::tuple_size::value == sizemix::size (), "tsizemix size wrong"); assert ( tsizemix == std::make_tuple ( 11, 11, 12, 13, 15 )); -#endif // _LIBCPP_STD_VER > 11 } diff --git a/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp b/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp index 5c789f5db27..bff2daa6b8b 100644 --- a/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp +++ b/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp @@ -7,6 +7,7 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03, c++11 // // template @@ -24,8 +25,6 @@ int main() { -#if _LIBCPP_STD_VER > 11 - // Make a few of sequences using int3 = std::integer_sequence; using size1 = std::integer_sequence; @@ -44,6 +43,4 @@ int main() static_assert ( std::is_same::value, "bool0 type wrong" ); static_assert ( bool0::size() == 0, "bool0 size wrong" ); - -#endif // _LIBCPP_STD_VER > 11 } -- cgit v1.2.3