From 12f5f51427fbc9d27f56e5de002b0008fea420c9 Mon Sep 17 00:00:00 2001
From: Glen Fernandes <glen.fernandes@gmail.com>
Date: Wed, 27 Oct 2021 01:41:40 -0400
Subject: [PATCH] Switch tests to not rely on requires checks

---
 test/Jamfile.v2                    | 13 ++++++-------
 test/as_bytes_test.cpp             |  8 ++++++++
 test/as_writable_bytes_test.cpp    |  8 ++++++++
 test/span_constructible_test.cpp   |  8 ++++++++
 test/span_deduction_guide_test.cpp |  7 +++++++
 test/span_test.cpp                 |  8 ++++++++
 test/span_types_test.cpp           |  8 ++++++++
 7 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index f645a07..4033219 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -8,7 +8,6 @@
 
 import modules ;
 import testing ;
-import ../../config/checks/config : requires ;
 
 # quick test (for CI)
 run quick.cpp ;
@@ -270,12 +269,12 @@ run sv_lt_test.cpp ;
 run sv_stream_insert_test.cpp ;
 run sv_conversion_test.cpp ;
 
-run span_test.cpp : : : [ requires cxx11_constexpr cxx11_decltype ] ;
-run span_types_test.cpp : : : [ requires cxx11_constexpr cxx11_decltype ] ;
-run span_constructible_test.cpp : : : [ requires cxx11_constexpr cxx11_decltype ] ;
-run span_deduction_guide_test.cpp : : : [ requires cpp_deduction_guides ] ;
-run as_bytes_test.cpp : : : [ requires cpp_lib_byte ] ;
-run as_writable_bytes_test.cpp : : : [ requires cpp_lib_byte ] ;
+run span_test.cpp ;
+run span_types_test.cpp ;
+run span_constructible_test.cpp ;
+run span_deduction_guide_test.cpp ;
+run as_bytes_test.cpp ;
+run as_writable_bytes_test.cpp ;
 
 use-project /boost/core/swap : ./swap ;
 build-project ./swap ;
diff --git a/test/as_bytes_test.cpp b/test/as_bytes_test.cpp
index e99ef5d..2c714aa 100644
--- a/test/as_bytes_test.cpp
+++ b/test/as_bytes_test.cpp
@@ -5,6 +5,8 @@ Copyright 2019 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
+#include <cstddef>
+#ifdef __cpp_lib_byte
 #include <boost/core/span.hpp>
 #include <boost/core/lightweight_test.hpp>
 
@@ -32,3 +34,9 @@ int main()
     test_static();
     return boost::report_errors();
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif
diff --git a/test/as_writable_bytes_test.cpp b/test/as_writable_bytes_test.cpp
index 47914d8..8ef59be 100644
--- a/test/as_writable_bytes_test.cpp
+++ b/test/as_writable_bytes_test.cpp
@@ -5,6 +5,8 @@ Copyright 2019 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
+#include <cstddef>
+#ifdef __cpp_lib_byte
 #include <boost/core/span.hpp>
 #include <boost/core/lightweight_test.hpp>
 
@@ -32,3 +34,9 @@ int main()
     test_static();
     return boost::report_errors();
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif
diff --git a/test/span_constructible_test.cpp b/test/span_constructible_test.cpp
index 857eada..01e4542 100644
--- a/test/span_constructible_test.cpp
+++ b/test/span_constructible_test.cpp
@@ -5,6 +5,8 @@ Copyright 2019 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
+#include <boost/config.hpp>
+#if !defined(BOOST_NO_CXX11_CONSTEXPR) && !defined(BOOST_NO_CXX11_DECLTYPE)
 #include <boost/core/span.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
 
@@ -190,3 +192,9 @@ int main()
     test_assign();
     return boost::report_errors();
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif
diff --git a/test/span_deduction_guide_test.cpp b/test/span_deduction_guide_test.cpp
index c627ba8..519c881 100644
--- a/test/span_deduction_guide_test.cpp
+++ b/test/span_deduction_guide_test.cpp
@@ -5,6 +5,7 @@ Copyright 2019 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
+#ifdef __cpp_deduction_guides
 #include <boost/core/span.hpp>
 #include <boost/core/lightweight_test.hpp>
 
@@ -107,3 +108,9 @@ int main()
     test_span_static();
     return boost::report_errors();
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif
diff --git a/test/span_test.cpp b/test/span_test.cpp
index 5ef1d22..1009cba 100644
--- a/test/span_test.cpp
+++ b/test/span_test.cpp
@@ -5,6 +5,8 @@ Copyright 2019 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
+#include <boost/config.hpp>
+#if !defined(BOOST_NO_CXX11_CONSTEXPR) && !defined(BOOST_NO_CXX11_DECLTYPE)
 #include <boost/core/span.hpp>
 #include <boost/core/lightweight_test.hpp>
 
@@ -423,3 +425,9 @@ int main()
     test_end_span();
     return boost::report_errors();
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif
diff --git a/test/span_types_test.cpp b/test/span_types_test.cpp
index 56c7413..49f7346 100644
--- a/test/span_types_test.cpp
+++ b/test/span_types_test.cpp
@@ -5,6 +5,8 @@ Copyright 2019 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
+#include <boost/config.hpp>
+#if !defined(BOOST_NO_CXX11_CONSTEXPR) && !defined(BOOST_NO_CXX11_DECLTYPE)
 #include <boost/core/span.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
 
@@ -126,3 +128,9 @@ int main()
     test_const_reverse_iterator();
     return boost::report_errors();
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif