Adding upstream version 14.2.21.upstream/14.2.21upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 71 insertions, 0 deletions

diff --git a/src/boost/tools/boost_install/test/regex/CMakeLists.txt b/src/boost/tools/boost_install/test/regex/CMakeLists.txt
new file mode 100644
index 00000000..ed88b680
--- /dev/null
+++ b/src/boost/tools/boost_install/test/regex/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Copyright 2018, 2019 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+cmake_minimum_required(VERSION 3.5)
+
+if(POLICY CMP0074)
+  cmake_policy(SET CMP0074 NEW)
+endif()
+
+project(CmakeConfigRegexTest LANGUAGES CXX)
+
+include(${CMAKE_CURRENT_LIST_DIR}/../BoostVersion.cmake)
+
+set(BOOST_HINTS)
+
+if(USE_STAGED_BOOST)
+  set(BOOST_HINTS HINTS ../../../../stage)
+endif()
+
+if(USE_BOOST_PACKAGE)
+
+  find_package(Boost ${BOOST_VERSION} EXACT REQUIRED COMPONENTS regex ${BOOST_HINTS})
+
+  # Using `include_directories`, `link_directories`, `link_libraries`
+  # is bad practice, done here for testing purposes. The right, "modern
+  # CMake", thing to do is `target_link_libraries(main Boost::regex)`.
+
+  include_directories(${Boost_INCLUDE_DIRS})
+  link_directories(${Boost_LIBRARY_DIRS})
+  link_libraries(${Boost_LIBRARIES})
+
+else()
+
+  find_package(boost_regex ${BOOST_VERSION} EXACT CONFIG REQUIRED ${BOOST_HINTS})
+
+endif()
+
+add_executable(main quick.cpp)
+
+if(NOT USE_BOOST_PACKAGE)
+
+  target_link_libraries(main Boost::regex)
+
+endif()
+
+enable_testing()
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
+
+add_test(main main)
diff --git a/src/boost/tools/boost_install/test/regex/quick.cpp b/src/boost/tools/boost_install/test/regex/quick.cpp
new file mode 100644
index 00000000..f3421ea7
--- /dev/null
+++ b/src/boost/tools/boost_install/test/regex/quick.cpp
@@ -0,0 +1,21 @@
+
+// Copyright 2018 Peter Dimov.
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/regex.hpp>
+#include <boost/core/lightweight_test.hpp>
+
+int main()
+{
+    boost::regex rx( "(\\d+)-+(\\d+)-+(\\d+)" );
+
+    std::string s = boost::regex_replace( std::string( "+1--2--3+" ), rx, "$1$2$3" );
+
+    BOOST_TEST_EQ( s, "+123+" );
+
+    return boost::report_errors();
+}