[libcxx] [test] Replace _LIBCPP_STD_VER with TEST_STD_VER.
This replaces every occurrence of _LIBCPP_STD_VER in the tests with
TEST_STD_VER. Additionally, for every affected
file, #include "test_macros.h" is being added explicitly if it wasn't
already there.
https://reviews.llvm.org/D26294
llvm-svn: 286007
diff --git a/libcxx/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp
index cddb27e..ac7be15 100644
--- a/libcxx/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp
+++ b/libcxx/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp
@@ -15,9 +15,11 @@
#include <experimental/optional>
+#include "test_macros.h"
+
int main()
{
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;
diff --git a/libcxx/test/std/experimental/string.view/string.view.access/data.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.access/data.pass.cpp
index 53e95dd..4b581d6 100644
--- a/libcxx/test/std/experimental/string.view/string.view.access/data.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.access/data.pass.cpp
@@ -39,7 +39,7 @@
test ( U"a", 1 );
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr const char *s = "ABC";
constexpr std::experimental::basic_string_view<char> sv( s, 2 );
diff --git a/libcxx/test/std/experimental/string.view/string.view.access/index.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.access/index.pass.cpp
index 2c1bd1d..0cb385e 100644
--- a/libcxx/test/std/experimental/string.view/string.view.access/index.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.access/index.pass.cpp
@@ -42,7 +42,7 @@
test ( U"a", 1 );
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr std::experimental::basic_string_view<char> sv ( "ABC", 2 );
static_assert ( sv.length() == 2, "" );
diff --git a/libcxx/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp
index 9f5d86f..a5108bf 100644
--- a/libcxx/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp
@@ -23,7 +23,7 @@
template<typename SV>
void test1 () {
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr SV sv1;
static_assert ( sv1.size() == 0, "" );
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp
index 0df37a6..bd566a9 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp
@@ -17,6 +17,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -49,7 +50,7 @@
test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp
index 5971f69..51decdc 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp
@@ -16,6 +16,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -48,7 +49,7 @@
test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp
index f5bcb7e..cf8a30a 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp
@@ -17,6 +17,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -49,7 +50,7 @@
test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp
index e13a4ea..1bacf28 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp
@@ -16,6 +16,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -48,7 +49,7 @@
test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp
index 63002a5..0aae3d4 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp
@@ -17,6 +17,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -49,7 +50,7 @@
test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp
index 3047cc7..e014872 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp
@@ -16,6 +16,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -48,7 +49,7 @@
test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp
index c542efe..bdc4c96 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp
@@ -17,6 +17,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -49,7 +50,7 @@
test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp
index 17219a4..e814283 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp
@@ -16,6 +16,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -48,7 +49,7 @@
test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp
index 2c04614..10e8243 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp
@@ -17,6 +17,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -49,7 +50,7 @@
test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp
index df9e908..77d8fa3e 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp
@@ -16,6 +16,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -48,7 +49,7 @@
test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp
index 1deee9a..9c13199 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp
@@ -17,6 +17,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -49,7 +50,7 @@
test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp
index c99489e..c74b327 100644
--- a/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp
@@ -16,6 +16,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -48,7 +49,7 @@
test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.cons/default.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.cons/default.pass.cpp
index e817bff..37df020 100644
--- a/libcxx/test/std/experimental/string.view/string.view.cons/default.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.cons/default.pass.cpp
@@ -15,9 +15,11 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
+
template<typename T>
void test () {
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr T sv1;
static_assert ( sv1.size() == 0, "" );
diff --git a/libcxx/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp
index 9de3a30..a863838 100644
--- a/libcxx/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp
@@ -18,6 +18,7 @@
#include <string>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template<typename CharT>
@@ -55,7 +56,7 @@
test ( U"" );
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr std::experimental::basic_string_view<char, constexpr_char_traits<char>> sv1 ( "ABCDE" );
static_assert ( sv1.size() == 5, "");
diff --git a/libcxx/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp
index 663d25e..c2f312d 100644
--- a/libcxx/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp
@@ -34,7 +34,7 @@
test ( "QBCDE", 5 );
test ( "QBCDE", 2 );
test ( "", 0 );
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr const char *s = "QBCDE";
constexpr std::experimental::basic_string_view<char> sv1 ( s, 2 );
@@ -46,7 +46,7 @@
test ( L"QBCDE", 5 );
test ( L"QBCDE", 2 );
test ( L"", 0 );
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr const wchar_t *s = L"QBCDE";
constexpr std::experimental::basic_string_view<wchar_t> sv1 ( s, 2 );
@@ -59,7 +59,7 @@
test ( u"QBCDE", 5 );
test ( u"QBCDE", 2 );
test ( u"", 0 );
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr const char16_t *s = u"QBCDE";
constexpr std::experimental::basic_string_view<char16_t> sv1 ( s, 2 );
@@ -71,7 +71,7 @@
test ( U"QBCDE", 5 );
test ( U"QBCDE", 2 );
test ( U"", 0 );
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr const char32_t *s = U"QBCDE";
constexpr std::experimental::basic_string_view<char32_t> sv1 ( s, 2 );
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp
index 6e6a1f5..fdaf8aa 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -66,7 +67,7 @@
test(S("abcdeabcdeabcdeabcde"), 'c', 2);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp
index 73580ae..859980a 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -68,7 +69,7 @@
test(S("laenfsbridchgotmkqpj"), 'q', 0);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp
index de93288..1f7ce3e 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -149,7 +150,7 @@
test1<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp
index cfb0029..28255dd4 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -376,7 +377,7 @@
test3<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp
index dde2f2c..ffafcfc 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -66,7 +67,7 @@
test(S("laenfsbridchgotmkqpj"), 'e', 2);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp
index e49e82c..7b37fe0 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -149,7 +150,7 @@
test1<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp
index 1dc8d85..1f7ea38 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -376,7 +377,7 @@
test3<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp
index ed1a35e9..307be23 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -66,7 +67,7 @@
test(S("laenfsbridchgotmkqpj"), 'i', 19);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp
index e07c4f3..b0d3f06 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -149,7 +150,7 @@
test1<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp
index 3ddf033..8a591cc 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -376,7 +377,7 @@
test3<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp
index d28e007..b949eec 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -66,7 +67,7 @@
test(S("laenfsbridchgotmkqpj"), 'm', 15);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp
index f01e277..3755b26 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -149,7 +150,7 @@
test1<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp
index a38ffa6..64b29ec 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -376,7 +377,7 @@
test3<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp
index 5ebe414b..bdccb2f 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -155,7 +156,7 @@
test1<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp
index 382cbaf..856dc4a 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -376,7 +377,7 @@
test3<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp
index 84132ac..f25efdd 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -148,7 +149,7 @@
test1<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp
index 9014d88..f070711 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp
@@ -13,6 +13,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -65,7 +66,7 @@
test(S("abcdeabcdeabcdeabcde"), 'b', 16);
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp
index 0559d31..7a8795b 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp
@@ -13,6 +13,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -155,7 +156,7 @@
test1<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp
index 9116e3a..2755d2c 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp
@@ -13,6 +13,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -375,7 +376,7 @@
test3<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp
index 88457c6..e77d668 100644
--- a/libcxx/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
template <class S>
@@ -148,7 +149,7 @@
test1<S>();
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp
index 8040b81..5f28f63 100644
--- a/libcxx/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp
@@ -58,7 +58,7 @@
test(u32string_view{U"123"});
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr string_view sv { "123", 3 };
constexpr u16string_view u16sv {u"123", 3 };
diff --git a/libcxx/test/std/experimental/string.view/string.view.iterators/end.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.iterators/end.pass.cpp
index 3a1091e..0eeafac 100644
--- a/libcxx/test/std/experimental/string.view/string.view.iterators/end.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.iterators/end.pass.cpp
@@ -66,7 +66,7 @@
test(u32string_view{U"123"});
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
constexpr string_view sv { "123", 3 };
constexpr u16string_view u16sv {u"123", 3 };
diff --git a/libcxx/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp
index 9a4891c..00b0661 100644
--- a/libcxx/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp
@@ -32,7 +32,7 @@
}
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
constexpr size_t test_ce ( size_t n ) {
typedef std::experimental::basic_string_view<char> SV;
SV sv1{ "ABCDEFGHIJKL", n };
@@ -60,7 +60,7 @@
test ( U"", 0 );
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
static_assert ( test_ce (5) == 0, "" );
#endif
diff --git a/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp
index 4a31486..03484a0 100644
--- a/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp
@@ -39,7 +39,7 @@
}
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
constexpr size_t test_ce ( size_t n, size_t k ) {
typedef std::experimental::basic_string_view<char> SV;
SV sv1{ "ABCDEFGHIJKL", n };
@@ -67,7 +67,7 @@
test ( U"", 0 );
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
static_assert ( test_ce ( 5, 0 ) == 5, "" );
static_assert ( test_ce ( 5, 1 ) == 4, "" );
diff --git a/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp
index 9ddc6de..6b632d0 100644
--- a/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp
@@ -39,7 +39,7 @@
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
constexpr size_t test_ce ( size_t n, size_t k ) {
typedef std::experimental::basic_string_view<char> SV;
SV sv1{ "ABCDEFGHIJKL", n };
@@ -67,7 +67,7 @@
test ( U"", 0 );
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
static_assert ( test_ce ( 5, 0 ) == 5, "" );
static_assert ( test_ce ( 5, 1 ) == 4, "" );
diff --git a/libcxx/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp
index d747def..2912fd8 100644
--- a/libcxx/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp
@@ -36,7 +36,7 @@
}
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
constexpr size_t test_ce ( size_t n, size_t k ) {
typedef std::experimental::basic_string_view<char> SV;
SV sv1{ "ABCDEFGHIJKL", n };
@@ -66,7 +66,7 @@
test ( U"", 0 );
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
static_assert ( test_ce (2, 3) == 3, "" );
static_assert ( test_ce (5, 3) == 3, "" );
diff --git a/libcxx/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp
index 6ba0321..202e9ce 100644
--- a/libcxx/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp
@@ -16,7 +16,9 @@
#include <experimental/string_view>
#include <cassert>
-#if _LIBCPP_STD_VER > 11
+#include "test_macros.h"
+
+#if TEST_STD_VER > 11
// quoted is C++14 only
bool is_skipws ( const std::istream *is ) {
diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp
index 5833954..93014ea 100644
--- a/libcxx/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); }
@@ -112,7 +113,7 @@
}
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1;
diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp
index 4364ab0..ff01daa 100644
--- a/libcxx/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp
+++ b/libcxx/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp
@@ -14,6 +14,7 @@
#include <experimental/string_view>
#include <cassert>
+#include "test_macros.h"
#include "constexpr_char_traits.hpp"
int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); }
@@ -106,7 +107,7 @@
test(U"abcdefghijklmnopqrst", U"abcdefghijklmnopqrst", 0);
#endif
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
{
typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV;
constexpr SV sv1 { "abcde", 5 };