[libc++] Use UNSUPPORTED instead of TEST_STD_VER #ifdef
When the whole test only works starting at some version of the Standard,
use UNSUPPORTED lit markup instead of #ifdef TEST_STD_VER. This provides
more visibility into the test suite.
Reviewed as https://reviews.llvm.org/D57704.
Thanks to Andrey Maksimov for the patch.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@353206 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/std/input.output/iostream.format/quoted.manip/quoted.pass.cpp b/test/std/input.output/iostream.format/quoted.manip/quoted.pass.cpp
index 1e54e56..b87797d 100644
--- a/test/std/input.output/iostream.format/quoted.manip/quoted.pass.cpp
+++ b/test/std/input.output/iostream.format/quoted.manip/quoted.pass.cpp
@@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//
+// UNSUPPORTED: c++98, c++03, c++11
+
// <iomanip>
// quoted
@@ -15,10 +17,6 @@
#include <string>
#include <cassert>
-#include "test_macros.h"
-
-#if TEST_STD_VER > 11
-
template <class CharT, class Traits>
bool is_skipws ( const std::basic_istream<CharT, Traits>& is ) {
return ( is.flags() & std::ios_base::skipws ) != 0;
@@ -173,12 +171,6 @@
assert ( unquote ( "" ) == "" ); // nothing there
assert ( unquote ( L"" ) == L"" ); // nothing there
test_padding ();
-
+
return 0;
}
-
-#else
-int main(int, char**) {
- return 0;
-}
-#endif
diff --git a/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp b/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
index 1047540..e17a6e9 100644
--- a/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
+++ b/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
@@ -6,13 +6,12 @@
//
//===----------------------------------------------------------------------===//
+// UNSUPPORTED: c++98, c++03
+
#include <scoped_allocator>
#include <memory>
#include <cassert>
-#include "test_macros.h"
-
-#if TEST_STD_VER >= 11
// #include <memory>
//
// template <class Alloc>
@@ -121,6 +120,3 @@
return 0;
}
-#else
-int main(int, char**) { return 0; }
-#endif
diff --git a/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp b/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
index bc89c62..ad43194 100644
--- a/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
+++ b/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
@@ -6,12 +6,11 @@
//
//===----------------------------------------------------------------------===//
+// UNSUPPORTED: c++98, c++03
+
#include <memory>
#include <cassert>
-#include "test_macros.h"
-
-#if TEST_STD_VER >= 11
// #include <memory>
//
// template <class Alloc>
@@ -120,6 +119,3 @@
return 0;
}
-#else
-int main(int, char**) { return 0; }
-#endif
diff --git a/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp b/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp
index 993b32f..0b25ac1 100644
--- a/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp
+++ b/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp
@@ -11,11 +11,11 @@
// nullptr_t
// is_null_pointer
+// UNSUPPORTED: c++98, c++03, c++11
+
#include <type_traits>
#include <cstddef> // for std::nullptr_t
-#include "test_macros.h"
-#if TEST_STD_VER > 11
template <class T>
void test_nullptr_imp()
{
@@ -54,8 +54,3 @@
static_assert(!std::is_null_pointer<incomplete_type>::value, "");
return 0;
}
-#else
-int main(int, char**) {
- return 0;
-}
-#endif
diff --git a/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp b/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
index 27f3d59..ede72c2 100644
--- a/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
+++ b/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
@@ -6,12 +6,10 @@
//
//===----------------------------------------------------------------------===//
+// UNSUPPORTED: c++98, c++03
+
// This is for bugs 18853 and 19118
-#include "test_macros.h"
-
-#if TEST_STD_VER >= 11
-
#include <tuple>
#include <functional>
@@ -32,6 +30,3 @@
return 0;
}
-#else
-int main(int, char**) { return 0; }
-#endif