Migrate all tests to compatibility headers

boostorg · Jan 14, 2025 · 128fd88 · 128fd88
1 parent bcc4720
commit 128fd88
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 37 deletions.
diff --git a/test/from_chars_float.cpp b/test/from_chars_float.cpp
@@ -2,9 +2,11 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/charconv.hpp>
-#include "before_impl_headers.hpp"
+#include <math.h>
+#define BOOST_CHARCONV_SOURCE
 #include "../src/from_chars_float_impl.hpp"
+#undef BOOST_CHARCONV_SOURCE
+#include <boost/charconv.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config/std/system_error.hpp>
 #include <boost/config/std/iostream.hpp>

diff --git a/test/from_chars_float2.cpp b/test/from_chars_float2.cpp
@@ -5,7 +5,7 @@
 #include <boost/charconv.hpp>
 #include <boost/core/detail/splitmix64.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/config/std/cstdio.hpp>
+#include <cstdio> // stderr
 
 static boost::detail::splitmix64 rng;
 

diff --git a/test/github_issue_122.cpp b/test/github_issue_122.cpp
@@ -3,12 +3,14 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
+#define BOOST_CHARCONV_SOURCE
+#include <boost/charconv/detail/fallback_routines.hpp>
+#undef BOOST_CHARCONV_SOURCE
+
+#include <boost/charconv.hpp>
 #include <boost/config/std/locale.hpp>
 #include <boost/config/std/iostream.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/charconv.hpp>
-#include "before_impl_headers.hpp"
-#include <boost/charconv/detail/fallback_routines.hpp>
 
 template <typename T>
 void test()

diff --git a/test/github_issue_152_float128.cpp b/test/github_issue_152_float128.cpp
@@ -2,8 +2,14 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/charconv/detail/config.hpp>
-#include <ostream>
+#include <boost/charconv.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <boost/config/std/system_error.hpp>
+#include <boost/config/std/ostream.hpp>
+#include <boost/config/std/limits.hpp>
+#include <boost/config/std/random.hpp>
+#include <boost/config/std/array.hpp>
+#include <boost/config/std/cstdint.hpp>
 
 #ifdef BOOST_CHARCONV_HAS_QUADMATH
 
@@ -25,14 +31,6 @@ std::ostream& operator<<( std::ostream& os, std::float128_t v )
 }
 #endif
 
-#include <boost/charconv.hpp>
-#include <boost/core/lightweight_test.hpp>
-#include <system_error>
-#include <limits>
-#include <random>
-#include <array>
-#include <cstdint>
-
 constexpr std::size_t N = 1024;
 static std::mt19937_64 rng(42);
 

diff --git a/test/github_issue_212.cpp b/test/github_issue_212.cpp
@@ -5,8 +5,8 @@
 #include <boost/charconv.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config/std/system_error.hpp>
-#include <boost/config/std/cstdint.hpp>
 #include <boost/config/std/cstring.hpp>
+#include <cstdint>
 
 template <typename T>
 void test()

diff --git a/test/test_128bit_emulation.cpp b/test/test_128bit_emulation.cpp
@@ -8,7 +8,7 @@
 #include <boost/config/std/limits.hpp>
 #include <boost/config/std/iostream.hpp>
 #include <boost/config/std/cstdint.hpp>
-#include <boost/config/std/climits.hpp>
+#include <limits.h> // CHAR_BIT
 
 #ifdef BOOST_HAS_INT128
 

diff --git a/test/test_boost_json_values.cpp b/test/test_boost_json_values.cpp
@@ -18,7 +18,8 @@
 #include <boost/config/std/random.hpp>
 #include <boost/config/std/type_traits.hpp>
 #include <boost/config/std/cstring.hpp>
-#include <boost/config/std/cinttypes.hpp>
+#include <cinttypes>
+#include <cstdio> // stderr
 
 template <typename T>
 void grind(const std::string& str, const T expected_value)

diff --git a/test/test_compute_float32.cpp b/test/test_compute_float32.cpp
@@ -2,12 +2,12 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
+#include <math.h>
 #include "before_impl_headers.hpp"
 #include <boost/charconv/detail/compute_float32.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config/std/limits.hpp>
 #include <boost/config/std/cstdint.hpp>
-#include <math.h>
 
 using boost::charconv::detail::compute_float32;
 

diff --git a/test/test_compute_float64.cpp b/test/test_compute_float64.cpp
@@ -2,13 +2,13 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
+#include <math.h>
 #include "before_impl_headers.hpp"
 #include <boost/charconv/detail/compute_float64.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config/std/random.hpp>
 #include <boost/config/std/limits.hpp>
 #include <cstdint>
-#include <math.h>
 
 using boost::charconv::detail::compute_float64;
 

diff --git a/test/test_float128.cpp b/test/test_float128.cpp
@@ -2,7 +2,19 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/charconv/detail/config.hpp>
+
+#define BOOST_CHARCONV_SOURCE
+#include <boost/charconv/detail/issignaling.hpp>
+#include "../src/float128_impl.hpp"
+#undef BOOST_CHARCONV_SOURCE
+#include <boost/charconv.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <boost/core/detail/splitmix64.hpp>
+#include <boost/config/std/limits.hpp>
+#include <boost/config/std/iostream.hpp>
+#include <boost/config/std/iomanip.hpp>
+#include <boost/config/std/string.hpp>
+#include <boost/config/std/random.hpp>
 
 #if defined(BOOST_CHARCONV_HAS_QUADMATH) && defined(BOOST_HAS_INT128)
 
@@ -83,18 +95,6 @@ std::ostream& operator<<( std::ostream& os, boost::int128_type v )
 }
 
 
-#include <boost/charconv.hpp>
-#include <boost/core/lightweight_test.hpp>
-#include <boost/core/detail/splitmix64.hpp>
-#include <boost/charconv/detail/issignaling.hpp>
-#include <boost/config/std/limits.hpp>
-#include <boost/config/std/iostream.hpp>
-#include <boost/config/std/iomanip.hpp>
-#include <boost/config/std/string.hpp>
-#include <boost/config/std/random.hpp>
-#include "before_impl_headers.hpp"
-#include "../src/float128_impl.hpp"
-
 constexpr int N = 1024;
 static boost::detail::splitmix64 rng;
 

diff --git a/test/to_chars.cpp b/test/to_chars.cpp
@@ -13,6 +13,8 @@
 #include <boost/config/std/string.hpp>
 #include <boost/config/std/cstring.hpp>
 #include <boost/config/std/cerrno.hpp>
+#include <stdint.h> // UINT64_C
+#include <limits.h> // INT_MIN
 
 #ifdef BOOST_CHARCONV_HAS_INT128
 template <typename T>

diff --git a/test/to_chars_float.cpp b/test/to_chars_float.cpp
@@ -3,10 +3,12 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/charconv.hpp>
-#include "before_impl_headers.hpp"
+#define BOOST_CHARCONV_SOURCE
 #include <boost/charconv/detail/fallback_routines.hpp>
+#undef BOOST_CHARCONV_SOURCE
+#include <boost/charconv.hpp>
 #include <boost/core/lightweight_test.hpp>
+#include <boost/core/detail/splitmix64.hpp>
 #include <boost/config/std/system_error.hpp>
 #include <boost/config/std/type_traits.hpp>
 #include <boost/config/std/limits.hpp>
@@ -18,7 +20,6 @@
 #include <boost/config/std/random.hpp>
 #include <boost/config/std/iomanip.hpp>
 #include <boost/config/std/sstream.hpp>
-#include <boost/core/detail/splitmix64.hpp>
 
 // These numbers diverge from what the formatting is using printf
 // See: https://godbolt.org/z/zd34KcWMW