Merge remote-tracking branch 'origin/develop' into feature/get_name

boostorg · Aug 11, 2023 · 03e1d76 · 03e1d76
2 parents 454947d + 963460a
commit 03e1d76
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,30 +17,41 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - toolset: gcc-7
-            cxxstd: "03,11,14,17"
-            os: ubuntu-18.04
-          - toolset: gcc-9  # Do not remove! It is the only toolset that tests misc/strip_boost_namespace.sh
+          - toolset: gcc-12
             cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
+            os: ubuntu-22.04
+            cxxflags: "cxxflags=--coverage -fsanitize=address,leak,undefined -fno-sanitize-recover=undefined"
+            linkflags: "linkflags=--coverage -lasan -lubsan"
+            gcov_tool: "gcov-12"
+          - toolset: gcc-11
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-22.04
+            cxxflags: "cxxflags=--coverage -fsanitize=address,leak,undefined -fno-sanitize-recover=undefined"
+            linkflags: "linkflags=--coverage -lasan -lubsan"
+            gcov_tool: "gcov-11"
           - toolset: gcc-10
             cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
+            os: ubuntu-22.04
             cxxflags: "cxxflags=--coverage -fsanitize=address,leak,undefined -fno-sanitize-recover=undefined"
             linkflags: "linkflags=--coverage -lasan -lubsan"
             gcov_tool: "gcov-10"
-          - toolset: clang
-            compiler: clang++-10
+          - toolset: gcc-9
             cxxstd: "03,11,14,17,2a"
-            os: ubuntu-20.04
-            cxxflags: "cxxflags=-fsanitize=address,undefined,integer -fno-sanitize-recover=undefined"
-            linkflags: "linkflags=-fsanitize=address,undefined,integer"
-          # To low quota to use
-          #- toolset: clang
-          #  cxxstd: "03,11,14,17,2a"
-          #  os: macos-10.15
-          #  cxxflags: "cxxflags=-fsanitize=address,undefined -fno-sanitize-recover=undefined"
-          #  linkflags: "linkflags=-fsanitize=address,undefined"
+            os: ubuntu-22.04
+            cxxflags: "cxxflags=--coverage -fsanitize=address,leak,undefined -fno-sanitize-recover=undefined"
+            linkflags: "linkflags=--coverage -lasan -lubsan"
+            gcov_tool: "gcov-9"
+          - toolset: clang-14
+            cxxstd: "03,11,14,17,20"
+            os: ubuntu-22.04
+          - toolset: clang-13
+            cxxstd: "03,11,14,17,20"
+            os: ubuntu-22.04
+          # - toolset: clang
+          #   cxxstd: "03,11,14,17,2a"
+          #   os: macos-10.15
+          #   cxxflags: "cxxflags=-fsanitize=address,undefined -fno-sanitize-recover=undefined"
+          #   linkflags: "linkflags=-fsanitize=address,undefined"
 
     runs-on: ${{matrix.os}}
 
@@ -76,11 +87,6 @@ jobs:
           ./b2 -d0 headers
           ./b2 -j4 variant=debug tools/inspect/build
 
-      - name: Create user-config.jam
-        if: matrix.compiler
-        run: |
-          echo "using ${{matrix.toolset}} : : ${{matrix.compiler}} ;" > ~/user-config.jam
-
       - name: Run tests
         run: |
           cd ../boost-root
@@ -98,9 +104,9 @@ jobs:
 
           echo -e "#!/bin/bash\nexec ${{matrix.gcov_tool}} \"\$@\"" > $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh
           chmod +x $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh
-          wget https://github.com/linux-test-project/lcov/archive/v1.15.zip
-          unzip v1.15.zip
-          LCOV="`pwd`/lcov-1.15/bin/lcov --gcov-tool $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh"
+          wget https://github.com/linux-test-project/lcov/archive/v1.16.zip
+          unzip v1.16.zip
+          LCOV="`pwd`/lcov-1.16/bin/lcov --gcov-tool $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh"
 
           echo "$LCOV --directory ../boost-root/bin.v2/libs/$LIBRARY/ --base-directory `pwd`/libs/$LIBRARY/test --capture --output-file $GITHUB_WORKSPACE/coveralls/coverage.info"
           $LCOV --directory ../boost-root/bin.v2/libs/$LIBRARY/ --base-directory ../boost-root/ --capture --output-file $GITHUB_WORKSPACE/coveralls/coverage.info
@@ -124,20 +130,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # TODO: fails the loophole tests
-          #- toolset: msvc
-          #  cxxstd: "14,17,latest"
-          #  addrmd: 32,64
-          #  os: windows-2022
-          # TODO: fails the loophole tests
-          #- toolset: msvc-14.2
-          #  cxxstd: "14,17,latest"
-          #  addrmd: 32,64
-          #  os: windows-2019
+          - toolset: msvc-14.0
+            cxxstd: "14,latest"
+            addrmd: 32,64
+            os: windows-2019
           - toolset: gcc
             cxxstd: "03,11,14,17,2a"
             addrmd: 64
             os: windows-2019
+          # - toolset: msvc-14.3
+          #   cxxstd: "14,17,20,latest"
+          #   addrmd: 32,64
+          #   os: windows-2022
 
     runs-on: ${{matrix.os}}
 

diff --git a/index.html b/index.html
@@ -6,11 +6,13 @@
  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)
+
+boost-no-inspect
 -->
 <html>
 <head>
 <meta charset="utf-8">
-<meta http-equiv="refresh" content="0; url=https://www.boost.org/doc/libs/master/doc/html/boost_pfr.html">
+<meta http-equiv="refresh" content="0; url=../../doc/html/boost_pfr.html">
 <title>Boost.Stacktrace</title>
 <style>
   body {
@@ -26,7 +28,7 @@
 <body>
   <p>
     Automatic redirection failed, please go to
-    <a href="https://www.boost.org/doc/libs/master/doc/html/boost_pfr.html">https://www.boost.org/doc/libs/master/doc/html/boost_pfr.html</a>
+    <a href="../../doc/html/boost_pfr.html">../../doc/html/boost_pfr.html</a>
   </p>
   <p>
     &copy; 2014-2023 Antony Polukhin

diff --git a/test/core/run/issue33.cpp b/test/core/run/issue33.cpp
@@ -15,13 +15,23 @@ struct TestStruct {
     std::vector<std::unique_ptr<int>> vec;
 };
 
+
 int main() {
     TestStruct temp;
     temp.vec.emplace_back();
 
+// FIXME: https://github.com/boostorg/pfr/issues/131
+#if defined(__clang__) && __cplusplus >= 202002L
+
+# if BOOST_PFR_USE_LOOPHOLE == 0 && BOOST_PFR_USE_CPP17 == 0
+#   error This test should fail on classic engine
+#endif
+
+#else
     boost::pfr::for_each_field(temp, [](const auto& value) {
         BOOST_TEST_EQ(value.size(), 1);
     });
+#endif
 
     return boost::report_errors();
 }