1. use checks to detect libraries to link; 2. test boost::filesystem:…

…:path and std::filesystem::path in one test

test/Jamfile.v2

@@ -10,7 +10,6 @@
 import stlport ;
 import modules ;
 import ac ;
-import ../../config/checks/config : requires ;
 
 local NO_BZIP2 = [ modules.peek : NO_BZIP2 ] ;
 local NO_ZLIB = [ modules.peek : NO_ZLIB ] ;
@@ -55,6 +54,14 @@ rule compile-fail-iostreams ( sources * : requirements * : target-name ? ) {
         ] ;
 }
 
+lib stdc++fs ;
+lib c++fs ;
+
+exe can_use_stdcxxfs : checks/std_filesystem_libstdcxx.cpp stdc++fs ;
+exe can_use_cxxfs : checks/std_filesystem_libcxx.cpp c++fs ;
+
+explicit can_use_stdcxxfs ;
+explicit can_use_cxxfs ;
 
     local all-tests = 
           [ test-iostreams array_test.cpp ]
@@ -92,8 +99,11 @@ rule compile-fail-iostreams ( sources * : requirements * : target-name ? ) {
           [ test-iostreams line_filter_test.cpp ]
           [ test-iostreams mapped_file_test.cpp 
                 ../build//boost_iostreams ]
-          [ test-iostreams path_test.cpp ]
-          [ test-iostreams path_test_std_filesystem.cpp : <toolset>gcc:<linkflags>-lstdc++fs <toolset>clang:<linkflags>-lstdc++fs [ requires cpp_lib_filesystem ] ]
+          [ test-iostreams
+                path_test.cpp
+                    : [ check-target-builds ../../config/checks//cpp_lib_filesystem
+                        : [ check-target-builds can_use_stdcxxfs : <source>stdc++fs : [ check-target-builds can_use_cxxfs : <source>c++fs ] ]
+                          <define>BOOST_IOSTREAMS_TEST_PATH_WITH_STD_FILESYSTEM ] ]
           [ test-iostreams newline_test.cpp ]
           [ test-iostreams null_test.cpp ]
           [ test-iostreams operation_sequence_test.cpp ]

test/checks/std_filesystem_libcxx.cpp

@@ -0,0 +1,14 @@
+// Copyright John Doe 2020.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
+
+#include <filesystem>
+
+#ifndef _LIBCPP_VERSION
+#error libc++ expected
+#endif
+
+int main()
+{
+    std::filesystem::create_directory(std::filesystem::path("/tmp/cpp_lib_filesystem_link"));
+}

test/checks/std_filesystem_libstdcxx.cpp

@@ -0,0 +1,14 @@
+// Copyright John Doe 2020.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
+
+#include <filesystem>
+
+#ifndef __GLIBCXX__
+#error libstdc++ expected
+#endif
+
+int main()
+{
+    std::filesystem::create_directory(std::filesystem::path("/tmp/cpp_lib_filesystem_link"));
+}

test/path_test.cpp

@@ -5,21 +5,70 @@
 // See http://www.boost.org/libs/iostreams for documentation.
 
 #include <boost/iostreams/detail/path.hpp>
-#include <boost/filesystem/path.hpp>
 
+#include <boost/core/enable_if.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/mpl/list.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test.hpp>
 
-void path_test()
+#ifdef BOOST_IOSTREAMS_TEST_PATH_WITH_STD_FILESYSTEM
+#include <filesystem>
+#endif
+
+template <typename Path>
+void check_path_invariant(
+    Path const& original_path,
+    boost::iostreams::detail::path const& path,
+    typename boost::enable_if<typename boost::is_same<typename Path::string_type::value_type, char>, void*>::type = NULL)
 {
-    boost::filesystem::path orig("a/b");
-    boost::iostreams::detail::path p(orig);
-    p = orig;
+    BOOST_CHECK(!path.is_wide());
+    BOOST_CHECK(original_path.native() == path.c_str());
+    BOOST_CHECK(std::wstring() == path.c_wstr());
 }
 
-boost::unit_test::test_suite* init_unit_test_suite(int, char* []) 
+template <typename Path>
+void check_path_invariant(
+    Path const& original_path,
+    boost::iostreams::detail::path const& path,
+    typename boost::enable_if<typename boost::is_same<typename Path::string_type::value_type, wchar_t>, void*>::type = NULL)
+{
+    BOOST_CHECK(path.is_wide());
+    BOOST_CHECK(original_path.native() == path.c_wstr());
+    BOOST_CHECK(std::string() == path.c_str());
+}
+
+BOOST_TEST_CASE_TEMPLATE_FUNCTION(construct_from_std_filesystem_path_test, Path)
+{
+    Path const original_path("abc");
+
+    boost::iostreams::detail::path const path(original_path);
+
+    check_path_invariant(original_path, path);
+}
+
+BOOST_TEST_CASE_TEMPLATE_FUNCTION(assign_std_filesystem_path_test, Path)
+{
+    Path const original_path("abc");
+
+    boost::iostreams::detail::path path;
+    path = original_path;
+
+    check_path_invariant(original_path, path);
+}
+
+typedef boost::mpl::list<
+        boost::filesystem::path
+#ifdef BOOST_IOSTREAMS_TEST_PATH_WITH_STD_FILESYSTEM
+        , std::filesystem::path
+#endif
+    > path_types;
+
+boost::unit_test::test_suite* init_unit_test_suite(int, char* [])
 {
-    boost::unit_test::test_suite* test = BOOST_TEST_SUITE("mapped_file test");
-    test->add(BOOST_TEST_CASE(&path_test));
+    boost::unit_test::test_suite* test = BOOST_TEST_SUITE("path test");
+    test->add(BOOST_TEST_CASE_TEMPLATE(construct_from_std_filesystem_path_test, path_types));
+    test->add(BOOST_TEST_CASE_TEMPLATE(assign_std_filesystem_path_test, path_types));
     return test;
 }