Add missing cstdint includes to avoid compiler errors because of unknown symbols uint32_t and so on

.bazelrc

@@ -1,11 +1,4 @@
-build --enable_platform_specific_config
-
 build:gcc9 --cxxopt=-std=c++2a
-build:gcc11 --cxxopt=-std=c++2a
 build:clang13 --cxxopt=-std=c++17
 build:vs2019 --cxxopt=/std:c++17
-build:vs2022 --cxxopt=/std:c++17
-
-build:windows --config=vs2022
-build:linux --config=gcc11
-build:macos --cxxopt=-std=c++2b
+build:vs2022 --cxxopt=/std:c++17

.clang-format

@@ -1,45 +1,25 @@
 ---
-Language: Cpp
-Standard: c++14
-
-# Note that we cannot use IncludeIsMainRegex functionality, because it
-# does not support includes in angle brackets (<>)
-SortIncludes: true
-IncludeBlocks: Regroup
-IncludeCategories:
-  - Regex: <catch2/.*\.hpp>
-    Priority: 1
-  - Regex: <.*/.*\.hpp>
-    Priority: 2
-  - Regex: <.*>
-    Priority: 3
-
-AllowShortBlocksOnASingleLine: Always
-AllowShortEnumsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: WithoutElse
-AllowShortLambdasOnASingleLine: Inline
-
-AccessModifierOffset: "-4"
+AccessModifierOffset: '-4'
 AlignEscapedNewlines: Left
-AllowAllConstructorInitializersOnNextLine: "true"
-BinPackArguments: "false"
-BinPackParameters: "false"
+AllowAllConstructorInitializersOnNextLine: 'true'
+BinPackArguments: 'false'
+BinPackParameters: 'false'
 BreakConstructorInitializers: AfterColon
-ConstructorInitializerAllOnOneLineOrOnePerLine: "true"
-DerivePointerAlignment: "false"
-FixNamespaceComments: "true"
-IndentCaseLabels: "false"
+ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
+DerivePointerAlignment: 'false'
+FixNamespaceComments: 'true'
+IncludeBlocks: Regroup
+IndentCaseLabels: 'false'
 IndentPPDirectives: AfterHash
-IndentWidth: "4"
+IndentWidth: '4'
+Language: Cpp
 NamespaceIndentation: All
 PointerAlignment: Left
-SpaceBeforeCtorInitializerColon: "false"
-SpaceInEmptyParentheses: "false"
-SpacesInParentheses: "true"
-TabWidth: "4"
+SpaceBeforeCtorInitializerColon: 'false'
+SpaceInEmptyParentheses: 'false'
+SpacesInParentheses: 'true'
+Standard: Cpp11
+TabWidth: '4'
 UseTab: Never
-AlwaysBreakTemplateDeclarations: Yes
-SpaceAfterTemplateKeyword: true
-SortUsingDeclarations: true
-ReflowComments: true
+
+...

.clang-tidy

@@ -1,81 +0,0 @@
----
-# Note: Alas, `Checks` is a string, not an array.
-#       Comments in the block string are not parsed and are passed in the value.
-#       They must thus be delimited by ',' from either side - then they are
-#       harmless. It's terrible, but it works.
-Checks: >-
-  clang-diagnostic-*,
-  clang-analyzer-*,
-  -clang-analyzer-optin.core.EnumCastOutOfRange,
-
-  bugprone-*,
-  -bugprone-unchecked-optional-access,
-  ,# This is ridiculous, as it triggers on constants,
-  -bugprone-implicit-widening-of-multiplication-result,
-  -bugprone-easily-swappable-parameters,
-  ,# Is not really useful, has false positives, triggers for no-noexcept move constructors ...,
-  -bugprone-exception-escape,
-  -bugprone-narrowing-conversions,
-  -bugprone-chained-comparison,# RIP decomposers,
-
-  modernize-*,
-  -modernize-avoid-c-arrays,
-  -modernize-use-auto,
-  -modernize-use-emplace,
-  -modernize-use-nullptr,# it went crazy with three-way comparison operators,
-  -modernize-use-trailing-return-type,
-  -modernize-return-braced-init-list,
-  -modernize-concat-nested-namespaces,
-  -modernize-use-nodiscard,
-  -modernize-use-default-member-init,
-  -modernize-type-traits,# we need to support C++14,
-  -modernize-deprecated-headers,
-  ,# There's a lot of these and most of them are probably not useful,
-  -modernize-pass-by-value,
-
-  performance-*,
-  -performance-enum-size,
-
-  portability-*,
-
-  readability-*,
-  -readability-braces-around-statements,
-  -readability-container-size-empty,
-  -readability-convert-member-functions-to-static,
-  -readability-else-after-return,
-  -readability-function-cognitive-complexity,
-  -readability-function-size,
-  -readability-identifier-length,
-  -readability-implicit-bool-conversion,
-  -readability-isolate-declaration,
-  -readability-magic-numbers,
-  -readability-named-parameter,
-  -readability-qualified-auto,
-  -readability-redundant-access-specifiers,
-  -readability-simplify-boolean-expr,
-  -readability-static-definition-in-anonymous-namespace,
-  -readability-uppercase-literal-suffix,
-  -readability-use-anyofallof,
-  -readability-avoid-return-with-void-value,
-
-  ,# time hogs,
-  -bugprone-throw-keyword-missing,
-  -modernize-replace-auto-ptr,
-  -readability-identifier-naming,
-
-  ,# We cannot use this until clang-tidy supports custom unique_ptr,
-  -bugprone-use-after-move,
-  ,# Doesn't recognize unevaluated context in CATCH_MOVE and CATCH_FORWARD,
-  -bugprone-macro-repeated-side-effects,
-WarningsAsErrors: >-
-  clang-analyzer-core.*,
-  clang-analyzer-cplusplus.*,
-  clang-analyzer-security.*,
-  clang-analyzer-unix.*,
-  performance-move-const-arg,
-  performance-unnecessary-value-param,
-  readability-duplicate-include,
-HeaderFilterRegex: '.*\.(c|cxx|cpp)$'
-FormatStyle:     none
-CheckOptions: {}
-...

.conan/test_package/CMakeLists.txt

@@ -1,8 +1,12 @@
-cmake_minimum_required(VERSION 3.15)
-project(PackageTest CXX)
+cmake_minimum_required(VERSION 3.2.0)
+project(test_package CXX)
 
-find_package(Catch2 CONFIG REQUIRED)
+include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
+conan_basic_setup()
 
-add_executable(test_package test_package.cpp)
-target_link_libraries(test_package Catch2::Catch2WithMain)
-target_compile_features(test_package PRIVATE cxx_std_14)
+find_package(Catch2 REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME} test_package.cpp)
+
+target_link_libraries(${PROJECT_NAME} Catch2::Catch2WithMain)
+set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 14)

.conan/test_package/conanfile.py

@@ -1,28 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from conan import ConanFile
-from conan.tools.cmake import CMake, cmake_layout
-from conan.tools.build import can_run
-from conan.tools.files import save, load
+from conans import ConanFile, CMake
 import os
 
 
 class TestPackageConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
-    test_type = "explicit"
-
-    def requirements(self):
-        self.requires(self.tested_reference_str)
-
-    def layout(self):
-        cmake_layout(self)
-
-    def generate(self):
-        save(self, os.path.join(self.build_folder, "package_folder"),
-             self.dependencies[self.tested_reference_str].package_folder)
-        save(self, os.path.join(self.build_folder, "license"),
-             self.dependencies[self.tested_reference_str].license)
+    generators = "cmake_find_package_multi", "cmake"
 
     def build(self):
         cmake = CMake(self)
@@ -30,11 +14,7 @@ class TestPackageConan(ConanFile):
         cmake.build()
 
     def test(self):
-        if can_run(self):
-            cmd = os.path.join(self.cpp.build.bindir, "test_package")
-            self.run(cmd, env="conanrun")
-
-            package_folder = load(self, os.path.join(self.build_folder, "package_folder"))
-            license = load(self, os.path.join(self.build_folder, "license"))
-            assert os.path.isfile(os.path.join(package_folder, "licenses", "LICENSE.txt"))
-            assert license == 'BSL-1.0'
+        assert os.path.isfile(os.path.join(
+            self.deps_cpp_info["catch2"].rootpath, "licenses", "LICENSE.txt"))
+        bin_path = os.path.join("bin", "test_package")
+        self.run("%s -s" % bin_path, run_environment=True)

.github/workflows/linux-bazel-builds.yml

@@ -1,24 +0,0 @@
-name: Bazel build
-
-on: [push, pull_request]
-
-jobs:
-  build_and_test_ubuntu:
-    name: Linux Ubuntu 22.04 Bazel build <GCC 11.2.0>
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        compilation_mode: [fastbuild, dbg, opt]
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Mount bazel cache
-      uses: actions/cache@v3
-      with:
-        path: "/home/runner/.cache/bazel"
-        key: bazel-ubuntu22-gcc11
-
-    - name: Build Catch2
-      run: |
-        bazelisk build --compilation_mode=${{matrix.compilation_mode}} //...

.github/workflows/linux-meson-builds.yml

@@ -1,44 +0,0 @@
-name: Linux builds (meson)
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: meson ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        cxx:
-          - g++-11
-          - clang++-11
-        build_type: [debug, release]
-        std: [14, 17]
-        include:
-          - cxx: clang++-11
-            other_pkgs: clang-11
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Prepare environment
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}
-
-    - name: Configure build
-      env:
-        CXX: ${{matrix.cxx}}
-        CXXFLAGS: -std=c++${{matrix.std}} ${{matrix.cxxflags}}
-      # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
-      #       This is important
-      run: |
-        meson -Dbuildtype=${{matrix.build_type}} ${{runner.workspace}}/meson-build
-
-    - name: Build tests + lib
-      working-directory: ${{runner.workspace}}/meson-build
-      run: ninja
-
-    - name: Run tests
-      working-directory: ${{runner.workspace}}/meson-build
-      run: |
-        meson test --verbose

.github/workflows/linux-other-builds.yml

@@ -29,13 +29,13 @@ jobs:
             build_type: Debug
             std: 14
             other_pkgs: g++-7
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
           - cxx: g++-7
             build_description: Extras + Examples
             build_type: Release
             std: 14
             other_pkgs: g++-7
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
 
           # Extras and examples with Clang-10
           - cxx: clang++-10
@@ -43,13 +43,13 @@ jobs:
             build_type: Debug
             std: 17
             other_pkgs: clang-10
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
           - cxx: clang++-10
             build_description: Extras + Examples
             build_type: Release
             std: 17
             other_pkgs: clang-10
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
 
           # Configure tests with Clang-10
           - cxx: clang++-10
@@ -70,12 +70,10 @@ jobs:
 
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
 
     - name: Prepare environment
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
+      run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
 
     - name: Configure build
       working-directory: ${{runner.workspace}}
@@ -88,7 +86,6 @@ jobs:
         cmake -Bbuild -H$GITHUB_WORKSPACE \
               -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
               -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
               -DCMAKE_CXX_EXTENSIONS=OFF \
               -DCATCH_DEVELOPMENT_BUILD=ON \
               ${{matrix.cmake_configurations}} \
@@ -102,53 +99,5 @@ jobs:
       env:
           CTEST_OUTPUT_ON_FAILURE: 1
       working-directory: ${{runner.workspace}}/build
-      run: ctest -C ${{matrix.build_type}} -j `nproc` ${{matrix.other_ctest_args}}
-  clang-tidy:
-    name: clang-tidy ${{matrix.version}}, ${{matrix.build_description}}, C++${{matrix.std}} ${{matrix.build_type}}
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        include:
-          - version: "15"
-            build_description: all
-            build_type: Debug
-            std: 17
-            other_pkgs: ''
-            cmake_configurations: -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Prepare environment
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y ninja-build clang-${{matrix.version}} clang-tidy-${{matrix.version}} ${{matrix.other_pkgs}}
-
-    - name: Configure build
-      working-directory: ${{runner.workspace}}
-      env:
-        CXX: clang++-${{matrix.version}}
-        CXXFLAGS: ${{matrix.cxxflags}}
-      # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
-      #       This is important
-      run: |
-        clangtidy="clang-tidy-${{matrix.version}};-use-color"
-        # Use a dummy compiler/linker/ar/ranlib to effectively disable the
-        # compilation and only run clang-tidy.
-        cmake -Bbuild -H$GITHUB_WORKSPACE \
-              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-              -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
-              -DCMAKE_CXX_EXTENSIONS=OFF \
-              -DCATCH_DEVELOPMENT_BUILD=ON \
-              -DCMAKE_CXX_CLANG_TIDY="$clangtidy" \
-              -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/true \
-              -DCMAKE_AR=/usr/bin/true \
-              -DCMAKE_CXX_COMPILER_AR=/usr/bin/true \
-              -DCMAKE_RANLIB=/usr/bin/true \
-              -DCMAKE_CXX_LINK_EXECUTABLE=/usr/bin/true \
-              ${{matrix.cmake_configurations}} \
-              -G Ninja
-
-    - name: Run clang-tidy
-      working-directory: ${{runner.workspace}}/build
-      run: ninja
+      # Hardcode 2 cores we know are there
+      run: ctest -C ${{matrix.build_type}} -j 2 ${{matrix.other_ctest_args}}

.github/workflows/linux-simple-builds.yml

@@ -9,8 +9,7 @@ jobs:
     strategy:
       matrix:
         cxx:
-          - g++-5
-          - g++-6
+#          - g++-6
           - g++-7
           - g++-8
           - g++-9
@@ -23,10 +22,9 @@ jobs:
         build_type: [Debug, Release]
         std: [14]
         include:
-          - cxx: g++-5
-            other_pkgs: g++-5
-          - cxx: g++-6
-            other_pkgs: g++-6
+        # cannot be installed on ubuntu-20.04 be default?
+#          - cxx: g++-6
+#            other_pkgs: g++-6
           - cxx: g++-7
             other_pkgs: g++-7
           - cxx: g++-8
@@ -65,36 +63,12 @@ jobs:
             build_type: Release
             std: 17
             other_pkgs: clang-10
-          - cxx: clang++-10
-            build_type: Debug
-            std: 20
-            other_pkgs: clang-10
-          - cxx: clang++-10
-            build_type: Release
-            std: 20
-            other_pkgs: clang-10
-          - cxx: g++-10
-            build_type: Debug
-            std: 20
-            other_pkgs: g++-10
-          - cxx: g++-10
-            build_type: Release
-            std: 20
-            other_pkgs: g++-10
 
     steps:
-    - uses: actions/checkout@v4
-
-    - name: Add repositories for older GCC
-      run: |
-        sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main'
-        sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic universe'
-      if: ${{ matrix.cxx == 'g++-5' || matrix.cxx == 'g++-6' }}
+    - uses: actions/checkout@v2
 
     - name: Prepare environment
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
+      run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
 
     - name: Configure build
       working-directory: ${{runner.workspace}}
@@ -107,7 +81,6 @@ jobs:
         cmake -Bbuild -H$GITHUB_WORKSPACE \
               -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
               -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
               -DCMAKE_CXX_EXTENSIONS=OFF \
               -DCATCH_DEVELOPMENT_BUILD=ON \
               -G Ninja
@@ -120,4 +93,5 @@ jobs:
       env:
           CTEST_OUTPUT_ON_FAILURE: 1
       working-directory: ${{runner.workspace}}/build
-      run: ctest -C ${{matrix.build_type}} -j `nproc`
+      # Hardcode 2 cores we know are there
+      run: ctest -C ${{matrix.build_type}} -j 2

.github/workflows/mac-builds-m1.yml

@@ -1,44 +0,0 @@
-name: M1 Mac builds
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macos-14
-    strategy:
-      matrix:
-        cxx:
-          - clang++
-        build_type: [Debug, Release]
-        std: [14, 17]
-        include:
-          - build_type: Debug
-            examples: ON
-            extra_tests: ON
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Configure build
-      working-directory: ${{runner.workspace}}
-      env:
-        CXX: ${{matrix.cxx}}
-        CXXFLAGS: ${{matrix.cxxflags}}
-      run: |
-        cmake -Bbuild -H$GITHUB_WORKSPACE \
-              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-              -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
-              -DCATCH_DEVELOPMENT_BUILD=ON \
-              -DCATCH_BUILD_EXAMPLES=${{matrix.examples}} \
-              -DCATCH_BUILD_EXTRA_TESTS=${{matrix.examples}}
-
-    - name: Build tests + lib
-      working-directory: ${{runner.workspace}}/build
-      run: make -j `sysctl -n hw.ncpu`
-
-    - name: Run tests
-      env:
-          CTEST_OUTPUT_ON_FAILURE: 1
-      working-directory: ${{runner.workspace}}/build
-      run: ctest -C ${{matrix.build_type}} -j `sysctl -n hw.ncpu`

.github/workflows/mac-builds.yml

@@ -4,10 +4,11 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-10.15
     strategy:
       matrix:
         cxx:
+          - g++-9
           - clang++
         build_type: [Debug, Release]
         std: [14, 17]
@@ -17,28 +18,28 @@ jobs:
             extra_tests: ON
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
 
     - name: Configure build
       working-directory: ${{runner.workspace}}
       env:
         CXX: ${{matrix.cxx}}
         CXXFLAGS: ${{matrix.cxxflags}}
+      # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
+      #       This is important
       run: |
         cmake -Bbuild -H$GITHUB_WORKSPACE \
-              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-              -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
-              -DCATCH_DEVELOPMENT_BUILD=ON \
-              -DCATCH_BUILD_EXAMPLES=${{matrix.examples}} \
+              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} \
+              -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_BUILD_EXAMPLES=${{matrix.examples}} \
               -DCATCH_BUILD_EXTRA_TESTS=${{matrix.examples}}
 
     - name: Build tests + lib
       working-directory: ${{runner.workspace}}/build
-      run: make -j `sysctl -n hw.ncpu`
+      run: make -j 2
 
     - name: Run tests
       env:
           CTEST_OUTPUT_ON_FAILURE: 1
       working-directory: ${{runner.workspace}}/build
-      run: ctest -C ${{matrix.build_type}} -j `sysctl -n hw.ncpu`
+      # Hardcode 2 cores we know are there
+      run: ctest -C ${{matrix.build_type}} -j 2

.github/workflows/package-manager-builds.yaml

@@ -1,31 +0,0 @@
-name: Package Manager Builds
-
-on: [push, pull_request]
-
-jobs:
-  conan_builds:
-    name: Conan ${{matrix.conan_version}}
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        conan_version:
-          - '1.63'
-          - '2.1'
-
-        include:
-          # Conan 1 has default profiles installed
-          - conan_version: '1.63'
-            profile_generate: 'false'
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Install conan
-      run: pip install conan==${{matrix.conan_version}}
-
-    - name: Setup conan profiles
-      if: matrix.profile_generate != 'false'
-      run: conan profile detect
-
-    - name: Run conan package create
-      run: conan create . -tf .conan/test_package

.github/workflows/validate-header-guards.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
 
       - name: Checkout source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Setup Dependencies
         uses: actions/setup-python@v2

.github/workflows/windows-simple-builds.yml

@@ -1,37 +0,0 @@
-name: Windows builds (basic)
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: ${{matrix.os}}, ${{matrix.std}}, ${{matrix.build_type}}, ${{matrix.platform}}
-    runs-on: ${{matrix.os}}
-    strategy:
-      matrix:
-        os: [windows-2019, windows-2022]
-        platform: [Win32, x64]
-        build_type: [Debug, Release]
-        std: [14, 17]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Configure build
-        working-directory: ${{runner.workspace}}
-        run: |
-          cmake -S $Env:GITHUB_WORKSPACE               `
-                -B ${{runner.workspace}}/build         `
-                -DCMAKE_CXX_STANDARD=${{matrix.std}}   `
-                -A ${{matrix.platform}}                `
-                --preset all-tests
-
-      - name: Build tests
-        working-directory: ${{runner.workspace}}
-        run: cmake --build build --config ${{matrix.build_type}} --parallel %NUMBER_OF_PROCESSORS%
-        shell: cmd
-
-      - name: Run tests
-        working-directory: ${{runner.workspace}}/build
-        env:
-            CTEST_OUTPUT_ON_FAILURE: 1
-        run: ctest -C ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS%
-        shell: cmd

.gitignore

@@ -1,5 +1,4 @@
 *.build
-!meson.build
 *.pbxuser
 *.mode1v3
 *.ncb
@@ -25,9 +24,7 @@ Build
 cmake-build-*
 benchmark-dir
 .conan/test_package/build
-**/CMakeUserPresets.json
 bazel-*
-MODULE.bazel.lock
 build-fuzzers
 debug-build
 .vscode
@@ -37,4 +34,3 @@ msvc-sln*
 docs/doxygen
 *.cache
 compile_commands.json
-**/*.unapproved.txt

BUILD.bazel

@@ -1,13 +1,14 @@
+# Load the cc_library rule.
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
 
 expand_template(
     name = "catch_user_config",
     out = "catch2/catch_user_config.hpp",
     substitutions = {
-        "@CATCH_CONFIG_CONSOLE_WIDTH@": "80",
-        "@CATCH_CONFIG_DEFAULT_REPORTER@": "console",
         "#cmakedefine CATCH_CONFIG_ANDROID_LOGWRITE": "",
         "#cmakedefine CATCH_CONFIG_BAZEL_SUPPORT": "#define CATCH_CONFIG_BAZEL_SUPPORT",
+        "#cmakedefine CATCH_CONFIG_NO_COLOUR_WIN32": "",
         "#cmakedefine CATCH_CONFIG_COLOUR_WIN32": "",
         "#cmakedefine CATCH_CONFIG_COUNTER": "",
         "#cmakedefine CATCH_CONFIG_CPP11_TO_STRING": "",
@@ -28,10 +29,7 @@ expand_template(
         "#cmakedefine CATCH_CONFIG_EXPERIMENTAL_REDIRECT": "",
         "#cmakedefine CATCH_CONFIG_FALLBACK_STRINGIFIER @CATCH_CONFIG_FALLBACK_STRINGIFIER@": "",
         "#cmakedefine CATCH_CONFIG_FAST_COMPILE": "",
-        "#cmakedefine CATCH_CONFIG_GETENV": "",
         "#cmakedefine CATCH_CONFIG_GLOBAL_NEXTAFTER": "",
-        "#cmakedefine CATCH_CONFIG_NO_ANDROID_LOGWRITE": "",
-        "#cmakedefine CATCH_CONFIG_NO_COLOUR_WIN32": "",
         "#cmakedefine CATCH_CONFIG_NO_COUNTER": "",
         "#cmakedefine CATCH_CONFIG_NO_CPP11_TO_STRING": "",
         "#cmakedefine CATCH_CONFIG_NO_CPP17_BYTE": "",
@@ -39,23 +37,21 @@ expand_template(
         "#cmakedefine CATCH_CONFIG_NO_CPP17_STRING_VIEW": "",
         "#cmakedefine CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS": "",
         "#cmakedefine CATCH_CONFIG_NO_CPP17_VARIANT": "",
-        "#cmakedefine CATCH_CONFIG_NO_GETENV": "",
         "#cmakedefine CATCH_CONFIG_NO_GLOBAL_NEXTAFTER": "",
         "#cmakedefine CATCH_CONFIG_NO_POSIX_SIGNALS": "",
         "#cmakedefine CATCH_CONFIG_NO_USE_ASYNC": "",
-        "#cmakedefine CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT": "",
         "#cmakedefine CATCH_CONFIG_NO_WCHAR": "",
         "#cmakedefine CATCH_CONFIG_NO_WINDOWS_SEH": "",
         "#cmakedefine CATCH_CONFIG_NOSTDOUT": "",
         "#cmakedefine CATCH_CONFIG_POSIX_SIGNALS": "",
         "#cmakedefine CATCH_CONFIG_PREFIX_ALL": "",
-        "#cmakedefine CATCH_CONFIG_PREFIX_MESSAGES": "",
-        "#cmakedefine CATCH_CONFIG_SHARED_LIBRARY": "",
-        "#cmakedefine CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT": "",
         "#cmakedefine CATCH_CONFIG_USE_ASYNC": "",
         "#cmakedefine CATCH_CONFIG_WCHAR": "",
         "#cmakedefine CATCH_CONFIG_WINDOWS_CRTDBG": "",
         "#cmakedefine CATCH_CONFIG_WINDOWS_SEH": "",
+        "#cmakedefine CATCH_CONFIG_NO_ANDROID_LOGWRITE": "",
+        "@CATCH_CONFIG_DEFAULT_REPORTER@": "console",
+        "@CATCH_CONFIG_CONSOLE_WIDTH@": "80",
     },
     template = "src/catch2/catch_user_config.hpp.in",
 )
@@ -92,4 +88,4 @@ cc_library(
     linkstatic = True,
     visibility = ["//visibility:public"],
     deps = [":catch2"],
-)
+)

CMake/CatchConfigOptions.cmake

@@ -1,7 +1,7 @@
 
 #              Copyright Catch2 Authors
 # Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
+#   (See accompanying file LICENSE_1_0.txt or copy at
 #        https://www.boost.org/LICENSE_1_0.txt)
 
 # SPDX-License-Identifier: BSL-1.0
@@ -18,12 +18,10 @@
 macro(AddOverridableConfigOption OptionBaseName)
   option(CATCH_CONFIG_${OptionBaseName} "Read docs/configuration.md for details" OFF)
   option(CATCH_CONFIG_NO_${OptionBaseName} "Read docs/configuration.md for details" OFF)
-  mark_as_advanced(CATCH_CONFIG_${OptionBaseName} CATCH_CONFIG_NO_${OptionBaseName})
 endmacro()
 
 macro(AddConfigOption OptionBaseName)
   option(CATCH_CONFIG_${OptionBaseName} "Read docs/configuration.md for details" OFF)
-  mark_as_advanced(CATCH_CONFIG_${OptionBaseName})
 endmacro()
 
 set(_OverridableOptions
@@ -42,8 +40,6 @@ set(_OverridableOptions
   "USE_ASYNC"
   "WCHAR"
   "WINDOWS_SEH"
-  "GETENV"
-  "EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT"
 )
 
 foreach(OptionName ${_OverridableOptions})
@@ -64,7 +60,6 @@ set(_OtherConfigOptions
   "FAST_COMPILE"
   "NOSTDOUT"
   "PREFIX_ALL"
-  "PREFIX_MESSAGES"
   "WINDOWS_CRTDBG"
 )
 
@@ -72,17 +67,10 @@ set(_OtherConfigOptions
 foreach(OptionName ${_OtherConfigOptions})
   AddConfigOption(${OptionName})
 endforeach()
-if(DEFINED BUILD_SHARED_LIBS)
-    set(CATCH_CONFIG_SHARED_LIBRARY ${BUILD_SHARED_LIBS})
-else()
-    set(CATCH_CONFIG_SHARED_LIBRARY "")
-endif()
 
 set(CATCH_CONFIG_DEFAULT_REPORTER "console" CACHE STRING "Read docs/configuration.md for details. The name of the reporter should be without quotes.")
 set(CATCH_CONFIG_CONSOLE_WIDTH "80" CACHE STRING "Read docs/configuration.md for details. Must form a valid integer literal.")
 
-mark_as_advanced(CATCH_CONFIG_SHARED_LIBRARY CATCH_CONFIG_DEFAULT_REPORTER CATCH_CONFIG_CONSOLE_WIDTH)
-
 # There is no good way to both turn this into a CMake cache variable,
 # and keep reasonable default semantics inside the project. Thus we do
 # not define it and users have to provide it as an outside variable.

CMake/CatchMiscFunctions.cmake

@@ -1,19 +1,18 @@
 
 #              Copyright Catch2 Authors
 # Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
+#   (See accompanying file LICENSE_1_0.txt or copy at
 #        https://www.boost.org/LICENSE_1_0.txt)
 
 # SPDX-License-Identifier: BSL-1.0
 
 include(CheckCXXCompilerFlag)
 function(add_cxx_flag_if_supported_to_targets flagname targets)
-    string(MAKE_C_IDENTIFIER ${flagname} flag_identifier )
-    check_cxx_compiler_flag("${flagname}" HAVE_FLAG_${flag_identifier})
+    check_cxx_compiler_flag("${flagname}" HAVE_FLAG_${flagname})
 
-    if (HAVE_FLAG_${flag_identifier})
+    if (HAVE_FLAG_${flagname})
         foreach(target ${targets})
-            target_compile_options(${target} PRIVATE ${flagname})
+            target_compile_options(${target} PUBLIC ${flagname})
         endforeach()
     endif()
 endfunction()
@@ -46,6 +45,7 @@ function(add_warnings_to_targets targets)
         set(CHECKED_WARNING_FLAGS
           "-Wabsolute-value"
           "-Wall"
+          "-Wc++20-compat"
           "-Wcall-to-pure-virtual-from-ctor-dtor"
           "-Wcast-align"
           "-Wcatch-value"
@@ -68,24 +68,21 @@ function(add_warnings_to_targets targets)
           "-Wmissing-noreturn"
           "-Wmissing-prototypes"
           "-Wmissing-variable-declarations"
-          "-Wnon-virtual-dtor"
           "-Wnull-dereference"
           "-Wold-style-cast"
           "-Woverloaded-virtual"
           "-Wparentheses"
           "-Wpedantic"
-          "-Wredundant-decls"
           "-Wreorder"
           "-Wreturn-std-move"
           "-Wshadow"
           "-Wstrict-aliasing"
-          "-Wsubobject-linkage"
           "-Wsuggest-destructor-override"
           "-Wsuggest-override"
           "-Wundef"
           "-Wuninitialized"
           "-Wunneeded-internal-declaration"
-          "-Wunreachable-code-aggressive"
+          "-Wunreachable-code"
           "-Wunused"
           "-Wunused-function"
           "-Wunused-parameter"
@@ -115,8 +112,9 @@ endfunction()
 # Adds flags required for reproducible build to the target
 # Currently only supports GCC and Clang
 function(add_build_reproducibility_settings target)
-  # Make the build reproducible on versions of g++ and clang that supports -ffile-prefix-map
-  if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-    add_cxx_flag_if_supported_to_targets("-ffile-prefix-map=${CATCH_DIR}/=" "${target}")
+# Make the build reproducible on versions of g++ and clang that supports -ffile-prefix-map
+  if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 8) OR
+     ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 10))
+    target_compile_options(${target} PRIVATE "-ffile-prefix-map=${CATCH_DIR}=.")
   endif()
 endfunction()

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.5)
 
 # detect if Catch is being bundled,
 # disable testsuite in that case
@@ -11,7 +11,6 @@ endif()
 option(CATCH_INSTALL_DOCS "Install documentation alongside library" ON)
 option(CATCH_INSTALL_EXTRAS "Install extras (CMake scripts, debugger helpers) alongside library" ON)
 option(CATCH_DEVELOPMENT_BUILD "Build tests, enable warnings, enable Werror, etc" OFF)
-option(CATCH_ENABLE_REPRODUCIBLE_BUILD "Add compiler flags for improving build reproducibility" ON)
 
 include(CMakeDependentOption)
 cmake_dependent_option(CATCH_BUILD_TESTING "Build the SelfTest project" ON "CATCH_DEVELOPMENT_BUILD" OFF)
@@ -22,7 +21,6 @@ cmake_dependent_option(CATCH_ENABLE_COVERAGE "Generate coverage for codecov.io"
 cmake_dependent_option(CATCH_ENABLE_WERROR "Enables Werror during build" ON "CATCH_DEVELOPMENT_BUILD" OFF)
 cmake_dependent_option(CATCH_BUILD_SURROGATES "Enable generating and building surrogate TUs for the main headers" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
 cmake_dependent_option(CATCH_ENABLE_CONFIGURE_TESTS "Enable CMake configuration tests. WARNING: VERY EXPENSIVE" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
-cmake_dependent_option(CATCH_ENABLE_CMAKE_HELPER_TESTS "Enable CMake helper tests. WARNING: VERY EXPENSIVE" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
 
 
 # Catch2's build breaks if done in-tree. You probably should not build
@@ -32,8 +30,14 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
 endif()
 
+if(CMAKE_VERSION VERSION_GREATER 3.8)
+  # Enable IPO for CMake versions that support it
+  cmake_policy(SET CMP0069 NEW)
+endif()
+
+
 project(Catch2
-  VERSION 3.7.0 # CML version placeholder, don't delete
+  VERSION 3.1.0 # CML version placeholder, don't delete
   LANGUAGES CXX
   # HOMEPAGE_URL is not supported until CMake version 3.12, which
   # we do not target yet.
@@ -76,6 +80,8 @@ endif()
 set(CATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(SOURCES_DIR ${CATCH_DIR}/src/catch2)
 set(SELF_TEST_DIR ${CATCH_DIR}/tests/SelfTest)
+set(BENCHMARK_DIR ${CATCH_DIR}/tests/Benchmark)
+set(EXAMPLES_DIR ${CATCH_DIR}/examples)
 
 # We need to bring-in the variables defined there to this scope
 add_subdirectory(src)
@@ -148,8 +154,6 @@ if (NOT_SUBPROJECT)
             "extras/ParseAndAddCatchTests.cmake"
             "extras/Catch.cmake"
             "extras/CatchAddTests.cmake"
-            "extras/CatchShardTests.cmake"
-            "extras/CatchShardTestsImpl.cmake"
           DESTINATION
             ${CATCH_CMAKE_CONFIG_DESTINATION}
         )
@@ -198,4 +202,4 @@ if (NOT_SUBPROJECT)
 
     include( CPack )
 
-endif()
+endif(NOT_SUBPROJECT)

CMakePresets.json

@@ -18,8 +18,7 @@
                 "CATCH_BUILD_EXAMPLES": "ON",
                 "CATCH_BUILD_EXTRA_TESTS": "ON",
                 "CATCH_BUILD_SURROGATES": "ON",
-                "CATCH_ENABLE_CONFIGURE_TESTS": "ON",
-                "CATCH_ENABLE_CMAKE_HELPER_TESTS": "ON"
+                "CATCH_ENABLE_CONFIGURE_TESTS": "ON"
             }
         }
     ]   

Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.8.16
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = Catch2
+PROJECT_NAME           = "Catch2"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -51,7 +51,6 @@ PROJECT_BRIEF          = "Popular C++ unit testing framework"
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -217,14 +216,6 @@ QT_AUTOBRIEF           = YES
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# By default Python docstrings are displayed as preformatted text and doxygen's
-# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
-# doxygen's special commands can be used and the contents of the docstring
-# documentation blocks is shown as doxygen documentation.
-# The default value is: YES.
-
-PYTHON_DOCSTRING       = YES
-
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -260,7 +251,13 @@ TAB_SIZE               = 4
 # a double escape (\\{ and \\})
 
 ALIASES                = "complexity=@par Complexity:" \
-                         noexcept=**Noexcept**
+                         "noexcept=**Noexcept**"
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
@@ -302,22 +299,19 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
 # Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files). For instance to make doxygen treat .inc files
-# as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C.
+# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is
+# Fortran), use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen. When specifying no_extension you should add
-# * to the FILE_PATTERNS.
-#
-# Note see also the list of default file extension mappings.
+# the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
@@ -451,19 +445,6 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
-# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
-# during processing. When set to 0 doxygen will based this on the number of
-# cores available in the system. You can set it explicitly to a value larger
-# than 0 to get more control over the balance between CPU load and processing
-# speed. At this moment only the input processing can be done using multiple
-# threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
-# encounter. Generating dot graphs in parallel is controlled by the
-# DOT_NUM_THREADS setting.
-# Minimum value: 0, maximum value: 32, default value: 1.
-
-NUM_PROC_THREADS       = 1
-
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -527,13 +508,6 @@ EXTRACT_LOCAL_METHODS  = NO
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If this flag is set to YES, the name of an unnamed parameter in a declaration
-# will be determined by the corresponding definition. By default unnamed
-# parameters remain unnamed in the output.
-# The default value is: YES.
-
-RESOLVE_UNNAMED_PARAMS = YES
-
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
@@ -551,8 +525,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# declarations. If set to NO, these declarations will be included in the
-# documentation.
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -571,18 +545,11 @@ HIDE_IN_BODY_DOCS      = NO
 
 INTERNAL_DOCS          = NO
 
-# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
-# able to match the capabilities of the underlying filesystem. In case the
-# filesystem is case sensitive (i.e. it supports files in the same directory
-# whose names only differ in casing), the option must be set to YES to properly
-# deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be be set to NO to properly deal with
-# output files written for symbols that only differ in casing, such as for two
-# classes, one named CLASS and the other named Class, and to also support
-# references to files without having to specify the exact matching casing. On
-# Windows (including Cygwin) and MacOS, users should typically set this option
-# to NO, whereas on Linux or other Unix flavors it should typically be set to
-# YES.
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# (including Cygwin) ands Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -821,10 +788,7 @@ WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = YES
 
 # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
-# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
-# at the end of the doxygen process doxygen will return with a non-zero status.
-# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# a warning is encountered.
 # The default value is: NO.
 
 WARN_AS_ERROR          = NO
@@ -855,13 +819,13 @@ WARN_LOGFILE           = doxygen.errors
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = src/catch2
+INPUT  = "src/catch2"
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see:
-# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
+# possible encodings.
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
@@ -874,61 +838,13 @@ INPUT_ENCODING         = UTF-8
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # read by doxygen.
 #
-# Note the list of default checked file patterns might differ from the list of
-# default file extension mappings.
-#
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.idl \
-                         *.ddl \
-                         *.odl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.cs \
-                         *.d \
-                         *.php \
-                         *.php4 \
-                         *.php5 \
-                         *.phtml \
-                         *.inc \
-                         *.m \
-                         *.markdown \
-                         *.md \
-                         *.mm \
-                         *.dox \
-                         *.py \
-                         *.pyw \
-                         *.f90 \
-                         *.f95 \
-                         *.f03 \
-                         *.f08 \
-                         *.f18 \
-                         *.f \
-                         *.for \
-                         *.vhd \
-                         *.vhdl \
-                         *.ucf \
-                         *.qsf \
-                         *.ice
+# FILE_PATTERNS          =
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -1052,7 +968,6 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1140,44 +1055,6 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see:
-# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
-# performance. This can be particularly helpful with template rich C++ code for
-# which doxygen's built-in parser lacks the necessary type information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled and the CLANG_ADD_INC_PATHS tag is set to
-# YES then doxygen will add the directory of each input to the include path.
-# The default value is: YES.
-
-CLANG_ADD_INC_PATHS    = YES
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-# If clang assisted parsing is enabled you can provide the clang parser with the
-# path to the directory containing a file called compile_commands.json. This
-# file is the compilation database (see:
-# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
-# options used when the source files were built. This is equivalent to
-# specifying the -p option to a clang tool, such as clang-check. These options
-# will then be passed to the parser. Any options specified with CLANG_OPTIONS
-# will be added as well.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-
-CLANG_DATABASE_PATH    =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1189,6 +1066,13 @@ CLANG_DATABASE_PATH    =
 
 ALPHABETICAL_INDEX     = YES
 
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
 # can be used to specify a prefix (or a list of prefixes) that should be ignored
@@ -1327,9 +1211,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via JavaScript. If disabled, the navigation index will
+# are dynamically created via Javascript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have JavaScript,
+# page. Disable this option to support browsers that do not have Javascript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1359,11 +1243,10 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see:
-# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
-# create a documentation set, doxygen will generate a Makefile in the HTML
-# output directory. Running make will produce the docset in that directory and
-# running make install will install the docset in
+# environment (see: https://developer.apple.com/xcode/), introduced with OSX
+# 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
 # startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
 # genXcode/_index.html for more information.
@@ -1405,8 +1288,8 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1436,7 +1319,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the main .chm file (NO).
+# (YES) or that it should be included in the master .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1481,8 +1364,7 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1490,8 +1372,8 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
+# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
+# folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1499,16 +1381,16 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
@@ -1520,9 +1402,9 @@ QHP_CUST_FILTER_ATTRS  =
 
 QHP_SECT_FILTER_ATTRS  =
 
-# The QHG_LOCATION tag can be used to specify the location (absolute path
-# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
-# run qhelpgenerator on the generated .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
@@ -1599,17 +1481,6 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
-# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
-# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
-# the HTML output. These images will generally look nicer at scaled resolutions.
-# Possible values are: png (the default) and svg (looks nicer but requires the
-# pdf2svg or inkscape tool).
-# The default value is: png.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FORMULA_FORMAT    = png
-
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1630,14 +1501,8 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
-# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
-# to create new LaTeX commands to be used in formulas as building blocks. See
-# the section "Including formulas" for details.
-
-FORMULA_MACROFILE      =
-
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# https://www.mathjax.org) which uses client side Javascript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1649,7 +1514,7 @@ USE_MATHJAX            = YES
 
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# http://docs.mathjax.org/en/latest/output.html) for more details.
 # Possible values are: HTML-CSS (which is slower, but has the best
 # compatibility), NativeMML (i.e. MathML) and SVG.
 # The default value is: HTML-CSS.
@@ -1665,7 +1530,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
 # MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1680,8 +1545,7 @@ MATHJAX_EXTENSIONS     = TeX/AMSmath \
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
-# (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1709,7 +1573,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using JavaScript. There
+# implemented using a web server instead of a web client using Javascript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1728,8 +1592,7 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/).
+# Xapian (see: https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1742,9 +1605,8 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/). See the section "External Indexing and Searching" for
-# details.
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
+# Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
@@ -1908,11 +1770,9 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
-# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
-# files. Set this option to YES, to get a higher quality PDF documentation.
-#
-# See also section LATEX_CMD_NAME for selecting the engine.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -2344,7 +2204,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
-# The default value is: YES.
+# The default value is: NO.
 
 HAVE_DOT               = YES
 
@@ -2423,31 +2283,9 @@ UML_LOOK               = NO
 # but if the number exceeds 15, the total amount of fields shown is limited to
 # 10.
 # Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
-# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
-# tag is set to YES, doxygen will add type and arguments for attributes and
-# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
-# will not generate fields with class member information in the UML graphs. The
-# class diagrams will look similar to the default class diagrams but using UML
-# notation for the relationships.
-# Possible values are: NO, YES and NONE.
-# The default value is: NO.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-DOT_UML_DETAILS        = NO
-
-# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
-# to display on a single line. If the actual line length exceeds this threshold
-# significantly it will wrapped across multiple lines. Some heuristics are apply
-# to avoid ugly line breaks.
-# Minimum value: 0, maximum value: 1000, default value: 17.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_WRAP_THRESHOLD     = 17
+UML_LIMIT_NUM_FIELDS   = 10
 
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
@@ -2522,9 +2360,7 @@ DIRECTORY_GRAPH        = NO
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
-# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
-# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
 # png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
 # png:gdiplus:gdiplus.
 # The default value is: png.
@@ -2640,11 +2476,9 @@ DOT_MULTI_TARGETS      = YES
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
 # files that are used to generate the various graphs.
-#
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
 # The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

MODULE.bazel

@@ -1,3 +0,0 @@
-module(name = "catch2")
-
-bazel_dep(name = "bazel_skylib", version = "1.7.1")

README.md

@@ -1,5 +1,5 @@
 <a id="top"></a>
-![Catch2 logo](data/artwork/catch2-logo-small-with-background.png)
+![Catch2 logo](data/artwork/catch2-logo-small.png)
 
 [![Github Releases](https://img.shields.io/github/release/catchorg/catch2.svg)](https://github.com/catchorg/catch2/releases)
 [![Linux build status](https://github.com/catchorg/Catch2/actions/workflows/linux-simple-builds.yml/badge.svg)](https://github.com/catchorg/Catch2/actions/workflows/linux-simple-builds.yml)
@@ -11,82 +11,31 @@
 [![Join the chat in Discord: https://discord.gg/4CWS9zD](https://img.shields.io/badge/Discord-Chat!-brightgreen.svg)](https://discord.gg/4CWS9zD)
 
 
-## What is Catch2?
+## What's the Catch2?
 
 Catch2 is mainly a unit testing framework for C++, but it also
 provides basic micro-benchmarking features, and simple BDD macros.
 
 Catch2's main advantage is that using it is both simple and natural.
-Test names do not have to be valid identifiers, assertions look like
-normal C++ boolean expressions, and sections provide a nice and local way
-to share set-up and tear-down code in tests.
-
-**Example unit test**
-```cpp
-#include <catch2/catch_test_macros.hpp>
-
-#include <cstdint>
-
-uint32_t factorial( uint32_t number ) {
-    return number <= 1 ? number : factorial(number-1) * number;
-}
-
-TEST_CASE( "Factorials are computed", "[factorial]" ) {
-    REQUIRE( factorial( 1) == 1 );
-    REQUIRE( factorial( 2) == 2 );
-    REQUIRE( factorial( 3) == 6 );
-    REQUIRE( factorial(10) == 3'628'800 );
-}
-```
-
-**Example microbenchmark**
-```cpp
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/benchmark/catch_benchmark.hpp>
-
-#include <cstdint>
-
-uint64_t fibonacci(uint64_t number) {
-    return number < 2 ? number : fibonacci(number - 1) + fibonacci(number - 2);
-}
-
-TEST_CASE("Benchmark Fibonacci", "[!benchmark]") {
-    REQUIRE(fibonacci(5) == 5);
-
-    REQUIRE(fibonacci(20) == 6'765);
-    BENCHMARK("fibonacci 20") {
-        return fibonacci(20);
-    };
-
-    REQUIRE(fibonacci(25) == 75'025);
-    BENCHMARK("fibonacci 25") {
-        return fibonacci(25);
-    };
-}
-```
-
-_Note that benchmarks are not run by default, so you need to run it explicitly
-with the `[!benchmark]` tag._
+Tests autoregister themselves and do not have to be named with valid
+identifiers, assertions look like normal C++ code, and sections provide
+a nice way to share set-up and tear-down code in tests.
 
 
-## Catch2 v3 has been released!
+## Catch2 v3 is being developed!
 
-You are on the `devel` branch, where the v3 version is being developed.
-v3 brings a bunch of significant changes, the big one being that Catch2
-is no longer a single-header library. Catch2 now behaves as a normal
-library, with multiple headers and separately compiled implementation.
+You are on the `devel` branch, where the next major version, v3, of
+Catch2 is being developed. As it is a significant rework, you will
+find that parts of this documentation are likely still stuck on v2.
 
-The documentation is slowly being updated to take these changes into
-account, but this work is currently still ongoing.
+For stable (and documentation-matching) version of Catch2, [go to the
+`v2.x` branch](https://github.com/catchorg/Catch2/tree/v2.x).
 
 For migrating from the v2 releases to v3, you should look at [our
 documentation](docs/migrate-v2-to-v3.md#top). It provides a simple
 guidelines on getting started, and collects most common migration
 problems.
 
-For the previous major version of Catch2 [look into the `v2.x` branch
-here on GitHub](https://github.com/catchorg/Catch2/tree/v2.x).
-
 
 ## How to use it
 This documentation comprises these three parts:

WORKSPACE

@@ -0,0 +1,14 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "bazel_skylib",
+    strip_prefix = "bazel-skylib-2a87d4a62af886fb320883aba102255aba87275e",
+    urls = [
+        "https://github.com/bazelbuild/bazel-skylib/archive/2a87d4a62af886fb320883aba102255aba87275e.tar.gz",
+    ],
+    sha256 = "d847b08d6702d2779e9eb399b54ff8920fa7521dc45e3e53572d1d8907767de7",
+)
+
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+
+bazel_skylib_workspace()

WORKSPACE.bazel

@@ -1,16 +0,0 @@
-workspace(name = "catch2")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "bazel_skylib",
-    sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
-    ],
-)
-
-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
-
-bazel_skylib_workspace()

appveyor.yml

@@ -5,10 +5,10 @@ version: "{build}-{branch}"
 clone_depth: 20
 
 # We want to build everything, except for branches that are explicitly
-# for messing around with Github Actions.
+# for messing around with travis.
 branches:
   except:
-    - /devel-gha.+/
+    - /dev-travis.+/
 
 
 # We need a more up to date pip because Python 2.7 is EOL soon
@@ -51,6 +51,18 @@ test_script:
 # build explicitly.
 environment:
   matrix:
+    - FLAVOR: VS 2019 x64 Debug Surrogates Configure Tests
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      surrogates: 1
+      configure_tests: 1
+      platform: x64
+      configuration: Debug
+    
+    - FLAVOR: VS 2019 x64 Release
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      platform: x64
+      configuration: Release
+
     - FLAVOR: VS 2019 x64 Debug Coverage Examples
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       examples: 1
@@ -65,6 +77,11 @@ environment:
       platform: x64
       configuration: Debug
 
+    - FLAVOR: VS 2019 Win32 Debug
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      platform: Win32
+      configuration: Debug
+
     - FLAVOR: VS 2019 x64 Debug Latest Strict
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       additional_flags: "/permissive- /std:c++latest"
@@ -75,9 +92,38 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x64
       configuration: Debug
+    
+    - FLAVOR: VS 2017 x64 Release
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: x64
+      configuration: Release
 
     - FLAVOR: VS 2017 x64 Release Coverage
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       coverage: 1
       platform: x64
       configuration: Debug
+
+    - FLAVOR: VS 2017 Win32 Debug
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: Win32
+      configuration: Debug
+
+    - FLAVOR: VS 2017 Win32 Debug Examples
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      examples: 1
+      platform: Win32
+      configuration: Debug
+
+    - FLAVOR: VS 2017 Win32 Debug WMain
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      wmain: 1
+      additional_flags: "/D_UNICODE /DUNICODE"
+      platform: Win32
+      configuration: Debug
+
+    - FLAVOR: VS 2017 x64 Debug Latest Strict
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      additional_flags: "/permissive- /std:c++latest"
+      platform: x64
+      configuration: Debug

conanfile.py

@@ -1,14 +1,5 @@
 #!/usr/bin/env python
-from conan import ConanFile
-from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout
-from conan.tools.files import copy, rmdir
-from conan.tools.build import check_min_cppstd
-from conan.tools.scm import Version
-from conan.errors import ConanInvalidConfiguration
-import os
-import re
-
-required_conan_version = ">=1.53.0"
+from conans import ConanFile, CMake, tools
 
 class CatchConan(ConanFile):
     name = "catch2"
@@ -17,113 +8,53 @@ class CatchConan(ConanFile):
     url = "https://github.com/catchorg/Catch2"
     homepage = url
     license = "BSL-1.0"
-    version = "latest"
+
+    exports = "LICENSE.txt"
+    exports_sources = ("src/*", "CMakeLists.txt", "CMake/*", "extras/*")
+
     settings = "os", "compiler", "build_type", "arch"
-    extension_properties = {"compatibility_cppstd": False}
 
-    options = {
-        "shared": [True, False],
-        "fPIC": [True, False],
-    }
-    default_options = {
-        "shared": False,
-        "fPIC": True,
-    }
+    generators = "cmake"
 
-    @property
-    def _min_cppstd(self):
-        return "14"
-
-    @property
-    def _compilers_minimum_version(self):
-        return {
-            "gcc": "7",
-            "Visual Studio": "15",
-            "msvc": "191",
-            "clang": "5",
-            "apple-clang": "10",
-        }
-
-
-    def set_version(self):
-        pattern = re.compile(r"\w*VERSION (\d+\.\d+\.\d+) # CML version placeholder, don't delete")
-        with open("CMakeLists.txt") as file:
-            for line in file:
-                result = pattern.search(line)
-                if result:
-                    self.version = result.group(1)
-
-        self.output.info(f'Using version: {self.version}')
-
-    def export(self):
-        copy(self, "LICENSE.txt", src=self.recipe_folder, dst=self.export_folder)
-
-    def export_sources(self):
-        copy(self, "CMakeLists.txt", src=self.recipe_folder, dst=self.export_sources_folder)
-        copy(self, "src/*", src=self.recipe_folder, dst=self.export_sources_folder)
-        copy(self, "extras/*", src=self.recipe_folder, dst=self.export_sources_folder)
-        copy(self, "CMake/*", src=self.recipe_folder, dst=self.export_sources_folder)
-
-    def config_options(self):
-        if self.settings.os == "Windows":
-            del self.options.fPIC
-
-    def configure(self):
-        if self.options.shared:
-            self.options.rm_safe("fPIC")
-
-    def layout(self):
-        cmake_layout(self)
-
-    def validate(self):
-        if self.settings.compiler.get_safe("cppstd"):
-            check_min_cppstd(self, self._min_cppstd)
-        # INFO: Conan 1.x does not specify cppstd by default, so we need to check the compiler version instead.
-        minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False)
-        if minimum_version and Version(self.settings.compiler.version) < minimum_version:
-            raise ConanInvalidConfiguration(f"{self.ref} requires C++{self._min_cppstd}, which your compiler doesn't support")
-
-    def generate(self):
-        tc = CMakeToolchain(self)
-        tc.cache_variables["BUILD_TESTING"] = False
-        tc.cache_variables["CATCH_INSTALL_DOCS"] = False
-        tc.cache_variables["CATCH_INSTALL_EXTRAS"] = True
-        tc.generate()
-
-        deps = CMakeDeps(self)
-        deps.generate()
+    def _configure_cmake(self):
+        cmake = CMake(self)
+        cmake.definitions["BUILD_TESTING"] = "OFF"
+        cmake.definitions["CATCH_INSTALL_DOCS"] = "OFF"
+        cmake.definitions["CATCH_INSTALL_EXTRAS"] = "ON"
+        cmake.configure(build_folder="build")
+        return cmake
 
     def build(self):
-        cmake = CMake(self)
-        cmake.configure()
+        # We need this workaround until the toolchains feature
+        # to inject stuff like MD/MT
+        line_to_replace = 'list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")'
+        tools.replace_in_file("CMakeLists.txt", line_to_replace,
+                              '''{}
+include("{}/conanbuildinfo.cmake")
+conan_basic_setup()'''.format(line_to_replace, self.install_folder.replace("\\", "/")))
+
+        cmake = self._configure_cmake()
         cmake.build()
 
     def package(self):
-        copy(self, "LICENSE.txt", src=str(self.recipe_folder), dst=os.path.join(self.package_folder, "licenses"))
-        cmake = CMake(self)
+        self.copy(pattern="LICENSE.txt", dst="licenses")
+        cmake = self._configure_cmake()
         cmake.install()
-        rmdir(self, os.path.join(self.package_folder, "share"))
-        rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
-        copy(self, "*.cmake", src=os.path.join(self.export_sources_folder, "extras"),
-                              dst=os.path.join(self.package_folder, "lib", "cmake", "Catch2"))
 
     def package_info(self):
         lib_suffix = "d" if self.settings.build_type == "Debug" else ""
 
-        self.cpp_info.set_property("cmake_file_name", "Catch2")
-        self.cpp_info.set_property("cmake_target_name", "Catch2::Catch2WithMain")
-        self.cpp_info.set_property("pkg_config_name", "catch2-with-main")
-
+        self.cpp_info.names["cmake_find_package"] = "Catch2"
+        self.cpp_info.names["cmake_find_package_multi"] = "Catch2"
         # Catch2
-        self.cpp_info.components["catch2base"].set_property("cmake_file_name", "Catch2::Catch2")
-        self.cpp_info.components["catch2base"].set_property("cmake_target_name", "Catch2::Catch2")
-        self.cpp_info.components["catch2base"].set_property("pkg_config_name", "catch2")
+        self.cpp_info.components["catch2base"].names["cmake_find_package"] = "Catch2"
+        self.cpp_info.components["catch2base"].names["cmake_find_package_multi"] = "Catch2"
+        self.cpp_info.components["catch2base"].names["pkg_config"] = "Catch2"
         self.cpp_info.components["catch2base"].libs = ["Catch2" + lib_suffix]
         self.cpp_info.components["catch2base"].builddirs.append("lib/cmake/Catch2")
-
         # Catch2WithMain
-        self.cpp_info.components["catch2main"].set_property("cmake_file_name", "Catch2::Catch2WithMain")
-        self.cpp_info.components["catch2main"].set_property("cmake_target_name", "Catch2::Catch2WithMain")
-        self.cpp_info.components["catch2main"].set_property("pkg_config_name", "catch2-with-main")
+        self.cpp_info.components["catch2main"].names["cmake_find_package"] = "Catch2WithMain"
+        self.cpp_info.components["catch2main"].names["cmake_find_package_multi"] = "Catch2WithMain"
+        self.cpp_info.components["catch2main"].names["pkg_config"] = "Catch2WithMain"
         self.cpp_info.components["catch2main"].libs = ["Catch2Main" + lib_suffix]
         self.cpp_info.components["catch2main"].requires = ["catch2base"]

docs/Readme.md

@@ -4,36 +4,34 @@
 To get the most out of Catch2, start with the [tutorial](tutorial.md#top).
 Once you're up and running consider the following reference material.
 
-**Writing tests:**
+Writing tests:
 * [Assertion macros](assertions.md#top)
-* [Matchers (asserting complex properties)](matchers.md#top)
-* [Comparing floating point numbers](comparing-floating-point-numbers.md#top)
+* [Matchers](matchers.md#top)
 * [Logging macros](logging.md#top)
 * [Test cases and sections](test-cases-and-sections.md#top)
 * [Test fixtures](test-fixtures.md#top)
-* [Explicitly skipping, passing, and failing tests at runtime](skipping-passing-failing.md#top)
-* [Reporters (output customization)](reporters.md#top)
+* [Reporters](reporters.md#top)
 * [Event Listeners](event-listeners.md#top)
-* [Data Generators (value parameterized tests)](generators.md#top)
+* [Data Generators](generators.md#top)
 * [Other macros](other-macros.md#top)
 * [Micro benchmarking](benchmarks.md#top)
 
-**Fine tuning:**
+Fine tuning:
 * [Supplying your own main()](own-main.md#top)
 * [Compile-time configuration](configuration.md#top)
 * [String Conversions](tostring.md#top)
 
-**Running:**
+Running:
 * [Command line](command-line.md#top)
 
-**Odds and ends:**
+Odds and ends:
 * [Frequently Asked Questions (FAQ)](faq.md#top)
 * [Best practices and other tips](usage-tips.md#top)
 * [CMake integration](cmake-integration.md#top)
-* [Tooling integration (CI, test runners, other)](ci-and-misc.md#top)
+* [CI and other miscellaneous pieces](ci-and-misc.md#top)
 * [Known limitations](limitations.md#top)
-
-**Other:**
+ 
+Other:
 * [Why Catch2?](why-catch.md#top)
 * [Migrating from v2 to v3](migrate-v2-to-v3.md#top)
 * [Open Source Projects using Catch2](opensource-users.md#top)

docs/assertions.md

@@ -3,7 +3,6 @@
 
 **Contents**<br>
 [Natural Expressions](#natural-expressions)<br>
-[Floating point comparisons](#floating-point-comparisons)<br>
 [Exceptions](#exceptions)<br>
 [Matcher expressions](#matcher-expressions)<br>
 [Thread Safety](#thread-safety)<br>
@@ -20,7 +19,7 @@ Most of these macros come in two forms:
 The ```REQUIRE``` family of macros tests an expression and aborts the test case if it fails.
 The ```CHECK``` family are equivalent but execution continues in the same test case even if the assertion fails. This is useful if you have a series of essentially orthogonal assertions and it is useful to see all the results rather than stopping at the first failure.
 
-* **REQUIRE(** _expression_ **)** and
+* **REQUIRE(** _expression_ **)** and  
 * **CHECK(** _expression_ **)**
 
 Evaluates the expression and records the result. If an exception is thrown, it is caught, reported, and counted as a failure. These are the macros you will use most of the time.
@@ -32,85 +31,105 @@ CHECK( thisReturnsTrue() );
 REQUIRE( i == 42 );
 ```
 
-Expressions prefixed with `!` cannot be decomposed. If you have a type
-that is convertible to bool and you want to assert that it evaluates to
-false, use the two forms below:
-
-
-* **REQUIRE_FALSE(** _expression_ **)** and
+* **REQUIRE_FALSE(** _expression_ **)** and  
 * **CHECK_FALSE(** _expression_ **)**
 
-Note that there is no reason to use these forms for plain bool variables,
-because there is no added value in decomposing them.
+Evaluates the expression and records the _logical NOT_ of the result. If an exception is thrown it is caught, reported, and counted as a failure.
+(these forms exist as a workaround for the fact that ! prefixed expressions cannot be decomposed).
 
 Example:
-```cpp
-Status ret = someFunction();
-REQUIRE_FALSE(ret); // ret must evaluate to false, and Catch2 will print
-                    // out the value of ret if possibly
+```
+REQUIRE_FALSE( thisReturnsFalse() );
 ```
 
+Do note that "overly complex" expressions cannot be decomposed and thus will not compile. This is done partly for practical reasons (to keep the underlying expression template machinery to minimum) and partly for philosophical reasons (assertions should be simple and deterministic).
 
-### Other limitations
-
-Note that expressions containing either of the binary logical operators,
-`&&` or `||`, cannot be decomposed and will not compile. The reason behind
-this is that it is impossible to overload `&&` and `||` in a way that
-keeps their short-circuiting semantics, and expression decomposition
-relies on overloaded operators to work.
-
-Simple example of an issue with overloading binary logical operators
-is a common pointer idiom, `p && p->foo == 2`. Using the built-in `&&`
-operator, `p` is only dereferenced if it is not null. With overloaded
-`&&`, `p` is always dereferenced, thus causing a segfault if
-`p == nullptr`.
-
-If you want to test expression that contains `&&` or `||`, you have two
-options.
-
-1) Enclose it in parentheses. Parentheses force evaluation of the expression
-   before the expression decomposition can touch it, and thus it cannot
-   be used.
-
-2) Rewrite the expression. `REQUIRE(a == 1 && b == 2)` can always be split
-   into `REQUIRE(a == 1); REQUIRE(b == 2);`. Alternatively, if this is a
-   common pattern in your tests, think about using [Matchers](#matcher-expressions).
-   instead. There is no simple rewrite rule for `||`, but I generally
-   believe that if you have `||` in your test expression, you should rethink
-   your tests.
+Examples:
+* `CHECK(a == 1 && b == 2);`
+This expression is too complex because of the `&&` operator. If you want to check that 2 or more properties hold, you can either put the expression into parenthesis, which stops decomposition from working, or you need to decompose the expression into two assertions: `CHECK( a == 1 ); CHECK( b == 2);`
+* `CHECK( a == 2 || b == 1 );`
+This expression is too complex because of the `||` operator. If you want to check that one of several properties hold, you can put the expression into parenthesis (unlike with `&&`, expression decomposition into several `CHECK`s is not possible).
 
 
-## Floating point comparisons
+### Floating point comparisons
 
-Comparing floating point numbers is complex, and [so it has its own
-documentation page](comparing-floating-point-numbers.md#top).
+When comparing floating point numbers - especially if at least one of them has been computed - great care must be taken to allow for rounding errors and inexact representations.
+
+Catch provides a way to perform tolerant comparisons of floating point values through use of a wrapper class called `Approx`. `Approx` can be used on either side of a comparison expression. It overloads the comparisons operators to take a tolerance into account. Here's a simple example:
+
+```cpp
+REQUIRE( performComputation() == Approx( 2.1 ) );
+```
+
+Catch also provides a user-defined literal for `Approx`; `_a`. It resides in
+the `Catch::literals` namespace and can be used like so:
+```cpp
+using namespace Catch::literals;
+REQUIRE( performComputation() == 2.1_a );
+```
+
+`Approx` is constructed with defaults that should cover most simple cases.
+For the more complex cases, `Approx` provides 3 customization points:
+
+* __epsilon__ - epsilon serves to set the coefficient by which a result
+can differ from `Approx`'s value before it is rejected.
+_By default set to `std::numeric_limits<float>::epsilon()*100`._
+* __margin__ - margin serves to set the the absolute value by which
+a result can differ from `Approx`'s value before it is rejected.
+_By default set to `0.0`._
+* __scale__ - scale is used to change the magnitude of `Approx` for relative check.
+_By default set to `0.0`._
+
+#### epsilon example
+```cpp
+Approx target = Approx(100).epsilon(0.01);
+100.0 == target; // Obviously true
+200.0 == target; // Obviously still false
+100.5 == target; // True, because we set target to allow up to 1% difference
+```
+
+#### margin example
+```cpp
+Approx target = Approx(100).margin(5);
+100.0 == target; // Obviously true
+200.0 == target; // Obviously still false
+104.0 == target; // True, because we set target to allow absolute difference of at most 5
+```
+
+#### scale
+Scale can be useful if the computation leading to the result worked
+on different scale than is used by the results. Since allowed difference
+between Approx's value and compared value is based primarily on Approx's value
+(the allowed difference is computed as
+`(Approx::scale + Approx::value) * epsilon`), the resulting comparison could
+need rescaling to be correct.
 
 
 ## Exceptions
 
-* **REQUIRE_NOTHROW(** _expression_ **)** and
+* **REQUIRE_NOTHROW(** _expression_ **)** and  
 * **CHECK_NOTHROW(** _expression_ **)**
 
 Expects that no exception is thrown during evaluation of the expression.
 
-* **REQUIRE_THROWS(** _expression_ **)** and
+* **REQUIRE_THROWS(** _expression_ **)** and  
 * **CHECK_THROWS(** _expression_ **)**
 
 Expects that an exception (of any type) is be thrown during evaluation of the expression.
 
-* **REQUIRE_THROWS_AS(** _expression_, _exception type_ **)** and
+* **REQUIRE_THROWS_AS(** _expression_, _exception type_ **)** and  
 * **CHECK_THROWS_AS(** _expression_, _exception type_ **)**
 
 Expects that an exception of the _specified type_ is thrown during evaluation of the expression. Note that the _exception type_ is extended with `const&` and you should not include it yourself.
 
-* **REQUIRE_THROWS_WITH(** _expression_, _string or string matcher_ **)** and
+* **REQUIRE_THROWS_WITH(** _expression_, _string or string matcher_ **)** and  
 * **CHECK_THROWS_WITH(** _expression_, _string or string matcher_ **)**
 
 Expects that an exception is thrown that, when converted to a string, matches the _string_ or _string matcher_ provided (see next section for Matchers).
 
 e.g.
 ```cpp
-REQUIRE_THROWS_WITH( openThePodBayDoors(), ContainsSubstring( "afraid" ) && ContainsSubstring( "can't do that" ) );
+REQUIRE_THROWS_WITH( openThePodBayDoors(), Contains( "afraid" ) && Contains( "can't do that" ) );
 REQUIRE_THROWS_WITH( dismantleHal(), "My mind is going" );
 ```
 
@@ -139,8 +158,8 @@ REQUIRE_NOTHROW([&](){
 
 To support Matchers a slightly different form is used. Matchers have [their own documentation](matchers.md#top).
 
-* **REQUIRE_THAT(** _lhs_, _matcher expression_ **)** and
-* **CHECK_THAT(** _lhs_, _matcher expression_ **)**
+* **REQUIRE_THAT(** _lhs_, _matcher expression_ **)** and  
+* **CHECK_THAT(** _lhs_, _matcher expression_ **)**  
 
 Matchers can be composed using `&&`, `||` and `!` operators.
 

docs/benchmarks.md

@@ -93,7 +93,7 @@ Fibonacci
 -------------------------------------------------------------------------------
 C:\path\to\Catch2\Benchmark.tests.cpp(10)
 ...............................................................................
-benchmark name                                  samples       iterations    est run time
+benchmark name                                  samples       iterations    estimated
                                                 mean          low mean      high mean
                                                 std dev       low std dev   high std dev
 -------------------------------------------------------------------------------

docs/ci-and-misc.md

@@ -1,15 +1,14 @@
 <a id="top"></a>
-# Tooling integration (CI, test runners and so on)
+# CI and other odd pieces
 
 **Contents**<br>
 [Continuous Integration systems](#continuous-integration-systems)<br>
-[Bazel test runner integration](#bazel-test-runner-integration)<br>
+[Other reporters](#other-reporters)<br>
 [Low-level tools](#low-level-tools)<br>
 [CMake](#cmake)<br>
 
-This page talks about Catch2's integration with other related tooling,
-like Continuous Integration and 3rd party test runners.
-
+This page talks about how Catch integrates with Continuous Integration 
+Build Systems may refer to low-level tools, like CMake, or larger systems that run on servers, like Jenkins or TeamCity. This page will talk about both.
 
 ## Continuous Integration systems
 
@@ -18,9 +17,9 @@ Probably the most important aspect to using Catch with a build server is the use
 Two of these reporters are built in (XML and JUnit) and the third (TeamCity) is included as a separate header. It's possible that the other two may be split out in the future too - as that would make the core of Catch smaller for those that don't need them.
 
 ### XML Reporter
-```-r xml```
+```-r xml``` 
 
-The XML Reporter writes in an XML format that is specific to Catch.
+The XML Reporter writes in an XML format that is specific to Catch. 
 
 The advantage of this format is that it corresponds well to the way Catch works (especially the more unusual features, such as nested sections) and is a fully streaming format - that is it writes output as it goes, without having to store up all its results before it can start writing.
 
@@ -35,6 +34,19 @@ The advantage of this format is that the JUnit Ant schema is widely understood b
 
 The disadvantage is that this schema was designed to correspond to how JUnit works - and there is a significant mismatch with how Catch works. Additionally the format is not streamable (because opening elements hold counts of failed and passing tests as attributes) - so the whole test run must complete before it can be written.
 
+## Other reporters
+Other reporters are not part of the single-header distribution and need
+to be downloaded and included separately. All reporters are stored in
+`single_include` directory in the git repository, and are named
+`catch_reporter_*.hpp`. For example, to use the TeamCity reporter you
+need to download `single_include/catch_reporter_teamcity.hpp` and include
+it after Catch itself.
+
+```cpp
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
+#include "catch_reporter_teamcity.hpp"
+```
 
 ### TeamCity Reporter
 ```-r teamcity```
@@ -57,32 +69,22 @@ Because of the incremental nature of Catch's test suites and ability to run spec
 ```-r sonarqube```
 [SonarQube Generic Test Data](https://docs.sonarqube.org/latest/analysis/generic-test/) XML format for tests metrics.
 
-
-## Bazel test runner integration
-
-Catch2 understands some of the environment variables Bazel uses to control
-test execution. Specifically it understands
-
- * JUnit output path via `XML_OUTPUT_FILE`
- * Test filtering via `TESTBRIDGE_TEST_ONLY`
- * Test sharding via `TEST_SHARD_INDEX`, `TEST_TOTAL_SHARDS`, and `TEST_SHARD_STATUS_FILE`
-
-> Support for `XML_OUTPUT_FILE` was [introduced](https://github.com/catchorg/Catch2/pull/2399) in Catch2 3.0.1
-
-> Support for `TESTBRIDGE_TEST_ONLY` and sharding was introduced in Catch2 3.2.0
-
-This integration is enabled via either a [compile time configuration
-option](configuration.md#bazel-support), or via `BAZEL_TEST` environment
-variable set to "1".
-
-> Support for `BAZEL_TEST` was [introduced](https://github.com/catchorg/Catch2/pull/2459) in Catch2 3.1.0
-
-
 ## Low-level tools
 
+### Precompiled headers (PCHs)
+
+Catch offers prototypal support for being included in precompiled headers, but because of its single-header nature it does need some actions by the user:
+* The precompiled header needs to define `CATCH_CONFIG_ALL_PARTS`
+* The implementation file needs to
+  * undefine `TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED`
+  * define `CATCH_CONFIG_IMPL_ONLY`
+  * define `CATCH_CONFIG_MAIN` or `CATCH_CONFIG_RUNNER`
+  * include "catch.hpp" again
+
+
 ### CodeCoverage module (GCOV, LCOV...)
 
-If you are using GCOV tool to get testing coverage of your code, and are not sure how to integrate it with CMake and Catch, there should be an external example over at https://github.com/claremacrae/catch_cmake_coverage
+If you are using GCOV tool to get testing coverage of your code, and are not sure how to integrate it with CMake and Catch, there should be an external example over at https://github.com/fkromer/catch_cmake_coverage
 
 
 ### pkg-config

docs/cmake-integration.md

@@ -8,7 +8,6 @@
 [`CATCH_CONFIG_*` customization options in CMake](#catch_config_-customization-options-in-cmake)<br>
 [Installing Catch2 from git repository](#installing-catch2-from-git-repository)<br>
 [Installing Catch2 from vcpkg](#installing-catch2-from-vcpkg)<br>
-[Installing Catch2 from Bazel](#installing-catch2-from-bazel)<br>
 
 Because we use CMake to build Catch2, we also provide a couple of
 integration points for our users.
@@ -52,7 +51,7 @@ Include(FetchContent)
 FetchContent_Declare(
   Catch2
   GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-  GIT_TAG        v3.4.0 # or a later release
+  GIT_TAG        v3.0.1 # or a later release
 )
 
 FetchContent_MakeAvailable(Catch2)
@@ -91,12 +90,12 @@ cmake_minimum_required(VERSION 3.5)
 project(baz LANGUAGES CXX VERSION 0.0.1)
 
 find_package(Catch2 REQUIRED)
-add_executable(tests test.cpp)
-target_link_libraries(tests PRIVATE Catch2::Catch2)
+add_executable(foo test.cpp)
+target_link_libraries(foo PRIVATE Catch2::Catch2)
 
 include(CTest)
 include(Catch)
-catch_discover_tests(tests)
+catch_discover_tests(foo)
 ```
 
 When using `FetchContent`, `include(Catch)` will fail unless
@@ -109,11 +108,11 @@ directory.
 list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
 include(CTest)
 include(Catch)
-catch_discover_tests(tests)
+catch_discover_tests()
 ```
 
 #### Customization
-`catch_discover_tests` can be given several extra arguments:
+`catch_discover_tests` can be given several extra argumets:
 ```cmake
 catch_discover_tests(target
                      [TEST_SPEC arg1...]
@@ -127,7 +126,6 @@ catch_discover_tests(target
                      [OUTPUT_DIR dir]
                      [OUTPUT_PREFIX prefix]
                      [OUTPUT_SUFFIX suffix]
-                     [DISCOVERY_MODE <POST_BUILD|PRE_TEST>]
 )
 ```
 
@@ -200,16 +198,6 @@ If specified, `suffix` is added to each output file name, like so
 `--out dir/<test_name>suffix`. This can be used to add a file extension to
 the output file name e.g. ".xml".
 
-* `DISCOVERY_MODE mode`
-
-If specified allows control over when test discovery is performed.
-For a value of `POST_BUILD` (default) test discovery is performed at build time.
-For a value of `PRE_TEST` test discovery is delayed until just prior to test
-execution (useful e.g. in cross-compilation environments).
-``DISCOVERY_MODE`` defaults to the value of the
-``CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE`` variable if it is not passed when
-calling ``catch_discover_tests``. This provides a mechanism for globally
-selecting a preferred test discovery behavior.
 
 ### `ParseAndAddCatchTests.cmake`
 
@@ -234,12 +222,12 @@ cmake_minimum_required(VERSION 3.5)
 project(baz LANGUAGES CXX VERSION 0.0.1)
 
 find_package(Catch2 REQUIRED)
-add_executable(tests test.cpp)
-target_link_libraries(tests PRIVATE Catch2::Catch2)
+add_executable(foo test.cpp)
+target_link_libraries(foo PRIVATE Catch2::Catch2)
 
 include(CTest)
 include(ParseAndAddCatchTests)
-ParseAndAddCatchTests(tests)
+ParseAndAddCatchTests(foo)
 ```
 
 
@@ -385,7 +373,7 @@ install it to the default location, like so:
 ```
 $ git clone https://github.com/catchorg/Catch2.git
 $ cd Catch2
-$ cmake -B build -S . -DBUILD_TESTING=OFF
+$ cmake -Bbuild -H. -DBUILD_TESTING=OFF
 $ sudo cmake --build build/ --target install
 ```
 
@@ -409,24 +397,6 @@ cd vcpkg
 The catch2 port in vcpkg is kept up to date by microsoft team members and community contributors.
 If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
 
-## Installing Catch2 from Bazel
-
-Catch2 is now a supported module in the Bazel Central Registry. You only need to add one line to your MODULE.bazel file;
-please see https://registry.bazel.build/modules/catch2 for the latest supported version.
-
-You can then add `catch2_main` to each of your C++ test build rules as follows:
-
-```
-cc_test(
-    name = "example_test",
-    srcs = ["example_test.cpp"],
-    deps = [
-        ":example",
-        "@catch2//:catch2_main",
-    ],
-)
-```
-
 ---
 
 [Home](Readme.md#top)

docs/command-line.md

@@ -85,102 +85,43 @@ Click one of the following links to take you straight to that option - or scroll
 
 <pre>&lt;test-spec> ...</pre>
 
-By providing a test spec, you filter which tests will be run. If you call
-Catch2 without any test spec, then it will run all non-hidden test
-cases. A test case is hidden if it has the `[!benchmark]` tag, any tag
-with a dot at the start, e.g. `[.]` or `[.foo]`.
+Test cases, wildcarded test cases, tags and tag expressions are all passed directly as arguments. Tags are distinguished by being enclosed in square brackets.
 
-There are three basic test specs that can then be combined into more
-complex specs:
+If no test specs are supplied then all test cases, except "hidden" tests, are run.
+A test is hidden by giving it any tag starting with (or just) a period (```.```) - or, in the deprecated case, tagged ```[hide]``` or given name starting with `'./'`. To specify hidden tests from the command line ```[.]``` or ```[hide]``` can be used *regardless of how they were declared*.
 
-  * Full test name, e.g. `"Test 1"`.
+Specs must be enclosed in quotes if they contain spaces. If they do not contain spaces the quotes are optional.
 
-    This allows only test cases whose name is "Test 1".
+Wildcards consist of the `*` character at the beginning and/or end of test case names and can substitute for any number of any characters (including none).
 
-  * Wildcarded test name, e.g. `"*Test"`, or `"Test*"`, or `"*Test*"`.
+Test specs are case insensitive.
 
-    This allows any test case whose name ends with, starts with, or contains
-    in the middle the string "Test". Note that the wildcard can only be at
-    the start or end.
+If a spec is prefixed with `exclude:` or the `~` character then the pattern matches an exclusion. This means that tests matching the pattern are excluded from the set - even if a prior inclusion spec included them. Subsequent inclusion specs will take precedence, however.
+Inclusions and exclusions are evaluated in left-to-right order.
 
-  * Tag name, e.g. `[some-tag]`.
+Test case examples:
 
-    This allows any test case tagged with "[some-tag]". Remember that some
-    tags are special, e.g. those that start with "." or with "!".
-
-
-You can also combine the basic test specs to create more complex test
-specs. You can:
-
-  * Concatenate specs to apply all of them, e.g. `[some-tag][other-tag]`.
-
-    This allows test cases that are tagged with **both** "[some-tag]" **and**
-    "[other-tag]". A test case with just "[some-tag]" will not pass the filter,
-    nor will test case with just "[other-tag]".
-
-  * Comma-join specs to apply any of them, e.g. `[some-tag],[other-tag]`.
-
-    This allows test cases that are tagged with **either** "[some-tag]" **or**
-    "[other-tag]". A test case with both will obviously also pass the filter.
-
-    Note that commas take precendence over simple concatenation. This means
-    that `[a][b],[c]` accepts tests that are tagged with either both "[a]" and
-    "[b]", or tests that are tagged with just "[c]".
-
-  * Negate the spec by prepending it with `~`, e.g. `~[some-tag]`.
-
-    This rejects any test case that is tagged with "[some-tag]". Note that
-    rejection takes precedence over other filters.
-
-    Note that negations always binds to the following _basic_ test spec.
-    This means that `~[foo][bar]` negates only the "[foo]" tag and not the
-    "[bar]" tag.
-
-Note that when Catch2 is deciding whether to include a test, first it
-checks whether the test matches any negative filters. If it does,
-the test is rejected. After that, the behaviour depends on whether there
-are positive filters as well. If there are no positive filters, all
-remaining non-hidden tests are included. If there are positive filters,
-only tests that match the positive filters are included.
-
-You can also match test names with special characters by escaping them
-with a backslash (`"\"`), e.g. a test named `"Do A, then B"` is matched
-by `"Do A\, then B"` test spec. Backslash also escapes itself.
-
-
-### Examples
-
-Given these TEST_CASEs,
 ```
-TEST_CASE("Test 1") {}
-
-TEST_CASE("Test 2", "[.foo]") {}
-
-TEST_CASE("Test 3", "[.bar]") {}
-
-TEST_CASE("Test 4", "[.][foo][bar]") {}
+thisTestOnly            Matches the test case called, 'thisTestOnly'
+"this test only"        Matches the test case called, 'this test only'
+these*                  Matches all cases starting with 'these'
+exclude:notThis         Matches all tests except, 'notThis'
+~notThis                Matches all tests except, 'notThis'
+~*private*              Matches all tests except those that contain 'private'
+a* ~ab* abc             Matches all tests that start with 'a', except those that
+                        start with 'ab', except 'abc', which is included
+~[tag1]                 Matches all tests except those tagged with '[tag1]'
+-# [#somefile]          Matches all tests from the file 'somefile.cpp'
 ```
 
-this is the result of these filters
-```
-./tests                      # Selects only the first test, others are hidden
-./tests "Test 1"             # Selects only the first test, other do not match
-./tests ~"Test 1"            # Selects no tests. Test 1 is rejected, other tests are hidden
-./tests "Test *"             # Selects all tests.
-./tests [bar]                # Selects tests 3 and 4. Other tests are not tagged [bar]
-./tests ~[foo]               # Selects test 1, because it is the only non-hidden test without [foo] tag
-./tests [foo][bar]           # Selects test 4.
-./tests [foo],[bar]          # Selects tests 2, 3, 4.
-./tests ~[foo][bar]          # Selects test 3. 2 and 4 are rejected due to having [foo] tag
-./tests ~"Test 2"[foo]       # Selects test 4, because test 2 is explicitly rejected
-./tests [foo][bar],"Test 1"  # Selects tests 1 and 4.
-./tests "Test 1*"            # Selects test 1, wildcard can match zero characters
-```
+Names within square brackets are interpreted as tags.
+A series of tags form an AND expression whereas a comma-separated sequence forms an OR expression. e.g.:
 
-_Note: Using plain asterisk on a command line can cause issues with shell
-expansion. Make sure that the asterisk is passed to Catch2 and is not
-interpreted by the shell._
+<pre>[one][two],[three]</pre>
+This matches all tests tagged `[one]` and `[two]`, as well as all tests tagged `[three]`
 
+Test names containing special characters, such as `,` or `[` can specify them on the command line using `\`.
+`\` also escapes itself.
 
 <a id="choosing-a-reporter-to-use"></a>
 ## Choosing a reporter to use
@@ -194,8 +135,7 @@ verbose and human-friendly output.
 
 Reporters are also individually configurable. To pass configuration options
 to the reporter, you append `::key=value` to the reporter specification
-as many times as you want, e.g. `--reporter xml::out=someFile.xml` or
-`--reporter custom::colour-mode=ansi::Xoption=2`.
+as many times as you want, e.g. `--reporter xml::out=someFile.xml`.
 
 The keys must either be prefixed by "X", in which case they are not parsed
 by Catch2 and are only passed down to the reporter, or one of options
@@ -208,7 +148,7 @@ validity, and throw an error if they are wrong._
 > Support for passing arguments to reporters through the `-r`, `--reporter` flag was introduced in Catch2 3.0.1
 
 There are multiple built-in reporters, you can see what they do by using the
-[`--list-reporters`](command-line.md#listing-available-tests-tags-or-reporters)
+[`--list-reporter`](command-line.md#listing-available-tests-tags-or-reporters)
 flag. If you need a reporter providing custom format outside of the already
 provided ones, look at the ["write your own reporter" part of the reporter
 documentation](reporters.md#writing-your-own-reporter).
@@ -344,7 +284,7 @@ This option transforms tabs and newline characters into ```\t``` and ```\n``` re
 <pre>-w, --warn &lt;warning name></pre>
 
 You can think of Catch2's warnings as the equivalent of `-Werror` (`/WX`)
-flag for C++ compilers. It turns some suspicious occurrences, like a section
+flag for C++ compilers. It turns some suspicious occurences, like a section
 without assertions, into errors. Because these might be intended, warnings
 are not enabled by default, but user can opt in.
 
@@ -366,14 +306,14 @@ There are currently two warnings implemented:
 ## Reporting timings
 <pre>-d, --durations &lt;yes/no></pre>
 
-When set to ```yes``` Catch will report the duration of each test case, in seconds with millisecond precision. Note that it does this regardless of whether a test case passes or fails. Note, also, the certain reporters (e.g. Junit) always report test case durations regardless of this option being set or not.
+When set to ```yes``` Catch will report the duration of each test case, in milliseconds. Note that it does this regardless of whether a test case passes or fails. Note, also, the certain reporters (e.g. Junit) always report test case durations regardless of this option being set or not.
 
 <pre>-D, --min-duration &lt;value></pre>
 
 > `--min-duration` was [introduced](https://github.com/catchorg/Catch2/pull/1910) in Catch2 2.13.0
 
 When set, Catch will report the duration of each test case that took more
-than &lt;value> seconds, in seconds with millisecond precision. This option is overridden by both
+than &lt;value> seconds, in milliseconds. This option is overriden by both
 `-d yes` and `-d no`, so that either all durations are reported, or none
 are.
 
@@ -399,8 +339,8 @@ Test cases are ordered one of three ways:
 
 ### decl
 Declaration order (this is the default order if no --order argument is provided).
-Tests in the same translation unit are sorted using their declaration orders,
-different TUs are sorted in an implementation (linking) dependent order.
+Tests in the same TU are sorted using their declaration orders, different
+TUs are in an implementation (linking) dependent order.
 
 
 ### lex
@@ -567,13 +507,10 @@ start of the first section.</br>
 ## Filenames as tags
 <pre>-#, --filenames-as-tags</pre>
 
-This option adds an extra tag to all test cases. The tag is `#` followed
-by the unqualified filename the test case is defined in, with the _last_
-extension stripped out.
-
-For example, tests within the file `tests\SelfTest\UsageTests\BDD.tests.cpp`
-will be given the `[#BDD.tests]` tag.
+When this option is used then every test is given an additional tag which is formed of the unqualified
+filename it is found in, with any extension stripped, prefixed with the `#` character.
 
+So, for example,  tests within the file `~\Dev\MyProject\Ferrets.cpp` would be tagged `[#Ferrets]`.
 
 <a id="colour-mode"></a>
 ## Override output colouring
@@ -611,8 +548,7 @@ starting at 0. The tests in the set given by
 `--shard-index <#shard index to run>` will be executed. The default shard
 count is `1`, and the default index to run is `0`.
 
-_Shard index must be less than number of shards. As the name suggests,
-it is treated as an index of the shard to run._
+_It is an error to specify a shard index greater than the number of shards._
 
 Sharding is useful when you want to split test execution across multiple
 processes, as is done with the [Bazel test sharding](https://docs.bazel.build/versions/main/test-encyclopedia.html#test-sharding).
@@ -624,17 +560,17 @@ processes, as is done with the [Bazel test sharding](https://docs.bazel.build/ve
 
 > Introduced in Catch2 3.0.1.
 
-By default, Catch2 test binaries return non-0 exit code if no tests were run,
-e.g. if the binary was compiled with no tests, the provided test spec matched no
-tests, or all tests [were skipped at runtime](skipping-passing-failing.md#top). This flag
-overrides that, so a test run with no tests still returns 0.
+By default, Catch2 test binaries return non-0 exit code if no tests were
+run, e.g. if the binary was compiled with no tests, or the provided test
+spec matched no tests. This flag overrides that, so a test run with no
+tests still returns 0.
 
 ## Output verbosity
 ```
 -v, --verbosity <quiet|normal|high>
 ```
 
-Changing verbosity might change how many details Catch2's reporters output.
+Changing verbosity might change how much details Catch2's reporters output.
 However, you should consider changing the verbosity level as a _suggestion_.
 Not all reporters support all verbosity levels, e.g. because the reporter's
 format cannot meaningfully change. In that case, the verbosity level is

docs/commercial-users.md

@@ -6,7 +6,7 @@ some of them that are willing to share this information.
 
 If you want to add your organisation, please check that there is no issue
 with you sharing this fact.
-
+ 
  - Bloomberg
  - [Bloomlife](https://bloomlife.com)
  - [Inscopix Inc.](https://www.inscopix.com/)
@@ -16,7 +16,7 @@ with you sharing this fact.
  - [Nexus Software Systems](https://nexwebsites.com)
  - [UX3D](https://ux3d.io)
  - [King](https://king.com)
-
+ 
 
 ---
 

docs/comparing-floating-point-numbers.md

@@ -1,192 +0,0 @@
-<a id="top"></a>
-# Comparing floating point numbers with Catch2
-
-If you are not deeply familiar with them, floating point numbers can be
-unintuitive. This also applies to comparing floating point numbers for
-(in)equality.
-
-This page assumes that you have some understanding of both FP, and the
-meaning of different kinds of comparisons, and only goes over what
-functionality Catch2 provides to help you with comparing floating point
-numbers. If you do not have this understanding, we recommend that you first
-study up on floating point numbers and their comparisons, e.g. by [reading
-this blog post](https://codingnest.com/the-little-things-comparing-floating-point-numbers/).
-
-
-## Floating point matchers
-
-```
-#include <catch2/matchers/catch_matchers_floating_point.hpp>
-```
-
-[Matchers](matchers.md#top) are the preferred way of comparing floating
-point numbers in Catch2. We provide 3 of them:
-
-* `WithinAbs(double target, double margin)`,
-* `WithinRel(FloatingPoint target, FloatingPoint eps)`, and
-* `WithinULP(FloatingPoint target, uint64_t maxUlpDiff)`.
-
-> `WithinRel` matcher was introduced in Catch2 2.10.0
-
-As with all matchers, you can combine multiple floating point matchers
-in a single assertion. For example, to check that some computation matches
-a known good value within 0.1% or is close enough (no different to 5
-decimal places) to zero, we would write this assertion:
-
-```cpp
-    REQUIRE_THAT( computation(input),
-        Catch::Matchers::WithinRel(expected, 0.001)
-     || Catch::Matchers::WithinAbs(0, 0.000001) );
-```
-
-
-### WithinAbs
-
-`WithinAbs` creates a matcher that accepts floating point numbers whose
-difference with `target` is less-or-equal to the `margin`. Since `float`
-can be converted to `double` without losing precision, only `double`
-overload exists.
-
-```cpp
-REQUIRE_THAT(1.0, WithinAbs(1.2, 0.2));
-REQUIRE_THAT(0.f, !WithinAbs(1.0, 0.5));
-// Notice that infinity == infinity for WithinAbs
-REQUIRE_THAT(INFINITY, WithinAbs(INFINITY, 0));
-```
-
-
-### WithinRel
-
-`WithinRel` creates a matcher that accepts floating point numbers that
-are _approximately equal_ to the `target` with a tolerance of `eps.`
-Specifically, it matches if
-`|arg - target| <= eps * max(|arg|, |target|)` holds. If you do not
-specify `eps`, `std::numeric_limits<FloatingPoint>::epsilon * 100`
-is used as the default.
-
-```cpp
-// Notice that WithinRel comparison is symmetric, unlike Approx's.
-REQUIRE_THAT(1.0, WithinRel(1.1, 0.1));
-REQUIRE_THAT(1.1, WithinRel(1.0, 0.1));
-// Notice that inifnity == infinity for WithinRel
-REQUIRE_THAT(INFINITY, WithinRel(INFINITY));
-```
-
-
-### WithinULP
-
-`WithinULP` creates a matcher that accepts floating point numbers that
-are no more than `maxUlpDiff`
-[ULPs](https://en.wikipedia.org/wiki/Unit_in_the_last_place)
-away from the `target` value. The short version of what this means
-is that there is no more than `maxUlpDiff - 1` representable floating
-point numbers between the argument for matching and the `target` value.
-
-When using the ULP matcher in Catch2, it is important to keep in mind
-that Catch2 interprets ULP distance slightly differently than
-e.g. `std::nextafter` does.
-
-Catch2's ULP calculation obeys these relations:
-  * `ulpDistance(-x, x) == 2 * ulpDistance(x, 0)`
-  * `ulpDistance(-0, 0) == 0` (due to the above)
-  * `ulpDistance(DBL_MAX, INFINITY) == 1`
-  * `ulpDistancE(NaN, x) == infinity`
-
-
-**Important**: The WithinULP matcher requires the platform to use the
-[IEEE-754](https://en.wikipedia.org/wiki/IEEE_754) representation for
-floating point numbers.
-
-```cpp
-REQUIRE_THAT( -0.f, WithinULP( 0.f, 0 ) );
-```
-
-
-## `Approx`
-
-```
-#include <catch2/catch_approx.hpp>
-```
-
-**We strongly recommend against using `Approx` when writing new code.**
-You should be using floating point matchers instead.
-
-Catch2 provides one more way to handle floating point comparisons. It is
-`Approx`, a special type with overloaded comparison operators, that can
-be used in standard assertions, e.g.
-
-```cpp
-REQUIRE(0.99999 == Catch::Approx(1));
-```
-
-`Approx` supports four comparison operators, `==`, `!=`, `<=`, `>=`, and can
-also be used with strong typedefs over `double`s. It can be used for both
-relative and margin comparisons by using its three customization points.
-Note that the semantics of this is always that of an _or_, so if either
-the relative or absolute margin comparison passes, then the whole comparison
-passes.
-
-The downside to `Approx` is that it has a couple of issues that we cannot
-fix without breaking backwards compatibility. Because Catch2 also provides
-complete set of matchers that implement different floating point comparison
-methods, `Approx` is left as-is, is considered deprecated, and should
-not be used in new code.
-
-The issues are
-  * All internal computation is done in `double`s, leading to slightly
-    different results if the inputs were floats.
-  * `Approx`'s relative margin comparison is not symmetric. This means
-    that `Approx( 10 ).epsilon(0.1) != 11.1` but `Approx( 11.1 ).epsilon(0.1) == 10`.
-  * By default, `Approx` only uses relative margin comparison. This means
-    that `Approx(0) == X` only passes for `X == 0`.
-
-
-### Approx details
-
-If you still want/need to know more about `Approx`, read on.
-
-Catch2 provides a UDL for `Approx`; `_a`. It resides in the `Catch::literals`
-namespace, and can be used like this:
-
-```cpp
-using namespace Catch::literals;
-REQUIRE( performComputation() == 2.1_a );
-```
-
-`Approx` has three customization points for the comparison:
-
-* **epsilon** - epsilon sets the coefficient by which a result
-can differ from `Approx`'s value before it is rejected.
-_Defaults to `std::numeric_limits<float>::epsilon()*100`._
-
-```cpp
-Approx target = Approx(100).epsilon(0.01);
-100.0 == target; // Obviously true
-200.0 == target; // Obviously still false
-100.5 == target; // True, because we set target to allow up to 1% difference
-```
-
-
-* **margin** - margin sets the absolute value by which
-a result can differ from `Approx`'s value before it is rejected.
-_Defaults to `0.0`._
-
-```cpp
-Approx target = Approx(100).margin(5);
-100.0 == target; // Obviously true
-200.0 == target; // Obviously still false
-104.0 == target; // True, because we set target to allow absolute difference of at most 5
-```
-
-* **scale** - scale is used to change the magnitude of `Approx` for the relative check.
-_By default, set to `0.0`._
-
-Scale could be useful if the computation leading to the result worked
-on a different scale than is used by the results. Approx's scale is added
-to Approx's value when computing the allowed relative margin from the
-Approx's value.
-
-
----
-
-[Home](Readme.md#top)

docs/configuration.md

@@ -15,19 +15,17 @@
 [Enabling stringification](#enabling-stringification)<br>
 [Disabling exceptions](#disabling-exceptions)<br>
 [Overriding Catch's debug break (`-b`)](#overriding-catchs-debug-break--b)<br>
-[Static analysis support](#static-analysis-support)<br>
 
 Catch2 is designed to "just work" as much as possible, and most of the
 configuration options below are changed automatically during compilation,
 according to the detected environment. However, this detection can also
-be overridden by users, using macros documented below, and/or CMake options
+be overriden by users, using macros documented below, and/or CMake options
 with the same name.
 
 
 ## Prefixing Catch macros
 
-    CATCH_CONFIG_PREFIX_ALL       // Prefix all macros with CATCH_
-    CATCH_CONFIG_PREFIX_MESSAGES  // Prefix only INFO, UNSCOPED_INFO, WARN and CAPTURE
+    CATCH_CONFIG_PREFIX_ALL
 
 To keep test code clean and uncluttered Catch uses short macro names (e.g. ```TEST_CASE``` and ```REQUIRE```). Occasionally these may conflict with identifiers from platform headers or the system under test. In this case the above identifier can be defined. This will cause all the Catch user macros to be prefixed with ```CATCH_``` (e.g. ```CATCH_TEST_CASE``` and ```CATCH_REQUIRE```).
 
@@ -100,19 +98,13 @@ is equivalent with the out-of-the-box experience.
 
 
 ## Bazel support
-
-Compiling Catch2 with `CATCH_CONFIG_BAZEL_SUPPORT` force-enables Catch2's
-support for Bazel's environment variables (normally Catch2 looks for
-`BAZEL_TEST=1` env var first).
-
-This can be useful if you are using older versions of Bazel, that do not
-yet have `BAZEL_TEST` env var support.
+When `CATCH_CONFIG_BAZEL_SUPPORT` is defined or when `BAZEL_TEST=1` (which is set by the Bazel inside of a test environment), 
+Catch2 will register a `JUnit` reporter writing to a path pointed by `XML_OUTPUT_FILE` provided by Bazel.
 
 > `CATCH_CONFIG_BAZEL_SUPPORT` was [introduced](https://github.com/catchorg/Catch2/pull/2399) in Catch2 3.0.1.
 
 > `CATCH_CONFIG_BAZEL_SUPPORT` was [deprecated](https://github.com/catchorg/Catch2/pull/2459) in Catch2 3.1.0.
 
-
 ## C++11 toggles
 
     CATCH_CONFIG_CPP11_TO_STRING // Use `std::to_string`
@@ -157,20 +149,13 @@ by using `_NO_` in the macro, e.g. `CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS`.
     CATCH_CONFIG_USE_ASYNC                  // Force parallel statistical processing of samples during benchmarking
     CATCH_CONFIG_ANDROID_LOGWRITE           // Use android's logging system for debug output
     CATCH_CONFIG_GLOBAL_NEXTAFTER           // Use nextafter{,f,l} instead of std::nextafter
-    CATCH_CONFIG_GETENV                     // System has a working `getenv`
 
 > [`CATCH_CONFIG_ANDROID_LOGWRITE`](https://github.com/catchorg/Catch2/issues/1743) and [`CATCH_CONFIG_GLOBAL_NEXTAFTER`](https://github.com/catchorg/Catch2/pull/1739) were introduced in Catch2 2.10.0
 
-> `CATCH_CONFIG_GETENV` was [introduced](https://github.com/catchorg/Catch2/pull/2562) in Catch2 3.2.0
-
 Currently Catch enables `CATCH_CONFIG_WINDOWS_SEH` only when compiled with MSVC, because some versions of MinGW do not have the necessary Win32 API support.
 
 `CATCH_CONFIG_POSIX_SIGNALS` is on by default, except when Catch is compiled under `Cygwin`, where it is disabled by default (but can be force-enabled by defining `CATCH_CONFIG_POSIX_SIGNALS`).
 
-`CATCH_CONFIG_GETENV` is on by default, except when Catch2 is compiled for
-platforms that lacks working `std::getenv` (currently Windows UWP and
-Playstation).
-
 `CATCH_CONFIG_WINDOWS_CRTDBG` is off by default. If enabled, Windows's
 CRT is used to check for memory leaks, and displays them after the tests
 finish running. This option only works when linking against the default
@@ -266,31 +251,6 @@ The macro will be used as is, that is, `CATCH_BREAK_INTO_DEBUGGER();`
 must compile and must break into debugger.
 
 
-## Static analysis support
-
-> Introduced in Catch2 3.4.0.
-
-Some parts of Catch2, e.g. `SECTION`s, can be hard for static analysis
-tools to reason about. Catch2 can change its internals to help static
-analysis tools reason about the tests.
-
-Catch2 automatically detects some static analysis tools (initial
-implementation checks for clang-tidy and Coverity), but you can override
-its detection (in either direction) via
-
-```
-CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT     // force enables static analysis help
-CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT  // force disables static analysis help
-```
-
-_As the name suggests, this is currently experimental, and thus we provide
-no backwards compatibility guarantees._
-
-**DO NOT ENABLE THIS FOR BUILDS YOU INTEND TO RUN.** The changed internals
-are not meant to be runnable, only "scannable".
-
-
-
 ---
 
 [Home](Readme.md#top)

docs/contributing.md

@@ -55,15 +55,6 @@ tests from `SelfTest` through a specific reporter and then compare the
 generated output with a known good output ("Baseline"). By default, new
 tests should be placed here.
 
-To configure a Catch2 build with just the basic tests, use the `basic-tests`
-preset, like so:
-
-```
-# Assuming you are in Catch2's root folder
-
-cmake -B basic-test-build -S . -DCMAKE_BUILD_TYPE=Debug --preset basic-tests
-```
-
 However, not all tests can be written as plain unit tests. For example,
 checking that Catch2 orders tests randomly when asked to, and that this
 random ordering is subset-invariant, is better done as an integration
@@ -85,29 +76,28 @@ configuration and require separate compilation.
 Finally, CMake config tests test that you set Catch2's compile-time
 configuration options through CMake, using CMake options of the same name.
 
-These test categories can be enabled one by one, by passing
+None of these tests are enabled by default. To enable them, add
 `-DCATCH_BUILD_EXAMPLES=ON`, `-DCATCH_BUILD_EXTRA_TESTS=ON`, and
-`-DCATCH_ENABLE_CONFIGURE_TESTS=ON` when configuring the build.
+`-DCATCH_ENABLE_CONFIGURE_TESTS=ON` when configuration the CMake build.
 
-Catch2 also provides a preset that promises to enable _all_ test types,
-`all-tests`.
-
-The snippet below will build & run all tests, in `Debug` compilation mode.
+Bringing this all together, the steps below should configure, build,
+and run all tests in the `Debug` compilation.
 
 <!-- snippet: catch2-build-and-test -->
 <a id='snippet-catch2-build-and-test'></a>
 ```sh
-# 1. Regenerate the amalgamated distribution (some tests are built against it)
+# 1. Regenerate the amalgamated distribution
 ./tools/scripts/generateAmalgamatedFiles.py
 
 # 2. Configure the full test build
-cmake -B debug-build -S . -DCMAKE_BUILD_TYPE=Debug --preset all-tests
+cmake -Bdebug-build -H. -DCMAKE_BUILD_TYPE=Debug -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_BUILD_EXTRA_TESTS=ON
 
 # 3. Run the actual build
 cmake --build debug-build
 
 # 4. Run the tests using CTest
-ctest -j 4 --output-on-failure -C Debug --test-dir debug-build
+cd debug-build
+ctest -j 4 --output-on-failure -C Debug
 ```
 <sup><a href='/tools/scripts/buildAndTest.sh#L6-L19' title='File snippet `catch2-build-and-test` was extracted from'>snippet source</a> | <a href='#snippet-catch2-build-and-test' title='Navigate to start of snippet `catch2-build-and-test`'>anchor</a></sup>
 <!-- endSnippet -->
@@ -135,7 +125,7 @@ information that you will need for updating Catch2's documentation, and
 possibly some generic advise as well.
 
 
-### Technicalities
+### Technicalities 
 
 First, the technicalities:
 
@@ -213,7 +203,7 @@ and so on.
 
 Catch2 currently targets C++14 as the minimum supported C++ version.
 Features from higher language versions should be used only sparingly,
-when the benefits from using them outweigh the maintenance overhead.
+when the benefits from using them outweight the maintenance overhead.
 
 Example of good use of polyfilling features is our use of `conjunction`,
 where if available we use `std::conjunction` and otherwise provide our
@@ -301,7 +291,7 @@ Specifically, every source file should start with the licence header:
 
     //              Copyright Catch2 Authors
     // Distributed under the Boost Software License, Version 1.0.
-    //   (See accompanying file LICENSE.txt or copy at
+    //   (See accompanying file LICENSE_1_0.txt or copy at
     //        https://www.boost.org/LICENSE_1_0.txt)
 
     // SPDX-License-Identifier: BSL-1.0
@@ -313,20 +303,6 @@ be `CATCH_MATCHERS_FOO_HPP_INCLUDED`, for `catch_generators_bar.hpp`, the includ
 guard should be `CATCH_GENERATORS_BAR_HPP_INCLUDED`, and so on.
 
 
-### Adding new `CATCH_CONFIG` option
-
-When adding new `CATCH_CONFIG` option, there are multiple places to edit:
-  * `CMake/CatchConfigOptions.cmake` - this is used to generate the
-    configuration options in CMake, so that CMake frontends know about them.
-  * `docs/configuration.md` - this is where the options are documented
-  * `src/catch2/catch_user_config.hpp.in` - this is template for generating
-    `catch_user_config.hpp` which contains the materialized configuration
-  * `BUILD.bazel` - Bazel does not have configuration support like CMake,
-    and all expansions need to be done manually
-  * other files as needed, e.g. `catch2/internal/catch_config_foo.hpp`
-    for the logic that guards the configuration
-
-
 ## CoC
 
 This project has a [CoC](../CODE_OF_CONDUCT.md). Please adhere to it

docs/deprecations.md

@@ -26,28 +26,6 @@ to accurately probe the environment for this information so the flag
 where it will export `BAZEL_TEST=1` for purposes like the above. Catch2
 will now instead inspect the environment instead of relying on build configuration.
 
-### `IEventLister::skipTest( TestCaseInfo const& testInfo )`
-
-This event (including implementations in derived classes such as `ReporterBase`)
-is deprecated and will be removed in the next major release. It is currently
-invoked for all test cases that are not going to be executed due to the test run
-being aborted (when using `--abort` or `--abortx`). It is however
-**NOT** invoked for test cases that are [explicitly skipped using the `SKIP`
-macro](skipping-passing-failing.md#top).
-
-
-### Non-const function for `TEST_CASE_METHOD`
-
-> Deprecated in Catch2 vX.Y.Z
-
-Currently, the member function generated for `TEST_CASE_METHOD` is
-not `const` qualified. In the future, the generated member function will
-be `const` qualified, just as `TEST_CASE_PERSISTENT_FIXTURE` does.
-
-If you are mutating the fixture instance from within the test case, and
-want to keep doing so in the future, mark the mutated members as `mutable`.
-
-
 ---
 
 [Home](Readme.md#top)

docs/event-listeners.md

@@ -33,7 +33,7 @@ public:
 CATCH_REGISTER_LISTENER(testRunListener)
 ```
 
-_Note that you should not use any assertion macros within a Listener!_
+_Note that you should not use any assertion macros within a Listener!_ 
 
 [You can find the list of events that the listeners can react to on its
 own page](reporter-events.md#top).

docs/faq.md

@@ -7,11 +7,6 @@
 [Why cannot I derive from the built-in reporters?](#why-cannot-i-derive-from-the-built-in-reporters)<br>
 [What is Catch2's ABI stability policy?](#what-is-catch2s-abi-stability-policy)<br>
 [What is Catch2's API stability policy?](#what-is-catch2s-api-stability-policy)<br>
-[Does Catch2 support running tests in parallel?](#does-catch2-support-running-tests-in-parallel)<br>
-[Can I compile Catch2 into a dynamic library?](#can-i-compile-catch2-into-a-dynamic-library)<br>
-[What repeatability guarantees does Catch2 provide?](#what-repeatability-guarantees-does-catch2-provide)<br>
-[My build cannot find `catch2/catch_user_config.hpp`, how can I fix it?](#my-build-cannot-find-catch2catch_user_confighpp-how-can-i-fix-it)<br>
-
 
 ## How do I run global setup/teardown only if tests will be run?
 
@@ -28,8 +23,8 @@ depending on how often the cleanup needs to happen.
 
 ## Why cannot I derive from the built-in reporters?
 
-They are not made to be overridden, in that we do not attempt to maintain
-a consistent internal state if a member function is overridden, and by
+They are not made to be overriden, in that we do not attempt to maintain
+a consistent internal state if a member function is overriden, and by
 forbidding users from using them as a base class, we can refactor them
 as needed later.
 
@@ -62,52 +57,6 @@ runners easier. [See the relevant section in our page on best
 practices](usage-tips.md#parallel-tests).
 
 
-## Can I compile Catch2 into a dynamic library?
-
-Yes, Catch2 supports the [standard CMake `BUILD_SHARED_LIBS`
-option](https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html).
-However, the dynamic library support is provided as-is. Catch2 does not
-provide API export annotations, and so you can only use it as a dynamic
-library on platforms that default to public visibility, or with tooling
-support to force export Catch2's API.
-
-
-## What repeatability guarantees does Catch2 provide?
-
-There are two places where it is meaningful to talk about Catch2's
-repeatability guarantees without taking into account user-provided
-code. First one is in the test case shuffling, and the second one is
-the output from random generators.
-
-Test case shuffling is repeatable across different platforms since v2.12.0,
-and it is also generally repeatable across versions, but we might break
-it from time to time. E.g. we broke repeatability with previous versions
-in v2.13.4 so that test cases with similar names are shuffled better.
-
-Since Catch2 3.5.0 the random generators use custom distributions,
-that should be repeatable across different platforms, with few caveats.
-For details see the section on random generators in the [Generator
-documentation](generators.md#random-number-generators-details).
-
-Before this version, random generators relied on distributions from
-platform's stdlib. We thus can provide no extra guarantee on top of the
-ones given by your platform. **Important: `<random>`'s distributions
-are not specified to be repeatable across different platforms.**
-
-
-## My build cannot find `catch2/catch_user_config.hpp`, how can I fix it?
-
-`catch2/catch_user_config.hpp` is a generated header that contains user
-compile time configuration. It is generated by CMake/Meson/Bazel during
-build. If you are not using either of these, your three options are to
-
-1) Build Catch2 separately using build tool that will generate the header
-2) Use the amalgamated files to build Catch2
-3) Use CMake to configure a build. This will generate the header and you
-   can copy it into your own checkout of Catch2.
-
-
-
 ---
 
 [Home](Readme.md#top)

docs/generators.md

@@ -134,7 +134,7 @@ type, making their usage much nicer. These are
 * `map<T>(func, GeneratorWrapper<U>&&)` for `MapGenerator<T, U, Func>` (map `U` to `T`)
 * `chunk(chunk-size, GeneratorWrapper<T>&&)` for `ChunkGenerator<T>`
 * `random(IntegerOrFloat a, IntegerOrFloat b)` for `RandomIntegerGenerator` or `RandomFloatGenerator`
-* `range(Arithmetic start, Arithmetic end)` for `RangeGenerator<Arithmetic>` with a step size of `1`
+* `range(Arithemtic start, Arithmetic end)` for `RangeGenerator<Arithmetic>` with a step size of `1`
 * `range(Arithmetic start, Arithmetic end, Arithmetic step)` for `RangeGenerator<Arithmetic>` with a custom step size
 * `from_range(InputIterator from, InputIterator to)` for `IteratorGenerator<T>`
 * `from_range(Container const&)` for `IteratorGenerator<T>`
@@ -189,45 +189,6 @@ TEST_CASE("type conversion", "[generators]") {
 }
 ```
 
-
-### Random number generators: details
-
-> This section applies from Catch2 3.5.0. Before that, random generators
-> were a thin wrapper around distributions from `<random>`.
-
-All of the `random(a, b)` generators in Catch2 currently generate uniformly
-distributed number in closed interval \[a; b\]. This  is different from
-`std::uniform_real_distribution`, which should return numbers in interval
-\[a; b) (but due to rounding can end up returning b anyway), but the
-difference is intentional, so that `random(a, a)` makes sense. If there is
-enough interest from users, we can provide API to pick any of CC, CO, OC,
-or OO ranges.
-
-Unlike `std::uniform_int_distribution`, Catch2's generators also support
-various single-byte integral types, such as `char` or `bool`.
-
-
-#### Reproducibility
-
-Given the same seed, the output from the integral generators is fully
-reproducible across different platforms.
-
-For floating point generators, the situation is much more complex.
-Generally Catch2 only promises reproducibility (or even just correctness!)
-on platforms that obey the IEEE-754 standard. Furthermore, reproducibility
-only applies between binaries that perform floating point math in the
-same way, e.g. if you compile a binary targetting the x87 FPU and another
-one targetting SSE2 for floating point math, their results will vary.
-Similarly, binaries compiled with compiler flags that relax the IEEE-754
-adherence, e.g. `-ffast-math`, might provide different results than those
-compiled for strict IEEE-754 adherence.
-
-Finally, we provide zero guarantees on the reproducibility of generating
-`long double`s, as the internals of `long double` varies across different
-platforms.
-
-
-
 ## Generator interface
 
 You can also implement your own generators, by deriving from the
@@ -244,37 +205,15 @@ struct IGenerator : GeneratorUntypedBase {
     // Precondition:
     // The generator is either freshly constructed or the last call to next() returned true
     virtual T const& get() const = 0;
-
-    // Returns user-friendly string showing the current generator element
-    // Does not have to be overridden, IGenerator provides default implementation
-    virtual std::string stringifyImpl() const;
 };
 ```
 
 However, to be able to use your custom generator inside `GENERATE`, it
 will need to be wrapped inside a `GeneratorWrapper<T>`.
 `GeneratorWrapper<T>` is a value wrapper around a
-`Catch::Detail::unique_ptr<IGenerator<T>>`.
+`std::unique_ptr<IGenerator<T>>`.
 
 For full example of implementing your own generator, look into Catch2's
 examples, specifically
 [Generators: Create your own generator](../examples/300-Gen-OwnGenerator.cpp).
 
-
-### Handling empty generators
-
-The generator interface assumes that a generator always has at least one
-element. This is not always true, e.g. if the generator depends on an external
-datafile, the file might be missing.
-
-There are two ways to handle this, depending on whether you want this
-to be an error or not.
-
- * If empty generator **is** an error, throw an exception in constructor.
- * If empty generator **is not** an error, use the [`SKIP`](skipping-passing-failing.md#skipping-test-cases-at-runtime) in constructor.
-
-
-
----
-
-[Home](Readme.md#top)

docs/limitations.md

@@ -88,8 +88,8 @@ because only one thread passes the `REQUIRE` macro and this is not
     REQUIRE(cnt == 16);
 ```
 
-We currently do not plan to support thread-safe assertions.
-
+Because C++11 provides the necessary tools to do this, we are planning
+to remove this limitation in the future.
 
 ### Process isolation in a test
 Catch does not support running tests in isolated (forked) processes. While this might in the future, the fact that Windows does not support forking and only allows full-on process creation and the desire to keep code as similar as possible across platforms, mean that this is likely to take significant development time, that is not currently available.
@@ -99,7 +99,7 @@ Catch does not support running tests in isolated (forked) processes. While this
 
 Catch2 keeps test execution in one process strictly serial, and there
 are no plans to change this. If you find yourself with a test suite
-that takes too long to run and you want to make it parallel, you have
+that takes too long to run and yo uwant to make it parallel, you have
 to run multiple processes side by side.
 
 There are 2 basic ways to do that,
@@ -155,7 +155,7 @@ with expansion:
 
 
 ### Clang/G++ -- skipping leaf sections after an exception
-Some versions of `libc++` and `libstdc++` (or their runtimes) have a bug with `std::uncaught_exception()` getting stuck returning `true` after rethrow, even if there are no active exceptions. One such case is this snippet, which skipped the sections "a" and "b", when compiled against `libcxxrt` from the master branch
+Some versions of `libc++` and `libstdc++` (or their runtimes) have a bug with `std::uncaught_exception()` getting stuck returning `true` after rethrow, even if there are no active exceptions. One such case is this snippet, which skipped the sections "a" and "b", when compiled against `libcxxrt` from master
 ```cpp
 #include <catch2/catch_test_macros.hpp>
 
@@ -171,21 +171,15 @@ TEST_CASE("b") {
 }
 ```
 
-If you are seeing a problem like this, i.e. weird test paths that trigger only under Clang with `libc++`, or only under very specific version of `libstdc++`, it is very likely you are seeing this. The only known workaround is to use a fixed version of your standard library.
+If you are seeing a problem like this, i.e. a weird test paths that trigger only under Clang with `libc++`, or only under very specific version of `libstdc++`, it is very likely you are seeing this. The only known workaround is to use a fixed version of your standard library.
 
 
-### Visual Studio 2022 -- can't compile assertion with the spaceship operator
+### libstdc++, `_GLIBCXX_DEBUG` macro and random ordering of tests
 
-[The C++ standard requires that `std::foo_ordering` is only comparable with
-a literal 0](https://eel.is/c++draft/cmp#categories.pre-3). There are
-multiple strategies a stdlib implementation can take to achieve this, and
-MSVC's STL has changed the strategy they use between two releases of VS 2022.
-
-With the new strategy, `REQUIRE((a <=> b) == 0)` no longer compiles under
-MSVC. Note that Catch2 can compile code using MSVC STL's new strategy,
-but only when compiled with a C++20 conforming compiler. MSVC is currently
-not conformant enough, but `clang-cl` will compile the assertion above
-using MSVC STL without problem.
-
-This change got in with MSVC v19.37](https://godbolt.org/z/KG9obzdvE).
+Running a Catch2 binary compiled against libstdc++ with `_GLIBCXX_DEBUG`
+macro defined with `--order rand` will cause a debug check to trigger and
+abort the run due to self-assignment.
+[This is a known bug inside libstdc++](https://stackoverflow.com/questions/22915325/avoiding-self-assignment-in-stdshuffle/23691322)
 
+Workaround: Don't use `--order rand` when compiling against debug-enabled
+libstdc++.

docs/list-of-examples.md

@@ -8,7 +8,6 @@
 - Assertion: [REQUIRE, CHECK](../examples/030-Asn-Require-Check.cpp)
 - Fixture: [Sections](../examples/100-Fix-Section.cpp)
 - Fixture: [Class-based fixtures](../examples/110-Fix-ClassFixture.cpp)
-- Fixture: [Persistent fixtures](../examples/111-Fix-PersistentFixture.cpp)
 - BDD: [SCENARIO, GIVEN, WHEN, THEN](../examples/120-Bdd-ScenarioGivenWhenThen.cpp)
 - Listener: [Listeners](../examples/210-Evt-EventListeners.cpp)
 - Configuration: [Provide your own output streams](../examples/231-Cfg-OutputStreams.cpp)

docs/logging.md

@@ -114,10 +114,6 @@ Similar to `INFO`, but messages are not limited to their own scope: They are rem
 
 The message is always reported but does not fail the test.
 
-**SUCCEED(** _message expression_ **)**
-
-The message is reported and the test case succeeds.
-
 **FAIL(** _message expression_ **)**
 
 The message is reported and the test case fails.

docs/matchers.md

@@ -50,43 +50,25 @@ Both of the string matchers used in the examples above live in the
 `catch_matchers_string.hpp` header, so to compile the code above also
 requires `#include <catch2/matchers/catch_matchers_string.hpp>`.
 
-### Combining operators and lifetimes
-
 **IMPORTANT**: The combining operators do not take ownership of the
-matcher objects being combined.
+matcher objects being combined. This means that if you store combined
+matcher object, you have to ensure that the matchers being combined
+outlive its last use. What this means is that the following code leads
+to a use-after-free (UAF):
 
-This means that if you store combined matcher object, you have to ensure
-that the individual matchers being combined outlive the combined matcher.
-Note that the negation matcher from `!` also counts as combining matcher
-for this.
-
-Explained on an example, this is fine
 ```cpp
-CHECK_THAT(value, WithinAbs(0, 2e-2) && !WithinULP(0., 1));
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
+
+TEST_CASE("Bugs, bugs, bugs", "[Bug]"){
+    std::string str = "Bugs as a service";
+
+    auto match_expression = Catch::Matchers::EndsWith( "as a service" ) ||
+        (Catch::Matchers::StartsWith( "Big data" ) && !Catch::Matchers::ContainsSubstring( "web scale" ) );
+    REQUIRE_THAT(str, match_expression);
+}
 ```
 
-and so is this
-```cpp
-auto is_close_to_zero = WithinAbs(0, 2e-2);
-auto is_zero          = WithinULP(0., 1);
-
-CHECK_THAT(value, is_close_to_zero && !is_zero);
-```
-
-but this is not
-```cpp
-auto is_close_to_zero = WithinAbs(0, 2e-2);
-auto is_zero          = WithinULP(0., 1);
-auto is_close_to_but_not_zero = is_close_to_zero && !is_zero;
-
-CHECK_THAT(a_value, is_close_to_but_not_zero); // UAF
-```
-
-because `!is_zero` creates a temporary instance of Negation matcher,
-which the `is_close_to_but_not_zero` refers to. After the line ends,
-the temporary is destroyed and the combined `is_close_to_but_not_zero`
-matcher now refers to non-existent object, so using it causes use-after-free.
-
 
 ## Built-in matchers
 
@@ -159,26 +141,58 @@ are a permutation of the ones in `some_vec`.
 
 ### Floating point matchers
 
-Catch2 provides 4 matchers that target floating point numbers. These
+Catch2 provides 3 matchers that target floating point numbers. These
 are:
 
 * `WithinAbs(double target, double margin)`,
 * `WithinULP(FloatingPoint target, uint64_t maxUlpDiff)`, and
 * `WithinRel(FloatingPoint target, FloatingPoint eps)`.
-* `IsNaN()`
 
 > `WithinRel` matcher was introduced in Catch2 2.10.0
 
-> `IsNaN` matcher was introduced in Catch2 3.3.2.
 
-The first three serve to compare two floating pointe numbers. For more
-details about how they work, read [the docs on comparing floating point
-numbers](comparing-floating-point-numbers.md#floating-point-matchers).
+`WithinAbs` creates a matcher that accepts floating point numbers whose
+difference with `target` is less than the `margin`.
 
-`IsNaN` then does exactly what it says on the tin. It matches the input
-if it is a NaN (Not a Number). The advantage of using it over just plain
-`REQUIRE(std::isnan(x))`, is that if the check fails, with `REQUIRE` you
-won't see the value of `x`, but with `REQUIRE_THAT(x, IsNaN())`, you will.
+`WithinULP` creates a matcher that accepts floating point numbers that
+are no more than `maxUlpDiff`
+[ULPs](https://en.wikipedia.org/wiki/Unit_in_the_last_place)
+away from the `target` value. The short version of what this means
+is that there is no more than `maxUlpDiff - 1` representeable floating
+point numbers between the argument for matching and the `target` value.
+
+**Important**: The WithinULP matcher requires the platform to use the
+[IEEE-754](https://en.wikipedia.org/wiki/IEEE_754) representation for
+floating point numbers.
+
+
+`WithinRel` creates a matcher that accepts floating point numbers that
+are _approximately equal_ with the `target` with tolerance of `eps.`
+Specifically, it matches if
+`|arg - target| <= eps * max(|arg|, |target|)` holds. If you do not
+specify `eps`, `std::numeric_limits<FloatingPoint>::epsilon * 100`
+is used as the default.
+
+
+In practice, you will often want to combine multiple of these matchers,
+together for an assertion, because all 3 options have edge cases where
+they behave differently than you would expect. As an example, under
+the `WithinRel` matcher, a `0.` only ever matches a `0.` (or `-0.`),
+regardless of the relative tolerance specified. Thus, if you want to
+handle numbers that are "close enough to 0 to be 0", you have to combine
+it with the `WithinAbs` matcher.
+
+For example, to check that our computation matches known good value
+within 0.1%, or is close enough (no different to 5 decimal places)
+to zero, we would write this assertion:
+```cpp
+    REQUIRE_THAT( computation(input),
+        Catch::Matchers::WithinRel(expected, 0.001)
+     || Catch::Matchers::WithinAbs(0, 0.000001) );
+```
+
+
+> floating point matchers live in `catch2/matchers/catch_matchers_floating.hpp`
 
 
 ### Miscellaneous matchers
@@ -210,54 +224,26 @@ The other miscellaneous matcher utility is exception matching.
 
 #### Matching exceptions
 
-Because exceptions are a bit special, Catch2 has a separate macro for them.
-
-
-The basic form is
-
-```
-REQUIRE_THROWS_MATCHES(expr, ExceptionType, Matcher)
-```
-
-and it checks that the `expr` throws an exception, that exception is derived
-from the `ExceptionType` type, and then `Matcher::match` is called on
-the caught exception.
+Catch2 provides an utility macro for asserting that an expression
+throws exception of specific type, and that the exception has desired
+properties. The macro is `REQUIRE_THROWS_MATCHES(expr, ExceptionType, Matcher)`.
 
 > `REQUIRE_THROWS_MATCHES` macro lives in `catch2/matchers/catch_matchers.hpp`
 
-For one-off checks you can use the `Predicate` matcher above, e.g.
 
-```cpp
-REQUIRE_THROWS_MATCHES(parse(...),
-                       parse_error,
-                       Predicate<parse_error>([] (parse_error const& err) -> bool { return err.line() == 1; })
-);
-```
-
-but if you intend to thoroughly test your error reporting, I recommend
-defining a specialized matcher.
-
-
-Catch2 also provides 2 built-in matchers for checking the error message
-inside an exception (it must be derived from `std::exception`):
-* `Message(std::string message)`.
-* `MessageMatches(Matcher matcher)`.
-
-> `MessageMatches` was [introduced](https://github.com/catchorg/Catch2/pull/2570) in Catch2 3.3.0
-
-`Message` checks that the exception's
+Catch2 currently provides only one matcher for exceptions,
+`Message(std::string message)`. `Message` checks that the exception's
 message, as returned from `what` is exactly equal to `message`.
 
-`MessageMatches` applies the provided matcher on the exception's
-message, as returned from `what`. This is useful in conjunctions with the `std::string` matchers (e.g. `StartsWith`)
-
 Example use:
 ```cpp
 REQUIRE_THROWS_MATCHES(throwsDerivedException(),  DerivedException,  Message("DerivedException::what"));
-REQUIRE_THROWS_MATCHES(throwsDerivedException(),  DerivedException,  MessageMatches(StartsWith("DerivedException")));
 ```
 
-> the exception message matchers live in `catch2/matchers/catch_matchers_exception.hpp`
+Note that `DerivedException` in the example above has to derive from
+`std::exception` for the example to work.
+
+> the exception message matcher lives in `catch2/matchers/catch_matchers_exception.hpp`
 
 
 ### Generic range Matchers
@@ -273,19 +259,11 @@ definitions to handle generic range-like types. These are:
 * `Contains(T&& target_element, Comparator = std::equal_to<>{})`
 * `Contains(Matcher element_matcher)`
 * `AllMatch(Matcher element_matcher)`
-* `AnyMatch(Matcher element_matcher)`
 * `NoneMatch(Matcher element_matcher)`
-* `AllTrue()`, `AnyTrue()`, `NoneTrue()`
-* `RangeEquals(TargetRangeLike&&, Comparator = std::equal_to<>{})`
-* `UnorderedRangeEquals(TargetRangeLike&&, Comparator = std::equal_to<>{})`
-
-> `IsEmpty`, `SizeIs`, `Contains` were introduced in Catch2 3.0.1
-
-> `All/Any/NoneMatch` were introduced in Catch2 3.0.1
-
-> `All/Any/NoneTrue` were introduced in Catch2 3.1.0
-
-> `RangeEquals` and `UnorderedRangeEquals` matchers were [introduced](https://github.com/catchorg/Catch2/pull/2377) in Catch2 3.3.0
+* `AnyMatch(Matcher element_matcher)`
+* `AllTrue()`
+* `NoneTrue()`
+* `AnyTrue()`
 
 `IsEmpty` should be self-explanatory. It successfully matches objects
 that are empty according to either `std::empty`, or ADL-found `empty`
@@ -304,33 +282,14 @@ in which case a range is accepted if any of its elements is accepted
 by the provided matcher.
 
 `AllMatch`, `NoneMatch`, and `AnyMatch` match ranges for which either
-all, none, or any of the contained elements matches the given matcher,
+all, none, or any of the contained elements matches the given matcher, 
 respectively.
 
 `AllTrue`, `NoneTrue`, and `AnyTrue` match ranges for which either
-all, none, or any of the contained elements are `true`, respectively.
-It works for ranges of `bool`s and ranges of elements (explicitly)
+all, none, or any of the contained elements are `true`, respectively. 
+It works for ranges of `bool`s and ranges of elements (explicitly) 
 convertible to `bool`.
 
-`RangeEquals` compares the range that the matcher is constructed with
-(the "target range") against the range to be tested, element-wise. The
-match succeeds if all elements from the two ranges compare equal (using
-`operator==` by default). The ranges do not need to be the same type,
-and the element types do not need to be the same, as long as they are
-comparable. (e.g. you may compare `std::vector<int>` to `std::array<char>`).
-
-`UnorderedRangeEquals` is similar to `RangeEquals`, but the order
-does not matter. For example "1, 2, 3" would match "3, 2, 1", but not
-"1, 1, 2, 3" As with `RangeEquals`, `UnorderedRangeEquals` compares
-the individual elements using `operator==` by default.
-
-Both `RangeEquals` and `UnorderedRangeEquals` optionally accept a
-predicate which can be used to compare the containers element-wise.
-
-To check a container elementwise against a given matcher, use
-`AllMatch`.
-
-
 ## Writing custom matchers (old style)
 
 The old style of writing matchers has been introduced back in Catch
@@ -409,7 +368,7 @@ style matchers arbitrarily.
 
 To create a new-style matcher, you have to create your own type that
 derives from `Catch::Matchers::MatcherGenericBase`. Your type has to
-also provide two methods, `bool match( ... ) const` and overridden
+also provide two methods, `bool match( ... ) const` and overriden
 `std::string describe() const`.
 
 Unlike with old-style matchers, there are no requirements on how

docs/migrate-v2-to-v3.md

@@ -21,10 +21,9 @@ reduced by roughly 80%. The improved ease of maintenance also led to
 various runtime performance improvements and the introduction of new features.
 For details, look at [the release notes of 3.0.1](release-notes.md#301).
 
-_Note that we still provide one header + one translation unit (TU)
-distribution but do not consider it the primarily supported option. You
-should also expect that the compilation times will be worse if you use
-this option._
+_Note that we still provide one header + one TU distribution but do
+not consider it the primarily supported option. You should also expect
+that the compilation times will be worse if you use this option._
 
 
 ## How to migrate projects from v2 to v3
@@ -66,9 +65,7 @@ to piecemeal includes. You will likely want to start by including
 [other notes](#other-notes) for further ideas)
 
 ## Other notes
-
 * The main test include is now `<catch2/catch_test_macros.hpp>`
-
 * Big "subparts" like Matchers, or Generators, have their own folder, and
 also their own "big header", so if you just want to include all matchers,
 you can include `<catch2/matchers/catch_matchers_all.hpp>`,
@@ -76,21 +73,11 @@ or `<catch2/generators/catch_generators_all.hpp>`
 
 
 ## Things that can break during porting
-
-* The namespaces of Matchers were flattened and cleaned up.
-
-Matchers are no longer declared deep within an internal namespace and
-then brought up into `Catch` namespace. All Matchers now live in the
-`Catch::Matchers` namespace.
-
-* The `Contains` string matcher was renamed to `ContainsSubstring`.
-
-* The reporter interfaces changed in a breaking manner.
-
-If you are using a custom reporter or listener, you will likely need to
-modify them to conform to the new interfaces. Unlike before in v2,
-the [interfaces](reporters.md#top) and the [events](reporter-events.md#top)
-are now documented.
+* The namespace on Matchers were cleaned up, they are no longer first declared
+deep within an internal namespace and then brought up. All Matchers now live
+in `Catch::Matchers`.
+* The reporter interfaces changed in a breaking manner. If you wrote custom
+reporter or listener, you might need to modify them a bit.
 
 
 ---

docs/opensource-users.md

@@ -72,7 +72,7 @@ A header-only template engine for modern C++.
 A C++17 template header-only library for the abstraction of memory access patterns.
 
 ### [libcluon](https://github.com/chrberger/libcluon)
-A single-header-only library written in C++14 to glue distributed software components (UDP, TCP, shared memory) supporting natively Protobuf, LCM/ZCM, MsgPack, and JSON for dynamic message transformations in-between.
+A single-header-only library written in C++14 to glue distributed software components (UDP, TCP, shared memory) supporting natively Protobuf, LCM/ZCM, MsgPack, and JSON for dynamic message transformations in-between. 
 
 ### [MNMLSTC Core](https://github.com/mnmlstc/core)
 A small and easy to use C++11 library that adds a functionality set that will be available in C++14 and later, as well as some useful additions.
@@ -95,9 +95,6 @@ A C++ client library for Consul. Consul is a distributed tool for discovering an
 ### [Reactive-Extensions/ RxCpp](https://github.com/Reactive-Extensions/RxCpp)
 A library of algorithms for values-distributed-in-time.
 
-### [SFML](https://github.com/SFML/SFML)
-Simple and Fast Multimedia Library.
-
 ### [SOCI](https://github.com/SOCI/soci)
 The C++ Database Access Library.
 
@@ -113,12 +110,6 @@ A header-only TOML parser and serializer for modern C++.
 ### [Trompeloeil](https://github.com/rollbear/trompeloeil)
 A thread-safe header-only mocking framework for C++14.
 
-### [wxWidgets](https://www.wxwidgets.org/)
-Cross-Platform C++ GUI Library.
-
-### [xmlwrapp](https://github.com/vslavik/xmlwrapp)
-C++ XML parsing library using libxml2.
-
 ## Applications & Tools
 
 ### [App Mesh](https://github.com/laoshanxi/app-mesh)
@@ -146,7 +137,7 @@ Newsbeuter is an open-source RSS/Atom feed reader for text terminals.
 A 2D, Zombie, RPG game which is being made on our own engine.
 
 ### [raspigcd](https://github.com/pantadeusz/raspigcd)
-Low level CLI app and library for execution of GCODE on Raspberry Pi without any additional microcontrollers (just RPi + Stepsticks).
+Low level CLI app and library for execution of GCODE on Raspberry Pi without any additional microcontrolers (just RPi + Stepsticks).
 
 ### [SpECTRE](https://github.com/sxs-collaboration/spectre)
 SpECTRE is a code for multi-scale, multi-physics problems in astrophysics and gravitational physics.

docs/other-macros.md

@@ -93,6 +93,30 @@ TEST_CASE("STATIC_CHECK showcase", "[traits]") {
 
 ## Test case related macros
 
+* `METHOD_AS_TEST_CASE`
+
+`METHOD_AS_TEST_CASE( member-function-pointer, description )` lets you
+register a member function of a class as a Catch2 test case. The class
+will be separately instantiated for each method registered in this way.
+
+```cpp
+class TestClass {
+    std::string s;
+
+public:
+    TestClass()
+        :s( "hello" )
+    {}
+
+    void testCase() {
+        REQUIRE( s == "hello" );
+    }
+};
+
+
+METHOD_AS_TEST_CASE( TestClass::testCase, "Use class's method as a test case", "[class]" )
+```
+
 * `REGISTER_TEST_CASE`
 
 `REGISTER_TEST_CASE( function, description )` let's you register

docs/release-notes.md

@@ -2,20 +2,6 @@
 
 # Release notes
 **Contents**<br>
-[3.7.0](#370)<br>
-[3.6.0](#360)<br>
-[3.5.4](#354)<br>
-[3.5.3](#353)<br>
-[3.5.2](#352)<br>
-[3.5.1](#351)<br>
-[3.5.0](#350)<br>
-[3.4.0](#340)<br>
-[3.3.2](#332)<br>
-[3.3.1](#331)<br>
-[3.3.0](#330)<br>
-[3.2.1](#321)<br>
-[3.2.0](#320)<br>
-[3.1.1](#311)<br>
 [3.1.0](#310)<br>
 [3.0.1](#301)<br>
 [2.13.7](#2137)<br>
@@ -64,317 +50,6 @@
 [Even Older versions](#even-older-versions)<br>
 
 
-## 3.7.0
-
-### Improvements
-* Slightly improved compile times of benchmarks
-* Made the resolution estimation in benchmarks slightly more precise
-* Added new test case macro, `TEST_CASE_PERSISTENT_FIXTURE` (#2885, #1602)
-  * Unlike `TEST_CASE_METHOD`, the same underlying instance is used for all partial runs of that test case
-* **MASSIVELY** improved performance of the JUnit reporter when handling successful assertions (#2897)
-  * For 1 test case and 10M assertions, the new reporter runs 3x faster and uses up only 8 MB of memory, while the old one needs 7 GB of memory.
-* Reworked how output redirects works.
-  * Combining a reporter writing to stdout with capturing reporter no longer leads to the capturing reporter seeing all of the other reporter's output.
-  * The file based redirect no longer opens up a new temporary file for each partial test case run, so it will not run out of temporary files when running many tests in single process.
-
-### Miscellaneous
-* Better documentation for matchers on thrown exceptions (`REQUIRE_THROWS_MATCHES`)
-* Improved `catch_discover_tests`'s handling of environment paths (#2878)
-  * It won't reorder paths in `DL_PATHS` or `DYLD_FRAMEWORK_PATHS` args
-  * It won't overwrite the environment paths for test discovery
-
-
-## 3.6.0
-
-### Fixes
-* Fixed Windows ARM64 build by fixing the preprocessor condition guarding use `_umul128` intrinsic.
-* Fixed Windows ARM64EC build by removing intrinsic pragma it does not understand. (#2858)
-  * Why doesn't the x64-emulation build mode understand x64 pragmas? Don't ask me, ask the MSVC guys.
-* Fixed the JUnit reporter sometimes crashing when reporting a fatal error. (#1210, #2855)
-  * The binary will still exit, but through the original error, rather than secondary error inside the reporter.
-  * The underlying fix applies to all reporters, not just the JUnit one, but only JUnit was currently causing troubles.
-
-### Improvements
-* Disable `-Wnon-virtual-dtor` in Decomposer and Matchers (#2854)
-* `precision` in floating point stringmakers defaults to `max_digits10`.
-  * This means that floating point values will be printed with enough precision to disambiguate any two floats.
-* Column wrapping ignores ansi colour codes when calculating string width (#2833, #2849)
-  * This makes the output much more readable when the provided messages contain colour codes.
-
-### Miscellaneous
-* Conan support improvements
-  * `compatibility_cppstr` is set to False. (#2860)
-    * This means that Conan won't let you mix library and project with different C++ standard settings.
-  * The implementation library CMake target name through Conan is properly set to `Catch2::Catch2` (#2861)
-* `SelfTest` target can be built through Bazel (#2857)
-
-
-## 3.5.4
-
-### Fixes
-* Fixed potential compilation error when asked to generate random integers whose type did not match `std::(u)int*_t`.
-  * This manifested itself when generating random `size_t`s on MacOS
-* Added missing outlined destructor causing `Wdelete-incomplete` when compiling against libstdc++ in C++23 mode (#2852)
-* Fixed regression where decomposing assertion with const instance of `std::foo_ordering` would not compile
-
-### Improvements
-* Reintroduced support for GCC 5 and 6 (#2836)
-  * As with VS2017, if they start causing trouble again, they will be dropped again.
-* Added workaround for targetting newest MacOS (Sonoma) using GCC (#2837, #2839)
-* `CATCH_CONFIG_DEFAULT_REPORTER` can now be an arbitrary reporter spec
-  * Previously it could only be a plain reporter name, so it was impossible to compile in custom arguments to the reporter.
-* Improved performance of generating 64bit random integers by 20+%
-
-### Miscellaneous
-* Significantly improved Conan in-tree recipe (#2831)
-* `DL_PATHS` in `catch_discover_tests` now supports multiple arguments (#2852, #2736)
-* Fixed preprocessor logic for checking whether we expect reproducible floating point results in tests.
-* Improved the floating point tests structure to avoid `Wunused` when the reproducibility tests are disabled (#2845)
-
-
-## 3.5.3
-
-### Fixes
-* Fixed OOB access when computing filename tag (from the `-#` flag) for file without extension (#2798)
-* Fixed the linking against `log` on Android to be `PRIVATE` (#2815)
-* Fixed `Wuseless-cast` in benchmarking internals (#2823)
-
-### Improvements
-* Restored compatibility with VS2017 (#2792, #2822)
-  * The baseline for Catch2 is still C++14 with some reasonable workarounds for specific compilers, so if VS2017 starts acting up again, the support will be dropped again.
-* Suppressed clang-tidy's `bugprone-chained-comparison` in assertions (#2801)
-* Improved the static analysis mode to evaluate arguments to `TEST_CASE` and `SECTION` (#2817)
-  * Clang-tidy should no longer warn about runtime arguments to these macros being unused in static analysis mode.
-  * Clang-tidy can warn on issues involved arguments to these macros.
-* Added support for literal-zero detectors based on `consteval` constructors
-  * This is required for compiling `REQUIRE((a <=> b) == 0)` against MSVC's stdlib.
-  * Sadly, MSVC still cannot compile this assertion as it does not implement C++20 correctly.
-  * You can use `clang-cl` with MSVC's stdlib instead.
-  * If for some godforsaken reasons you want to understand this better, read the two relevant commits: [`dc51386b9fd61f99ea9c660d01867e6ad489b403`](https://github.com/catchorg/Catch2/commit/dc51386b9fd61f99ea9c660d01867e6ad489b403), and [`0787132fc82a75e3fb255aa9484ca1dc1eff2a30`](https://github.com/catchorg/Catch2/commit/0787132fc82a75e3fb255aa9484ca1dc1eff2a30).
-
-### Miscellaneous
-* Disabled tests for FP random generator reproducibility on non-SSE2 x86 targets (#2796)
-* Modified the in-tree Conan recipe to support Conan 2 (#2805)
-
-
-## 3.5.2
-
-### Fixes
-* Fixed `-Wsubobject-linkage` in the Console reporter (#2794)
-* Fixed adding new CLI Options to lvalue parser using `|` (#2787)
-
-
-## 3.5.1
-
-### Improvements
-* Significantly improved performance of the CLI parsing.
-  * This includes the cost of preparing the CLI parser, so Catch2's binaries start much faster.
-
-### Miscellaneous
-* Added support for Bazel modules (#2781)
-* Added CMake option to disable the build reproducibility settings (#2785)
-* Added `log` library linking to the Meson build (#2784)
-
-
-## 3.5.0
-
-### Improvements
-* Introduced `CATCH_CONFIG_PREFIX_MESSAGES` to prefix only logging macros (#2544)
-  * This means `INFO`, `UNSCOPED_INFO`, `WARN` and `CAPTURE`.
-* Section hints in static analysis mode are now `const`
-  * This prevents Clang-Tidy from complaining about `misc-const-correctness`.
-* `from_range` generator supports C arrays and ranges that require ADL (#2737)
-* Stringification support for `std::optional` now also includes `std::nullopt` (#2740)
-* The Console reporter flushes output after writing benchmark runtime estimate.
-  * This means that you can immediately see for how long the benchmark is expected to run.
-* Added workaround to enable compilation with ICC 19.1 (#2551, #2766)
-* Compiling Catch2 for XBox should work out of the box (#2772)
-  * Catch2 should automatically disable getenv when compiled for XBox.
-* Compiling Catch2 with exceptions disabled no longer triggers `Wunused-function` (#2726)
-* **`random` Generators for integral types are now reproducible across different platforms**
-  * Unlike `<random>`, Catch2's generators also support 1 byte integral types (`char`, `bool`, ...)
-* **`random` Generators for `float` and `double` are now reproducible across different platforms**
-  * `long double` varies across different platforms too much to be reproducible
-  * This guarantee applies only to platforms with IEEE 754 floats.
-
-### Fixes
-* UDL declaration inside Catch2 are now strictly conforming to the standard
-  * `operator "" _a` is UB, `operator ""_a` is fine. Seriously.
-* Fixed `CAPTURE` tests failing to compile in C++23 mode (#2744)
-* Fixed missing include in `catch_message.hpp` (#2758)
-* Fixed `CHECK_ELSE` suppressing failure from uncaught exceptions(#2723)
-
-### Miscellaneous
-* The documentation for specifying which tests to run through commandline has been completely rewritten (#2738)
-* Fixed installation when building Catch2 with meson (#2722, #2742)
-* Fixed `catch_discover_tests` when using custom reporter and `PRE_TEST` discovery mode (#2747)
-* `catch_discover_tests` supports multi-config CMake generator in `PRE_TEST` discovery mode (#2739, #2746)
-
-
-## 3.4.0
-
-### Improvements
-* `VectorEquals` supports elements that provide only `==` and not `!=` (#2648)
-* Catch2 supports compiling with IAR compiler (#2651)
-* Various small internal performance improvements
-* Various small internal compilation time improvements
-* XMLReporter now reports location info for INFO and WARN (#1251)
-  * This bumps up the xml format version to 3
-* Documented that `SKIP` in generator constructor can be used to handle empty  generator (#1593)
-* Added experimental static analysis support to `TEST_CASE` and `SECTION` macros (#2681)
-  * The two macros are redefined in a way that helps the SA tools reason about the possible paths through a test case with sections.
-  * The support is controlled by the `CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT` option and autodetects clang-tidy and Coverity.
-* `*_THROWS`, `*_THROWS_AS`, etc now suppress warning coming from `__attribute__((warn_unused_result))` on GCC  (#2691)
-  * Unlike plain `[[nodiscard]]`, this warning is not silenced by void cast. WTF GCC?
-
-### Fixes
-* Fixed `assertionStarting` events being sent after the expr is evaluated (#2678)
-* Errors in `TEST_CASE` tags are now reported nicely (#2650)
-
-### Miscellaneous
-* Bunch of improvements to `catch_discover_tests`
-  * Added DISCOVERY_MODE option, so the discovery can happen either post build or pre-run.
-  * Fixed handling of semicolons and backslashes in test names (#2674, #2676)
-* meson build can disable building tests (#2693)
-* meson build properly sets meson version 0.54.1 as the minimal supported version (#2688)
-
-
-## 3.3.2
-
-### Improvements
-* Further reduced allocations
-  * The compact, console, TAP and XML reporters perform less allocations in various cases
-  * Removed 1 allocation per entered `SECTION`/`TEST_CASE`.
-  * Removed 2 allocations per test case exit, if stdout/stderr is captured
-* Improved performance
-  * Section tracking is 10%-25% faster than in v3.3.0
-  * Assertion handling is 5%-10% faster than in v3.3.0
-  * Test case registration is 1%-2% faster than in v3.3.0
-  * Tiny speedup for registering listeners
-  * Tiny speedup for `CAPTURE`, `TEST_CASE_METHOD`, `METHOD_AS_TEST_CASE`, and `TEMPLATE_LIST_TEST_*` macros.
-* `Contains`, `RangeEquals` and `UnorderedRangeEquals` matchers now support ranges with iterator + sentinel pair
-* Added `IsNaN` matcher
-  * Unlike `REQUIRE(isnan(x))`, `REQUIRE_THAT(x, IsNaN())` shows you the value of `x`.
-* Suppressed `declared_but_not_referenced` warning for NVHPC (#2637)
-
-### Fixes
-* Fixed performance regression in section tracking introduced in v3.3.1
-  * Extreme cases would cause the tracking to run about 4x slower than in 3.3.0
-
-
-## 3.3.1
-
-### Improvements
-* Reduced allocations and improved performance
-  * The exact improvements are dependent on your usage of Catch2.
-  * For example running Catch2's SelfTest binary performs 8k less allocations.
-  * The main improvement comes from smarter handling of `SECTION`s, especially sibling `SECTION`s
-
-
-## 3.3.0
-
-### Improvements
-
-* Added `MessageMatches` exception matcher (#2570)
-* Added `RangeEquals` and `UnorderedRangeEquals` generic range matchers (#2377)
-* Added `SKIP` macro for skipping tests from within the test body (#2360)
-  * All built-in reporters have been extended to handle it properly, whether your custom reporter needs changes depends on how it was written
-  * `skipTest` reporter event **is unrelated** to this, and has been deprecated since it has practically no uses
-* Restored support for PPC Macs in the break-into-debugger functionality (#2619)
-* Made our warning suppression compatible with CUDA toolkit pre 11.5 (#2626)
-* Cleaned out some static analysis complaints
-
-
-### Fixes
-
-* Fixed macro redefinition warning when NVCC was reporting as MSVC (#2603)
-* Fixed throws in generator constructor causing the whole binary to abort (#2615)
-  * Now it just fails the test
-* Fixed missing transitive include with libstdc++13 (#2611)
-
-
-### Miscellaneous
-
-* Improved support for dynamic library build with non-MSVC compilers on Windows (#2630)
-* When used as a subproject, Catch2 keeps its generated header in a separate directory from the main project (#2604)
-
-
-
-## 3.2.1
-
-### Improvements
-* Fix the reworked decomposer to work with older (pre 9) GCC versions (#2571)
-  * **This required more significant changes to properly support C++20, there might be bugs.**
-
-
-## 3.2.0
-
-### Improvements
-* Catch2 now compiles on PlayStation (#2562)
-* Added `CATCH_CONFIG_GETENV` compile-time toggle (#2562)
-  * This toggle guards whether Catch2 calls `std::getenv` when reading env variables
-* Added support for more Bazel test environment variables
-  * `TESTBRIDGE_TEST_ONLY` is now supported (#2490)
-  * Sharding variables, `TEST_SHARD_INDEX`, `TEST_TOTAL_SHARDS`, `TEST_SHARD_STATUS_FILE`, are now all supported (#2491)
-* Bunch of small tweaks and improvements in reporters
-  * The TAP and SonarQube reporters output the used test filters
-  * The XML reporter now also reports the version of its output format
-  * The compact reporter now uses the same summary output as the console reporter (#878, #2554)
-* Added support for asserting on types that can only be compared with literal 0 (#2555)
-  * A canonical example is C++20's `std::*_ordering` types, which cannot be compared with an `int` variable, only `0`
-  * The support extends to any type with this property, not just the ones in stdlib
-  * This change imposes 2-3% slowdown on compiling files that are heavy on `REQUIRE` and friends
-  * **This required significant rewrite of decomposition, there might be bugs**
-* Simplified internals of matcher related macros
-  * This provides about ~2% speed up compiling files that are heavy on `REQUIRE_THAT` and friends
-
-
-### Fixes
-* Cleaned out some warnings and static analysis issues
-  * Suppressed `-Wcomma` warning rarely occurring in templated test cases (#2543)
-  * Constified implementation details in `INFO` (#2564)
-  * Made `MatcherGenericBase` copy constructor const (#2566)
-* Fixed serialization of test filters so the output roundtrips
-  * This means that e.g. `./tests/SelfTest "aaa bbb", [approx]` outputs `Filters: "aaa bbb",[approx]`
-
-
-### Miscellaneous
-* Catch2's build no longer leaks `-ffile-prefix-map` setting  to dependees (#2533)
-
-
-
-## 3.1.1
-
-### Improvements
-* Added `Catch::getSeed` function that user code can call to retrieve current rng-seed
-* Better detection of compiler support for `-ffile-prefix-map` (#2517)
-* Catch2's shared libraries now have `SOVERSION` set (#2516)
-* `catch2/catch_all.hpp` convenience header no longer transitively includes `windows.h` (#2432, #2526)
-
-
-### Fixes
-* Fixed compilation on Universal Windows Platform
-* Fixed compilation on VxWorks (#2515)
-* Fixed compilation on Cygwin (#2540)
-* Remove unused variable in reporter registration (#2538)
-* Fixed some symbol visibility issues with dynamic library on Windows (#2527)
-* Suppressed `-Wuseless-cast` warnings in `REQUIRE_THROWS*` macros (#2520, #2521)
-  * This was triggered when the potentially throwing expression evaluates to `void`
-* Fixed "warning: storage class is not first" with `nvc++` (#2533)
-* Fixed handling of `DL_PATHS` argument to `catch_discover_tests` on MacOS (#2483)
-* Suppressed `*-avoid-c-arrays` clang-tidy warning in `TEMPLATE_TEST_CASE` (#2095, #2536)
-
-
-### Miscellaneous
-* Fixed CMake install step for Catch2 build as dynamic library (#2485)
-* Raised minimum CMake version to 3.10 (#2523)
-  * Expect the minimum CMake version to increase once more in next few releases.
-* Whole bunch of doc updates and fixes
-  * #1444, #2497, #2547, #2549, and more
-* Added support for building Catch2 with Meson (#2530, #2539)
-
-
-
 ## 3.1.0
 
 ### Improvements
@@ -534,7 +209,7 @@ v3 releases.
 * Added `STATIC_CHECK` macro, similar to `STATIC_REQUIRE` (#2318)
   * When deferred tu runtime, it behaves like `CHECK`, and not like `REQUIRE`.
 * You can have multiple tests with the same name, as long as other parts of the test identity differ (#1915, #1999, #2175)
-  * Test identity includes test's name, test's tags and test's class name if applicable.
+  * Test identity includes test's name, test's tags and and test's class name if applicable.
 * Added new warning, `UnmatchedTestSpec`, to error on test specs with no matching tests
 * The `-w`, `--warn` warning flags can now be provided multiple times to enable multiple warnings
 * The case-insensitive handling of tags is now more reliable and takes up less memory
@@ -699,7 +374,7 @@ v3 releases.
   * The `SECTION`(s) before the `GENERATE` will not be run multiple times, the following ones will.
 * Added `-D`/`--min-duration` command line flag (#1910)
   * If a test takes longer to finish than the provided value, its name and duration will be printed.
-  * This flag is overridden by setting `-d`/`--duration`.
+  * This flag is overriden by setting `-d`/`--duration`.
 
 ### Fixes
 * `TAPReporter` no longer skips successful assertions (#1983)
@@ -740,7 +415,7 @@ v3 releases.
 ### Improvements
 * `std::result_of` is not used if `std::invoke_result` is available (#1934)
 * JUnit reporter writes out `status` attribute for tests (#1899)
-* Suppressed clang-tidy's `hicpp-vararg` warning (#1921)
+* Suppresed clang-tidy's `hicpp-vararg` warning (#1921)
   * Catch2 was already suppressing the `cppcoreguidelines-pro-type-vararg` alias of the warning
 
 
@@ -767,7 +442,7 @@ v3 releases.
 ### Fixes
 * Fixed computation of benchmarking column widths in ConsoleReporter (#1885, #1886)
 * Suppressed clang-tidy's `cppcoreguidelines-pro-type-vararg` in assertions (#1901)
-  * It was a false positive triggered by the new warning support workaround
+  * It was a false positive trigered by the new warning support workaround
 * Fixed bug in test specification parser handling of OR'd patterns using escaping (#1905)
 
 ### Miscellaneous
@@ -1104,7 +779,7 @@ v3 releases.
 
 ### Contrib
 * `ParseAndAddCatchTests` has learned how to use `DISABLED` CTest property (#1452)
-* `ParseAndAddCatchTests` now works when there is a whitespace before the test name (#1493)
+* `ParseAndAddCatchTests` now works when there is a whitspace before the test name (#1493)
 
 
 ### Miscellaneous

docs/reporter-events.md

@@ -96,12 +96,12 @@ void assertionStarting( AssertionInfo const& assertionInfo );
 void assertionEnded( AssertionStats const& assertionStats );
 ```
 
-The `assertionStarting` event is emitted before the expression in the
-assertion is captured or evaluated and `assertionEnded` is emitted
-afterwards. This means that given assertion like `REQUIRE(a + b == c + d)`,
-Catch2 first emits `assertionStarting` event, then `a + b` and `c + d`
-are evaluated, then their results are captured, the comparison is evaluated,
-and then `assertionEnded` event is emitted.
+`assertionStarting` is called after the expression is captured, but before
+the assertion expression is evaluated. This might seem like a minor
+distinction, but what it means is that if you have assertion like
+`REQUIRE( a + b == c + d )`, then what happens is that `a + b` and `c + d`
+are evaluated before `assertionStarting` is emitted, while the `==` is
+evaluated after the event.
 
 
 ## Benchmarking events
@@ -138,7 +138,7 @@ benchmarking itself fails.
 > Introduced in Catch2 3.0.1.
 
 Listings events are events that correspond to the test binary being
-invoked with `--list-foo` flag.
+invoked with `--list-foo` flag. 
 
 There are currently 3 listing events, one for reporters, one for tests,
 and one for tags. Note that they are not exclusive to each other.

docs/reporters.md

@@ -5,7 +5,7 @@ Reporters are a customization point for most of Catch2's output, e.g.
 formatting and writing out [assertions (whether passing or failing),
 sections, test cases, benchmarks, and so on](reporter-events.md#top).
 
-Catch2 comes with a bunch of reporters by default (currently 9), and
+Catch2 comes with a bunch of reporters by default (currently 8), and
 you can also write your own reporter. Because multiple reporters can
 be active at the same time, your own reporters do not even have to handle
 all reporter event, just the ones you are interested in, e.g. benchmarks.
@@ -52,7 +52,7 @@ its machine-readable XML output to file `result-junit.xml`, and the
 uses ANSI colour codes for colouring the output.
 
 Using multiple reporters (or one reporter and one-or-more [event
-listeners](event-listeners.md#top)) can have surprisingly complex semantics
+listeners](event-listener.md#top)) can have surprisingly complex semantics
 when using customization points provided to reporters by Catch2, namely
 capturing stdout/stderr from test cases.
 

docs/skipping-passing-failing.md

@@ -1,135 +0,0 @@
-<a id="top"></a>
-# Explicitly skipping, passing, and failing tests at runtime
-
-## Skipping Test Cases at Runtime
-
-> [Introduced](https://github.com/catchorg/Catch2/pull/2360) in Catch2 3.3.0.
-
-In some situations it may not be possible to meaningfully execute a test case,
-for example when the system under test is missing certain hardware capabilities.
-If the required conditions can only be determined at runtime, it often
-doesn't make sense to consider such a test case as either passed or failed,
-because it simply cannot run at all.
-
-To properly express such scenarios, Catch2 provides a way to explicitly
-_skip_ test cases, using the `SKIP` macro:
-
-```
-SKIP( [streamable expression] )
-```
-
-Example usage:
-
-```c++
-TEST_CASE("copy files between drives") {
-    if(getNumberOfHardDrives() < 2) {
-        SKIP("at least two hard drives required");
-    }
-    // ...
-}
-```
-
-This test case is then reported as _skipped_ instead of _passed_ or _failed_.
-
-The `SKIP` macro behaves similarly to an explicit [`FAIL`](#passing-and-failing-test-cases),
-in that it is the last expression that will be executed:
-
-```c++
-TEST_CASE("my test") {
-    printf("foo");
-    SKIP();
-    printf("bar"); // not printed
-}
-```
-
-However a failed assertion _before_ a `SKIP` still causes the entire
-test case to fail:
-
-```c++
-TEST_CASE("failing test") {
-    CHECK(1 == 2);
-    SKIP();
-}
-```
-
-### Interaction with Sections and Generators
-
-Sections, nested sections as well as specific outputs from [generators](generators.md#top)
-can all be individually skipped, with the rest executing as usual:
-
-```c++
-TEST_CASE("complex test case") {
-  int value = GENERATE(2, 4, 6);
-  SECTION("a") {
-    SECTION("a1") { CHECK(value < 8); }
-    SECTION("a2") {
-      if (value == 4) {
-        SKIP();
-      }
-      CHECK(value % 2 == 0);
-    }
-  }
-}
-```
-
-This test case will report 5 passing assertions; one for each of the three
-values in section `a1`, and then two in section `a2`, from values 2 and 4.
-
-Note that as soon as one section is skipped, the entire test case will
-be reported as _skipped_ (unless there is a failing assertion, in which
-case the test is handled as _failed_ instead).
-
-Note that if all test cases in a run are skipped, Catch2 returns a non-zero
-exit code, same as it does if no test cases have run. This behaviour can
-be overridden using the [--allow-running-no-tests](command-line.md#no-tests-override)
-flag.
-
-### `SKIP` inside generators
-
-You can also use the `SKIP` macro inside generator's constructor to handle
-cases where the generator is empty, but you do not want to fail the test
-case.
-
-
-## Passing and failing test cases
-
-Test cases can also be explicitly passed or failed, without the use of
-assertions, and with a specific message. This can be useful to handle
-complex preconditions/postconditions and give useful error messages
-when they fail.
-
-* `SUCCEED( [streamable expression] )`
-
-`SUCCEED` is morally equivalent with `INFO( [streamable expression] ); REQUIRE( true );`.
-Note that it does not stop further test execution, so it cannot be used
-to guard failing assertions from being executed.
-
-_In practice, `SUCCEED` is usually used as a test placeholder, to avoid
-[failing a test case due to missing assertions](command-line.md#warnings)._
-
-```cpp
-TEST_CASE( "SUCCEED showcase" ) {
-    int I = 1;
-    SUCCEED( "I is " << I );
-    // ... execution continues here ...
-}
-```
-
-* `FAIL( [streamable expression] )`
-
-`FAIL` is morally equivalent with `INFO( [streamable expression] ); REQUIRE( false );`.
-
-_In practice, `FAIL` is usually used to stop executing test that is currently
-known to be broken, but has to be fixed later._
-
-```cpp
-TEST_CASE( "FAIL showcase" ) {
-    FAIL( "This test case causes segfault, which breaks CI." );
-    // ... this will not be executed ...
-}
-```
-
-
----
-
-[Home](Readme.md#top)

docs/test-cases-and-sections.md

@@ -25,8 +25,7 @@ _section description_ can be used to provide long form description
 of a section while keeping the _section name_ short for use with the
 [`-c` command line parameter](command-line.md#specify-the-section-to-run).
 
-**The combination of test names and tags must be unique within the Catch2
-executable.**
+**Test names must be unique within the Catch executable.**
 
 For examples see the [Tutorial](tutorial.md#top)
 
@@ -48,7 +47,7 @@ For more detail on command line selection see [the command line docs](command-li
 Tag names are not case sensitive and can contain any ASCII characters.
 This means that tags `[tag with spaces]` and `[I said "good day"]`
 are both allowed tags and can be filtered on. However, escapes are not
-supported and `[\]]` is not a valid tag.
+supported however and `[\]]` is not a valid tag.
 
 The same tag can be specified multiple times for a single test case,
 but only one of the instances of identical tags will be kept. Which one
@@ -69,8 +68,7 @@ All tag names beginning with non-alphanumeric characters are reserved by Catch.
 
 * `[!nonportable]` - Indicates that behaviour may vary between platforms or compilers.
 
-* `[#<filename>]` - these tags are added to test cases when you run Catch2
-                    with [`-#` or `--filenames-as-tags`](command-line.md#filenames-as-tags).
+* `[#<filename>]` - running with `-#` or `--filenames-as-tags` causes Catch to add the filename, prefixed with `#` (and with any extension stripped), as a tag to all contained tests, e.g. tests in testfile.cpp would all be tagged `[#testfile]`.
 
 * `[@<alias>]` - tag aliases all begin with `@` (see below).
 
@@ -169,11 +167,7 @@ Other than the additional prefixes and the formatting in the console reporter th
 
 In addition to `TEST_CASE`s, Catch2 also supports test cases parametrised
 by types, in the form of `TEMPLATE_TEST_CASE`,
-`TEMPLATE_PRODUCT_TEST_CASE` and `TEMPLATE_LIST_TEST_CASE`. These macros
-are defined in the `catch_template_test_macros.hpp` header, so compiling
-the code examples below also requires
-`#include <catch2/catch_template_test_macros.hpp>`.
-
+`TEMPLATE_PRODUCT_TEST_CASE` and `TEMPLATE_LIST_TEST_CASE`.
 
 * **TEMPLATE_TEST_CASE(** _test name_ , _tags_,  _type1_, _type2_, ..., _typen_ **)**
 
@@ -231,7 +225,7 @@ TEMPLATE_TEST_CASE( "vectors can be sized and resized", "[vector][template]", in
 
 > [Introduced](https://github.com/catchorg/Catch2/issues/1468) in Catch2 2.6.0.
 
-_template-type1_ through _template-typen_ is list of template
+_template-type1_ through _template-typen_ is list of template template
 types which should be combined with each of _template-arg1_ through
  _template-argm_, resulting in _n * m_ test cases. Inside the test case,
 the resulting type is available under the name of `TestType`.
@@ -295,9 +289,7 @@ TEMPLATE_LIST_TEST_CASE("Template test case with test types specified inside std
 In addition to [type parametrised test cases](#type-parametrised-test-cases) Catch2 also supports
 signature base parametrised test cases, in form of `TEMPLATE_TEST_CASE_SIG` and `TEMPLATE_PRODUCT_TEST_CASE_SIG`.
 These test cases have similar syntax like [type parametrised test cases](#type-parametrised-test-cases), with one
-additional positional argument which specifies the signature. These macros are defined in the
-`catch_template_test_macros.hpp` header, so compiling the code examples below also requires
-`#include <catch2/catch_template_test_macros.hpp>`.
+additional positional argument which specifies the signature.
 
 ### Signature
 Signature has some strict rules for these tests cases to work properly:

docs/test-fixtures.md

@@ -1,30 +1,9 @@
 <a id="top"></a>
 # Test fixtures
 
-**Contents**<br>
-[Non-Templated test fixtures](#non-templated-test-fixtures)<br>
-[Templated test fixtures](#templated-test-fixtures)<br>
-[Signature-based parameterised test fixtures](#signature-based-parametrised-test-fixtures)<br>
-[Template fixtures with types specified in template type lists](#template-fixtures-with-types-specified-in-template-type-lists)<br>
+## Defining test fixtures
 
-## Non-Templated test fixtures
-
-Although Catch2 allows you to group tests together as 
-[sections within a test case](test-cases-and-sections.md), it can still 
-be convenient, sometimes, to group them using a more traditional test. 
-Catch2 fully supports this too with 3 different macros for 
-non-templated test fixtures. They are: 
-
-| Macro    | Description |
-|----------|-------------|
-|1. `TEST_CASE_METHOD(className, ...)`| Creates a uniquely named class which inherits from the class specified by `className`. The test function will be a member of this derived class. An instance of the derived class will be created for every partial run of the test case. |
-|2. `METHOD_AS_TEST_CASE(member-function, ...)`| Uses `member-function` as the test function. An instance of the class will be created for each partial run of the test case. |
-|3. `TEST_CASE_PERSISTENT_FIXTURE(className, ...)`| Creates a uniquely named class which inherits from the class specified by `className`. The test function will be a member of this derived class. An instance of the derived class will be created at the start of the test run. That instance will be destroyed once the entire test case has ended. |
-
-### 1. `TEST_CASE_METHOD`
-
-
-You define a `TEST_CASE_METHOD` test fixture as a simple structure:
+Although Catch allows you to group tests together as sections within a test case, it can still be convenient, sometimes, to group them using a more traditional test fixture. Catch fully supports this too. You define the test fixture as a simple structure:
 
 ```c++
 class UniqueTestsFixture {
@@ -51,116 +30,8 @@ class UniqueTestsFixture {
  }
 ```
 
-The two test cases here will create uniquely-named derived classes of 
-UniqueTestsFixture and thus can access the `getID()` protected method 
-and `conn` member variables. This ensures that both the test cases 
-are able to create a DBConnection using the same method 
-(DRY principle) and that any ID's created are unique such that the 
-order that tests are executed does not matter. 
+The two test cases here will create uniquely-named derived classes of UniqueTestsFixture and thus can access the `getID()` protected method and `conn` member variables. This ensures that both the test cases are able to create a DBConnection using the same method (DRY principle) and that any ID's created are unique such that the order that tests are executed does not matter.
 
-### 2. `METHOD_AS_TEST_CASE`
-
-`METHOD_AS_TEST_CASE` lets you register a member function of a class 
-as a Catch2 test case. The class will be separately instantiated 
-for each method registered in this way.
-
-```cpp
-class TestClass {
-    std::string s;
-
-public:
-    TestClass()
-        :s( "hello" )
-    {}
-
-    void testCase() {
-        REQUIRE( s == "hello" );
-    }
-};
-
-
-METHOD_AS_TEST_CASE( TestClass::testCase, "Use class's method as a test case", "[class]" )
-```
-
-This type of fixture is similar to [TEST_CASE_METHOD](#1-test_case_method) except in this 
-case it will directly use the provided class to create an object rather than a derived 
-class.
-
-### 3. `TEST_CASE_PERSISTENT_FIXTURE`
-
-> [Introduced](https://github.com/catchorg/Catch2/pull/2885) in Catch2 3.7.0
-
-`TEST_CASE_PERSISTENT_FIXTURE` behaves in the same way as
-[TEST_CASE_METHOD](#1-test_case_method) except that there will only be
-one instance created throughout the entire run of a test case. To 
-demonstrate this have a look at the following example:
-
-```cpp
-class ClassWithExpensiveSetup {
-public:
-    ClassWithExpensiveSetup() {
-        // expensive construction
-        std::this_thread::sleep_for( std::chrono::seconds( 2 ) );
-    }
-
-    ~ClassWithExpensiveSetup() noexcept {
-        // expensive destruction
-        std::this_thread::sleep_for( std::chrono::seconds( 1 ) );
-    }
-
-    int getInt() const { return 42; }
-};
-
-struct MyFixture {
-    mutable int myInt = 0;
-    ClassWithExpensiveSetup expensive;
-};
-
-TEST_CASE_PERSISTENT_FIXTURE( MyFixture, "Tests with MyFixture" ) {
-
-    const int val = myInt++;
-
-    SECTION( "First partial run" ) {
-        const auto otherValue = expensive.getInt();
-        REQUIRE( val == 0 );
-        REQUIRE( otherValue == 42 );
-    }
-
-    SECTION( "Second partial run" ) { REQUIRE( val == 1 ); }
-}
-```
-
-This example demonstates two possible use-cases of this fixture type:
-1. Improve test run times by reducing the amount of expensive and 
-redundant setup and tear-down required.
-2. Reusing results from the previous partial run, in the current
-partial run.
-
-This test case will be executed twice as there are two leaf sections.
-On the first run `val` will be `0` and on the second run `val` will be 
-`1`. This demonstrates that we were able to use the results of the
-previous partial run in subsequent partial runs.
-
-Additionally, we are simulating an expensive object using 
-`std::this_thread::sleep_for`, but real world use-cases could be:
-1. Creating a D3D12/Vulkan device
-2. Connecting to a database
-3. Loading a file.
-
-The fixture object (`MyFixture`) will be constructed just before the
-test case begins, and it will be destroyed just after the test case 
-ends. Therefore, this expensive object will only be created and 
-destroyed once during the execution of this test case. If we had used 
-`TEST_CASE_METHOD`, `MyFixture` would have been created and destroyed 
-twice during the execution of this test case.
-
-NOTE: The member function which runs the test case is `const`. Therefore 
-if you want to mutate any member of the fixture it must be marked as
-`mutable` as shown in this example. This is to make it clear that
-the initial state of the fixture is intended to mutate during the
-execution of the test case.
-
-## Templated test fixtures
 
 Catch2 also provides `TEMPLATE_TEST_CASE_METHOD` and
 `TEMPLATE_PRODUCT_TEST_CASE_METHOD` that can be used together
@@ -222,7 +93,7 @@ _While there is an upper limit on the number of types you can specify
 in single `TEMPLATE_TEST_CASE_METHOD` or `TEMPLATE_PRODUCT_TEST_CASE_METHOD`,
 the limit is very high and should not be encountered in practice._
 
-## Signature-based parameterised test fixtures
+## Signature-based parametrised test fixtures
 
 > [Introduced](https://github.com/catchorg/Catch2/issues/1609) in Catch2 2.8.0.
 
@@ -259,9 +130,9 @@ struct Template_Foo_2 {
 };
 
 TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG(
-    Template_Fixture_2,
-    "A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds",
-    "[class][template][product][nttp]",
+    Template_Fixture_2, 
+    "A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds", 
+    "[class][template][product][nttp]", 
     ((typename T, size_t S), T, S),
     (std::array, Template_Foo_2),
     ((int,2), (float,6))) {

docs/tostring.md

@@ -75,7 +75,7 @@ CATCH_TRANSLATE_EXCEPTION( MyType const& ex ) {
 
 Enums that already have a `<<` overload for `std::ostream` will convert to strings as expected.
 If you only need to convert enums to strings for test reporting purposes you can provide a `StringMaker` specialisations as any other type.
-However, as a convenience, Catch provides the `REGISTER_ENUM` helper macro that will generate the `StringMaker` specialisation for you with minimal code.
+However, as a convenience, Catch provides the `REGISTER_ENUM` helper macro that will generate the `StringMaker` specialiation for you with minimal code.
 Simply provide it the (qualified) enum name, followed by all the enum values, and you're done!
 
 E.g.

docs/tutorial.md

@@ -13,10 +13,9 @@
 ## Getting Catch2
 
 Ideally you should be using Catch2 through its [CMake integration](cmake-integration.md#top).
-Catch2 also provides pkg-config files and two file (header + cpp)
-distribution, but this documentation will assume you are using CMake. If
-you are using the two file distribution instead, remember to replace
-the included header with `catch_amalgamated.hpp` ([step by step instructions](migrate-v2-to-v3.md#how-to-migrate-projects-from-v2-to-v3)).
+Catch2 also provides pkg-config files and single TU distribution, but this
+documentation will assume you are using CMake. If you are using single-TU
+distribution instead, remember to replace the included header with `catch_amalgamated.hpp`.
 
 
 ## Writing tests
@@ -100,7 +99,7 @@ before we move on.
   It accepts a boolean expression, and uses expression templates to
   internally decompose it, so that it can be individually stringified
   on test failure.
-
+  
 On the last point, note that there are more testing macros available,
 because not all useful checks can be expressed as a simple boolean
 expression. As an example, checking that an expression throws an exception
@@ -119,7 +118,7 @@ This is best explained through an example ([code](../examples/100-Fix-Section.cp
 
 ```c++
 TEST_CASE( "vectors can be sized and resized", "[vector]" ) {
-    // This setup will be done 4 times in total, once for each section
+
     std::vector<int> v( 5 );
 
     REQUIRE( v.size() == 5 );
@@ -152,12 +151,11 @@ TEST_CASE( "vectors can be sized and resized", "[vector]" ) {
 }
 ```
 
-For each `SECTION` the `TEST_CASE` is **executed from the start**. This means
+For each `SECTION` the `TEST_CASE` is executed from the start. This means
 that each section is entered with a freshly constructed vector `v`, that
 we know has size 5 and capacity at least 5, because the two assertions
-are also checked before the section is entered. This behaviour may not be
-ideal for tests where setup is expensive. Each run through a test case will
-execute one, and only one, leaf section.
+are also checked before the section is entered. Each run through a test
+case will execute one, and only one, leaf section.
 
 Section can also be nested, in which case the parent section can be
 entered multiple times, once for each leaf section. Nested sections are
@@ -179,7 +177,7 @@ To continue on the vector example above, you could add a check that
     }
 ```
 
-Another way to look at sections is that they are a way to define a tree
+Another way to look at sections is that they are a way to define a tree 
 of paths through the test. Each section represents a node, and the final
 tree is walked in depth-first manner, with each path only visiting only
 one leaf node.

docs/usage-tips.md

@@ -47,7 +47,7 @@ Catch2 also supports [splitting tests in a binary into multiple
 shards](command-line.md#test-sharding). This can be used by any test
 runner to run batches of tests in parallel. Do note that when selecting
 on the number of shards, you should have more shards than there are cores,
-to avoid issues with long-running tests getting accidentally grouped in
+to avoid issues with long running tests getting accidentally grouped in
 the same shard, and causing long-tailed execution time.
 
 **Note that naively composing sharding and random ordering of tests will break.**
@@ -73,11 +73,6 @@ seed, e.g.
 ./tests --order rand --shard-index 2 --shard-count 3 --rng-seed 0xBEEF
 ```
 
-Catch2 actually provides a helper to automatically register multiple shards
-as CTest tests, with shared random seed that changes each CTest invocation.
-For details look at the documentation of
-[`CatchShardTests.cmake` CMake script](cmake-integration.md#catchshardtestscmake).
-
 
 ## Organizing tests into binaries
 

docs/why-catch.md

@@ -30,7 +30,7 @@ So what does Catch2 bring to the party that differentiates it from these? Apart
 * Output is through modular reporter objects. Basic textual and XML reporters are included. Custom reporters can easily be added.
 * JUnit xml output is supported for integration with third-party tools, such as CI servers.
 * A default main() function is provided, but you can supply your own for complete control (e.g. integration into your own test runner GUI).
-* A command line parser is provided and can still be used if you choose to provide your own main() function.
+* A command line parser is provided and can still be used if you choose to provided your own main() function.
 * Alternative assertion macro(s) report failures but don't abort the test case
 * Good set of facilities for floating point comparisons (`Catch::Approx` and full set of matchers)
 * Internal and friendly macros are isolated so name clashes can be managed
@@ -41,8 +41,8 @@ So what does Catch2 bring to the party that differentiates it from these? Apart
 
 ## Who else is using Catch2?
 
-A whole lot of people. According to [the 2022 JetBrains C++ ecosystem survey](https://www.jetbrains.com/lp/devecosystem-2022/cpp/#Which-unit-testing-frameworks-do-you-regularly-use),
-about 12% of C++ programmers use Catch2 for unit testing, making it the
+A whole lot of people. According to the 2021 Jetbrains C++ ecosystem survey,
+about 11% of C++ programmers use Catch2 for unit testing, making it the
 second most popular unit testing framework.
 
 You can also take a look at the (incomplete) list of [open source projects](opensource-users.md#top)

examples/010-TestCase.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 010-TestCase.cpp
 // And write tests in the same file:
 #include <catch2/catch_test_macros.hpp>

examples/020-TestCase-1.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 020-TestCase-1.cpp
 
 #include <catch2/catch_test_macros.hpp>

examples/020-TestCase-2.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 020-TestCase-2.cpp
 
 // main() provided by Catch in file 020-TestCase-1.cpp.

examples/030-Asn-Require-Check.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 030-Asn-Require-Check.cpp
 
 // Catch has two natural expression assertion macro's:

examples/100-Fix-Section.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 100-Fix-Section.cpp
 
 // Catch has two ways to express fixtures:

examples/110-Fix-ClassFixture.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 110-Fix-ClassFixture.cpp
 
 // Catch has two ways to express fixtures:

examples/111-Fix-PersistentFixture.cpp

@@ -1,74 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
-// Fixture.cpp
-
-// Catch2 has three ways to express fixtures:
-// - Sections
-// - Traditional class-based fixtures that are created and destroyed on every
-// partial run
-// - Traditional class-based fixtures that are created at the start of a test
-// case and destroyed at the end of a test case (this file)
-
-// main() provided by linkage to Catch2WithMain
-
-#include <catch2/catch_test_macros.hpp>
-
-#include <thread>
-
-class ClassWithExpensiveSetup {
-public:
-    ClassWithExpensiveSetup() {
-        // Imagine some really expensive set up here.
-        // e.g.
-        // setting up a D3D12/Vulkan Device,
-        // connecting to a database,
-        // loading a file
-        // etc etc etc
-        std::this_thread::sleep_for( std::chrono::seconds( 2 ) );
-    }
-
-    ~ClassWithExpensiveSetup() noexcept {
-        // We can do any clean up of the expensive class in the destructor
-        // e.g.
-        // destroy D3D12/Vulkan Device,
-        // disconnecting from a database,
-        // release file handle
-        // etc etc etc
-        std::this_thread::sleep_for( std::chrono::seconds( 1 ) );
-    }
-
-    int getInt() const { return 42; }
-};
-
-struct MyFixture {
-
-    // The test case member function is const.
-    // Therefore we need to mark any member of the fixture
-    // that needs to mutate as mutable.
-    mutable int myInt = 0;
-    ClassWithExpensiveSetup expensive;
-};
-
-// Only one object of type MyFixture will be instantiated for the run
-// of this test case even though there are two leaf sections.
-// This is useful if your test case requires an object that is
-// expensive to create and could be reused for each partial run of the
-// test case.
-TEST_CASE_PERSISTENT_FIXTURE( MyFixture, "Tests with MyFixture" ) {
-
-    const int val = myInt++;
-
-    SECTION( "First partial run" ) {
-        const auto otherValue = expensive.getInt();
-        REQUIRE( val == 0 );
-        REQUIRE( otherValue == 42 );
-    }
-
-    SECTION( "Second partial run" ) { REQUIRE( val == 1 ); }
-}

examples/120-Bdd-ScenarioGivenWhenThen.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 120-Bdd-ScenarioGivenWhenThen.cpp
 
 // main() provided by linkage with Catch2WithMain

examples/210-Evt-EventListeners.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 210-Evt-EventListeners.cpp
 
 // Contents:
@@ -385,7 +377,8 @@ struct MyListener : Catch::EventListenerBase {
 CATCH_REGISTER_LISTENER( MyListener )
 
 // Get rid of Wweak-tables
-MyListener::~MyListener() = default;
+MyListener::~MyListener() {}
+
 
 // -----------------------------------------------------------------------
 // 3. Test cases:

examples/231-Cfg-OutputStreams.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 231-Cfg-OutputStreams.cpp
 // Show how to replace the streams with a simple custom made streambuf.
 
@@ -22,7 +14,7 @@ class out_buff : public std::stringbuf {
     std::FILE* m_stream;
 public:
     out_buff(std::FILE* stream):m_stream(stream) {}
-    ~out_buff() override;
+    ~out_buff();
     int sync() override {
         int ret = 0;
         for (unsigned char c : str()) {

examples/232-Cfg-CustomMain.cpp

@@ -1,41 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
-// 232-Cfg-CustomMain.cpp
-// Show how to use custom main and add a custom option to the CLI parser
-
-#include <catch2/catch_session.hpp>
-
-#include <iostream>
-
-int main(int argc, char** argv) {
-  Catch::Session session; // There must be exactly one instance
-
-  int height = 0; // Some user variable you want to be able to set
-
-  // Build a new parser on top of Catch2's
-  using namespace Catch::Clara;
-  auto cli
-    = session.cli()           // Get Catch2's command line parser
-    | Opt( height, "height" ) // bind variable to a new option, with a hint string
-         ["--height"]         // the option names it will respond to
-         ("how high?");       // description string for the help output
-
-  // Now pass the new composite back to Catch2 so it uses that
-  session.cli( cli );
-
-  // Let Catch2 (using Clara) parse the command line
-  int returnCode = session.applyCommandLine( argc, argv );
-  if( returnCode != 0 ) // Indicates a command line error
-      return returnCode;
-
-  // if set on the command line then 'height' is now set at this point
-  std::cout << "height: " << height << '\n';
-
-  return session.run();
-}

examples/300-Gen-OwnGenerator.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 300-Gen-OwnGenerator.cpp
 // Shows how to define a custom generator.
 
@@ -21,7 +13,7 @@
 namespace {
 
 // This class shows how to implement a simple generator for Catch tests
-class RandomIntGenerator final : public Catch::Generators::IGenerator<int> {
+class RandomIntGenerator : public Catch::Generators::IGenerator<int> {
     std::minstd_rand m_rand;
     std::uniform_int_distribution<> m_dist;
     int current_number;

examples/301-Gen-MapTypeConversion.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 301-Gen-MapTypeConversion.cpp
 // Shows how to use map to modify generator's return type.
 
@@ -24,12 +16,12 @@ namespace {
 // Returns a line from a stream. You could have it e.g. read lines from
 // a file, but to avoid problems with paths in examples, we will use
 // a fixed stringstream.
-class LineGenerator final : public Catch::Generators::IGenerator<std::string> {
+class LineGenerator : public Catch::Generators::IGenerator<std::string> {
     std::string m_line;
     std::stringstream m_stream;
 public:
-    explicit LineGenerator( std::string const& lines ) {
-        m_stream.str( lines );
+    LineGenerator() {
+        m_stream.str("1\n2\n3\n4\n");
         if (!next()) {
             Catch::Generators::Detail::throw_generator_exception("Couldn't read a single line");
         }
@@ -49,19 +41,18 @@ std::string const& LineGenerator::get() const {
 // This helper function provides a nicer UX when instantiating the generator
 // Notice that it returns an instance of GeneratorWrapper<std::string>, which
 // is a value-wrapper around std::unique_ptr<IGenerator<std::string>>.
-Catch::Generators::GeneratorWrapper<std::string>
-lines( std::string const& lines ) {
+Catch::Generators::GeneratorWrapper<std::string> lines(std::string /* ignored for example */) {
     return Catch::Generators::GeneratorWrapper<std::string>(
-        new LineGenerator( lines ) );
+        new LineGenerator()
+    );
 }
 
 } // end anonymous namespace
 
 
 TEST_CASE("filter can convert types inside the generator expression", "[example][generator]") {
-    auto num = GENERATE(
-        map<int>( []( std::string const& line ) { return std::stoi( line ); },
-                  lines( "1\n2\n3\n4\n" ) ) );
+    auto num = GENERATE(map<int>([](std::string const& line) { return std::stoi(line); },
+                                 lines("fake-file")));
 
     REQUIRE(num > 0);
 }

examples/302-Gen-Table.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 302-Gen-Table.cpp
 // Shows how to use table to run a test many times with different inputs. Lifted from examples on
 // issue #850.
@@ -52,11 +44,11 @@ TEST_CASE("Table allows pre-computed test inputs and outputs", "[example][genera
 
 /* Possible simplifications where less legacy toolchain support is needed:
  *
- * - With libstdc++6 or newer, the make_tuple() calls can be omitted
+ * - With libstdc++6 or newer, the make_tuple() calls can be ommitted
  * (technically C++17 but does not require -std in GCC/Clang). See
  *   https://stackoverflow.com/questions/12436586/tuple-vector-and-initializer-list
  *
- * - In C++17 mode std::tie() and the preceding variable declarations can be
+ * - In C++17 mode std::tie() and the preceding variable delcarations can be
  * replaced by structured bindings: auto [test_input, expected] = GENERATE(
  * table<std::string, size_t>({ ...
  */

examples/310-Gen-VariablesInGenerators.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 310-Gen-VariablesInGenerator.cpp
 // Shows how to use variables when creating generators.
 

examples/311-Gen-CustomCapture.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 311-Gen-CustomCapture.cpp
 // Shows how to provide custom capture list to the generator expression
 

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 3.10 )
+cmake_minimum_required( VERSION 3.5 )
 
 project( Catch2Examples LANGUAGES CXX )
 
@@ -28,10 +28,8 @@ set( SOURCES_IDIOMATIC_EXAMPLES
     030-Asn-Require-Check.cpp
     100-Fix-Section.cpp
     110-Fix-ClassFixture.cpp
-    111-Fix-PersistentFixture.cpp
     120-Bdd-ScenarioGivenWhenThen.cpp
     210-Evt-EventListeners.cpp
-    232-Cfg-CustomMain.cpp
     300-Gen-OwnGenerator.cpp
     301-Gen-MapTypeConversion.cpp
     302-Gen-Table.cpp
@@ -44,7 +42,8 @@ set( TARGETS_IDIOMATIC_EXAMPLES ${BASENAMES_IDIOMATIC_EXAMPLES} )
 
 
 foreach( name ${TARGETS_IDIOMATIC_EXAMPLES} )
-    add_executable( ${name} ${name}.cpp )
+    add_executable( ${name}
+      ${EXAMPLES_DIR}/${name}.cpp )
 endforeach()
 
 set(ALL_EXAMPLE_TARGETS
@@ -54,7 +53,9 @@ set(ALL_EXAMPLE_TARGETS
 )
 
 foreach( name ${ALL_EXAMPLE_TARGETS} )
-    target_link_libraries( ${name} Catch2WithMain )
+    target_link_libraries( ${name} Catch2 Catch2WithMain )
+    set_property(TARGET ${name} PROPERTY CXX_STANDARD 14)
+    set_property(TARGET ${name} PROPERTY CXX_EXTENSIONS OFF)
 endforeach()
 
 

extras/Catch.cmake

@@ -35,9 +35,8 @@ same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
                          [TEST_LIST var]
                          [REPORTER reporter]
                          [OUTPUT_DIR dir]
-                         [OUTPUT_PREFIX prefix]
+                         [OUTPUT_PREFIX prefix}
                          [OUTPUT_SUFFIX suffix]
-                         [DISCOVERY_MODE <POST_BUILD|PRE_TEST>]
     )
 
   ``catch_discover_tests`` sets up a post-build command on the test executable
@@ -124,36 +123,15 @@ same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
     test executable and when the tests are executed themselves. This requires
     cmake/ctest >= 3.22.
 
-  ``DL_FRAMEWORK_PATHS path...``
-    Specifies paths that need to be set for the dynamic linker to find libraries
-    packaged as frameworks on Apple platforms when running the test executable
-    (DYLD_FRAMEWORK_PATH). These paths will both be set when retrieving the list
-    of test cases from the test executable and when the tests are executed themselves.
-    This requires cmake/ctest >= 3.22.
-
-  `DISCOVERY_MODE mode``
-    Provides control over when ``catch_discover_tests`` performs test discovery.
-    By default, ``POST_BUILD`` sets up a post-build command to perform test discovery
-    at build time. In certain scenarios, like cross-compiling, this ``POST_BUILD``
-    behavior is not desirable. By contrast, ``PRE_TEST`` delays test discovery until
-    just prior to test execution. This way test discovery occurs in the target environment
-    where the test has a better chance at finding appropriate runtime dependencies.
-
-    ``DISCOVERY_MODE`` defaults to the value of the
-    ``CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE`` variable if it is not passed when
-    calling ``catch_discover_tests``. This provides a mechanism for globally selecting
-    a preferred test discovery behavior without having to modify each call site.
-
 #]=======================================================================]
 
 #------------------------------------------------------------------------------
 function(catch_discover_tests TARGET)
-
   cmake_parse_arguments(
     ""
     ""
-    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST;REPORTER;OUTPUT_DIR;OUTPUT_PREFIX;OUTPUT_SUFFIX;DISCOVERY_MODE"
-    "TEST_SPEC;EXTRA_ARGS;PROPERTIES;DL_PATHS;DL_FRAMEWORK_PATHS"
+    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST;REPORTER;OUTPUT_DIR;OUTPUT_PREFIX;OUTPUT_SUFFIX"
+    "TEST_SPEC;EXTRA_ARGS;PROPERTIES;DL_PATHS"
     ${ARGN}
   )
 
@@ -163,20 +141,11 @@ function(catch_discover_tests TARGET)
   if(NOT _TEST_LIST)
     set(_TEST_LIST ${TARGET}_TESTS)
   endif()
-  if(_DL_PATHS AND ${CMAKE_VERSION} VERSION_LESS "3.22.0")
-    message(FATAL_ERROR "The DL_PATHS option requires at least cmake 3.22")
-  endif()
-  if(_DL_FRAMEWORK_PATHS AND ${CMAKE_VERSION} VERSION_LESS "3.22.0")
-    message(FATAL_ERROR "The DL_FRAMEWORK_PATHS option requires at least cmake 3.22")
-  endif()
-  if(NOT _DISCOVERY_MODE)
-    if(NOT CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE)
-      set(CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE "POST_BUILD")
+
+  if (_DL_PATHS)
+    if(${CMAKE_VERSION} VERSION_LESS "3.22.0")
+        message(FATAL_ERROR "The DL_PATHS option requires at least cmake 3.22")
     endif()
-    set(_DISCOVERY_MODE ${CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE})
-  endif()
-  if (NOT _DISCOVERY_MODE MATCHES "^(POST_BUILD|PRE_TEST)$")
-    message(FATAL_ERROR "Unknown DISCOVERY_MODE: ${_DISCOVERY_MODE}")
   endif()
 
   ## Generate a unique name based on the extra arguments
@@ -184,110 +153,45 @@ function(catch_discover_tests TARGET)
   string(SUBSTRING ${args_hash} 0 7 args_hash)
 
   # Define rule to generate test list for aforementioned test executable
-  set(ctest_file_base "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}-${args_hash}")
-  set(ctest_include_file "${ctest_file_base}_include.cmake")
-  set(ctest_tests_file "${ctest_file_base}_tests.cmake")
-
+  set(ctest_include_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_include-${args_hash}.cmake")
+  set(ctest_tests_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_tests-${args_hash}.cmake")
   get_property(crosscompiling_emulator
     TARGET ${TARGET}
     PROPERTY CROSSCOMPILING_EMULATOR
   )
+  add_custom_command(
+    TARGET ${TARGET} POST_BUILD
+    BYPRODUCTS "${ctest_tests_file}"
+    COMMAND "${CMAKE_COMMAND}"
+            -D "TEST_TARGET=${TARGET}"
+            -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
+            -D "TEST_EXECUTOR=${crosscompiling_emulator}"
+            -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
+            -D "TEST_SPEC=${_TEST_SPEC}"
+            -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
+            -D "TEST_PROPERTIES=${_PROPERTIES}"
+            -D "TEST_PREFIX=${_TEST_PREFIX}"
+            -D "TEST_SUFFIX=${_TEST_SUFFIX}"
+            -D "TEST_LIST=${_TEST_LIST}"
+            -D "TEST_REPORTER=${_REPORTER}"
+            -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}"
+            -D "TEST_OUTPUT_PREFIX=${_OUTPUT_PREFIX}"
+            -D "TEST_OUTPUT_SUFFIX=${_OUTPUT_SUFFIX}"
+            -D "TEST_DL_PATHS=${_DL_PATHS}"
+            -D "CTEST_FILE=${ctest_tests_file}"
+            -P "${_CATCH_DISCOVER_TESTS_SCRIPT}"
+    VERBATIM
+  )
 
-  if(_DISCOVERY_MODE STREQUAL "POST_BUILD")
-    add_custom_command(
-      TARGET ${TARGET} POST_BUILD
-      BYPRODUCTS "${ctest_tests_file}"
-      COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_TARGET=${TARGET}"
-              -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
-              -D "TEST_EXECUTOR=${crosscompiling_emulator}"
-              -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
-              -D "TEST_SPEC=${_TEST_SPEC}"
-              -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
-              -D "TEST_PROPERTIES=${_PROPERTIES}"
-              -D "TEST_PREFIX=${_TEST_PREFIX}"
-              -D "TEST_SUFFIX=${_TEST_SUFFIX}"
-              -D "TEST_LIST=${_TEST_LIST}"
-              -D "TEST_REPORTER=${_REPORTER}"
-              -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}"
-              -D "TEST_OUTPUT_PREFIX=${_OUTPUT_PREFIX}"
-              -D "TEST_OUTPUT_SUFFIX=${_OUTPUT_SUFFIX}"
-              -D "TEST_DL_PATHS=${_DL_PATHS}"
-              -D "TEST_DL_FRAMEWORK_PATHS=${_DL_FRAMEWORK_PATHS}"
-              -D "CTEST_FILE=${ctest_tests_file}"
-              -P "${_CATCH_DISCOVER_TESTS_SCRIPT}"
-      VERBATIM
-    )
+  file(WRITE "${ctest_include_file}"
+    "if(EXISTS \"${ctest_tests_file}\")\n"
+    "  include(\"${ctest_tests_file}\")\n"
+    "else()\n"
+    "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
+    "endif()\n"
+  )
 
-    file(WRITE "${ctest_include_file}"
-      "if(EXISTS \"${ctest_tests_file}\")\n"
-      "  include(\"${ctest_tests_file}\")\n"
-      "else()\n"
-      "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
-      "endif()\n"
-    )
-
-  elseif(_DISCOVERY_MODE STREQUAL "PRE_TEST")
-
-    get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL
-        PROPERTY GENERATOR_IS_MULTI_CONFIG
-    )
-
-    if(GENERATOR_IS_MULTI_CONFIG)
-      set(ctest_tests_file "${ctest_file_base}_tests-$<CONFIG>.cmake")
-    endif()
-
-    string(CONCAT ctest_include_content
-      "if(EXISTS \"$<TARGET_FILE:${TARGET}>\")"                                    "\n"
-      "  if(NOT EXISTS \"${ctest_tests_file}\" OR"                                 "\n"
-      "     NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"$<TARGET_FILE:${TARGET}>\" OR\n"
-      "     NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"\${CMAKE_CURRENT_LIST_FILE}\")\n"
-      "    include(\"${_CATCH_DISCOVER_TESTS_SCRIPT}\")"                           "\n"
-      "    catch_discover_tests_impl("                                             "\n"
-      "      TEST_EXECUTABLE"        " [==[" "$<TARGET_FILE:${TARGET}>"   "]==]"   "\n"
-      "      TEST_EXECUTOR"          " [==[" "${crosscompiling_emulator}" "]==]"   "\n"
-      "      TEST_WORKING_DIR"       " [==[" "${_WORKING_DIRECTORY}"      "]==]"   "\n"
-      "      TEST_SPEC"              " [==[" "${_TEST_SPEC}"              "]==]"   "\n"
-      "      TEST_EXTRA_ARGS"        " [==[" "${_EXTRA_ARGS}"             "]==]"   "\n"
-      "      TEST_PROPERTIES"        " [==[" "${_PROPERTIES}"             "]==]"   "\n"
-      "      TEST_PREFIX"            " [==[" "${_TEST_PREFIX}"            "]==]"   "\n"
-      "      TEST_SUFFIX"            " [==[" "${_TEST_SUFFIX}"            "]==]"   "\n"
-      "      TEST_LIST"              " [==[" "${_TEST_LIST}"              "]==]"   "\n"
-      "      TEST_REPORTER"          " [==[" "${_REPORTER}"               "]==]"   "\n"
-      "      TEST_OUTPUT_DIR"        " [==[" "${_OUTPUT_DIR}"             "]==]"   "\n"
-      "      TEST_OUTPUT_PREFIX"     " [==[" "${_OUTPUT_PREFIX}"          "]==]"   "\n"
-      "      TEST_OUTPUT_SUFFIX"     " [==[" "${_OUTPUT_SUFFIX}"          "]==]"   "\n"
-      "      CTEST_FILE"             " [==[" "${ctest_tests_file}"        "]==]"   "\n"
-      "      TEST_DL_PATHS"          " [==[" "${_DL_PATHS}"               "]==]"   "\n"
-      "      TEST_DL_FRAMEWORK_PATHS" " [==[" "${_DL_FRAMEWORK_PATHS}"     "]==]"   "\n"
-      "      CTEST_FILE"             " [==[" "${CTEST_FILE}"              "]==]"   "\n"
-      "    )"                                                                      "\n"
-      "  endif()"                                                                  "\n"
-      "  include(\"${ctest_tests_file}\")"                                         "\n"
-      "else()"                                                                     "\n"
-      "  add_test(${TARGET}_NOT_BUILT ${TARGET}_NOT_BUILT)"                        "\n"
-      "endif()"                                                                    "\n"
-    )
-
-    if(GENERATOR_IS_MULTI_CONFIG)
-      foreach(_config ${CMAKE_CONFIGURATION_TYPES})
-        file(GENERATE OUTPUT "${ctest_file_base}_include-${_config}.cmake" CONTENT "${ctest_include_content}" CONDITION $<CONFIG:${_config}>)
-      endforeach()
-      string(CONCAT ctest_include_multi_content
-        "if(NOT CTEST_CONFIGURATION_TYPE)"                                              "\n"
-        "  message(\"No configuration for testing specified, use '-C <cfg>'.\")"        "\n"
-        "else()"                                                                        "\n"
-        "  include(\"${ctest_file_base}_include-\${CTEST_CONFIGURATION_TYPE}.cmake\")"  "\n"
-        "endif()"                                                                       "\n"
-      )
-      file(GENERATE OUTPUT "${ctest_include_file}" CONTENT "${ctest_include_multi_content}")
-    else()
-      file(GENERATE OUTPUT "${ctest_file_base}_include.cmake" CONTENT "${ctest_include_content}")
-      file(WRITE "${ctest_include_file}" "include(\"${ctest_file_base}_include.cmake\")")
-    endif()
-  endif()
-
-  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
+  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0") 
     # Add discovered tests to directory TEST_INCLUDE_FILES
     set_property(DIRECTORY
       APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
@@ -300,7 +204,9 @@ function(catch_discover_tests TARGET)
         PROPERTY TEST_INCLUDE_FILE "${ctest_include_file}"
       )
     else()
-      message(FATAL_ERROR "Cannot set more than one TEST_INCLUDE_FILE")
+      message(FATAL_ERROR
+        "Cannot set more than one TEST_INCLUDE_FILE"
+      )
     endif()
   endif()
 

extras/CatchAddTests.cmake

@@ -1,6 +1,26 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
+set(prefix "${TEST_PREFIX}")
+set(suffix "${TEST_SUFFIX}")
+set(spec ${TEST_SPEC})
+set(extra_args ${TEST_EXTRA_ARGS})
+set(properties ${TEST_PROPERTIES})
+set(reporter ${TEST_REPORTER})
+set(output_dir ${TEST_OUTPUT_DIR})
+set(output_prefix ${TEST_OUTPUT_PREFIX})
+set(output_suffix ${TEST_OUTPUT_SUFFIX})
+set(dl_paths ${TEST_DL_PATHS})
+set(script)
+set(suite)
+set(tests)
+
+if(WIN32)
+  set(dl_paths_variable_name PATH)
+else()
+  set(dl_paths_variable_name LD_LIBRARY_PATH)
+endif()
+
 function(add_command NAME)
   set(_args "")
   # use ARGV* instead of ARGN, because ARGN splits arrays into multiple arguments
@@ -16,196 +36,119 @@ function(add_command NAME)
   set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE)
 endfunction()
 
-function(catch_discover_tests_impl)
-
-  cmake_parse_arguments(
-    ""
-    ""
-    "TEST_EXECUTABLE;TEST_WORKING_DIR;TEST_OUTPUT_DIR;TEST_OUTPUT_PREFIX;TEST_OUTPUT_SUFFIX;TEST_PREFIX;TEST_REPORTER;TEST_SPEC;TEST_SUFFIX;TEST_LIST;CTEST_FILE"
-    "TEST_EXTRA_ARGS;TEST_PROPERTIES;TEST_EXECUTOR;TEST_DL_PATHS;TEST_DL_FRAMEWORK_PATHS"
-    ${ARGN}
-  )
-
-  set(prefix "${_TEST_PREFIX}")
-  set(suffix "${_TEST_SUFFIX}")
-  set(spec ${_TEST_SPEC})
-  set(extra_args ${_TEST_EXTRA_ARGS})
-  set(properties ${_TEST_PROPERTIES})
-  set(reporter ${_TEST_REPORTER})
-  set(output_dir ${_TEST_OUTPUT_DIR})
-  set(output_prefix ${_TEST_OUTPUT_PREFIX})
-  set(output_suffix ${_TEST_OUTPUT_SUFFIX})
-  set(dl_paths ${_TEST_DL_PATHS})
-  set(dl_framework_paths ${_TEST_DL_FRAMEWORK_PATHS})
-  set(environment_modifications "")
-  set(script)
-  set(suite)
-  set(tests)
-
-  if(WIN32)
-    set(dl_paths_variable_name PATH)
-  elseif(APPLE)
-    set(dl_paths_variable_name DYLD_LIBRARY_PATH)
-  else()
-    set(dl_paths_variable_name LD_LIBRARY_PATH)
-  endif()
-
-  # Run test executable to get list of available tests
-  if(NOT EXISTS "${_TEST_EXECUTABLE}")
-    message(FATAL_ERROR
-      "Specified test executable '${_TEST_EXECUTABLE}' does not exist"
-    )
-  endif()
-
-  if(dl_paths)
-    cmake_path(CONVERT "$ENV{${dl_paths_variable_name}}" TO_NATIVE_PATH_LIST env_dl_paths)
-    list(PREPEND env_dl_paths "${dl_paths}")
-    cmake_path(CONVERT "${env_dl_paths}" TO_NATIVE_PATH_LIST paths)
-    set(ENV{${dl_paths_variable_name}} "${paths}")
-  endif()
-
-  if(APPLE AND dl_framework_paths)
-    cmake_path(CONVERT "$ENV{DYLD_FRAMEWORK_PATH}" TO_NATIVE_PATH_LIST env_dl_framework_paths)
-    list(PREPEND env_dl_framework_paths "${dl_framework_paths}")
-    cmake_path(CONVERT "${env_dl_framework_paths}" TO_NATIVE_PATH_LIST paths)
-    set(ENV{DYLD_FRAMEWORK_PATH} "${paths}")
-  endif()
-
-  execute_process(
-    COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" ${spec} --list-tests --verbosity quiet
-    OUTPUT_VARIABLE output
-    RESULT_VARIABLE result
-    WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-  )
-  if(NOT ${result} EQUAL 0)
-    message(FATAL_ERROR
-      "Error running test executable '${_TEST_EXECUTABLE}':\n"
-      "  Result: ${result}\n"
-      "  Output: ${output}\n"
-    )
-  endif()
-
-  # Make sure to escape ; (semicolons) in test names first, because
-  # that'd break the foreach loop for "Parse output" later and create
-  # wrongly splitted and thus failing test cases (false positives)
-  string(REPLACE ";" "\;" output "${output}")
-  string(REPLACE "\n" ";" output "${output}")
-
-  # Prepare reporter
-  if(reporter)
-    set(reporter_arg "--reporter ${reporter}")
-
-    # Run test executable to check whether reporter is available
-    # note that the use of --list-reporters is not the important part,
-    # we only want to check whether the execution succeeds with ${reporter_arg}
-    execute_process(
-      COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" ${spec} ${reporter_arg} --list-reporters
-      OUTPUT_VARIABLE reporter_check_output
-      RESULT_VARIABLE reporter_check_result
-      WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-    )
-    if(${reporter_check_result} EQUAL 255)
-      message(FATAL_ERROR
-        "\"${reporter}\" is not a valid reporter!\n"
-      )
-    elseif(NOT ${reporter_check_result} EQUAL 0)
-      message(FATAL_ERROR
-        "Error running test executable '${_TEST_EXECUTABLE}':\n"
-        "  Result: ${reporter_check_result}\n"
-        "  Output: ${reporter_check_output}\n"
-      )
-    endif()
-  endif()
-
-  # Prepare output dir
-  if(output_dir AND NOT IS_ABSOLUTE ${output_dir})
-    set(output_dir "${_TEST_WORKING_DIR}/${output_dir}")
-    if(NOT EXISTS ${output_dir})
-      file(MAKE_DIRECTORY ${output_dir})
-    endif()
-  endif()
-
-  if(dl_paths)
-    foreach(path ${dl_paths})
-      cmake_path(NATIVE_PATH path native_path)
-      list(PREPEND environment_modifications "${dl_paths_variable_name}=path_list_prepend:${native_path}")
-    endforeach()
-  endif()
-
-  if(APPLE AND dl_framework_paths)
-    foreach(path ${dl_framework_paths})
-      cmake_path(NATIVE_PATH path native_path)
-      list(PREPEND environment_modifications "DYLD_FRAMEWORK_PATH=path_list_prepend:${native_path}")
-    endforeach()
-  endif()
-
-  # Parse output
-  foreach(line ${output})
-    set(test "${line}")
-    # Escape characters in test case names that would be parsed by Catch2
-    # Note that the \ escaping must happen FIRST! Do not change the order.
-    set(test_name "${test}")
-    foreach(char \\ , [ ])
-      string(REPLACE ${char} "\\${char}" test_name "${test_name}")
-    endforeach(char)
-    # ...add output dir
-    if(output_dir)
-      string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean "${test_name}")
-      set(output_dir_arg "--out ${output_dir}/${output_prefix}${test_name_clean}${output_suffix}")
-    endif()
-
-    # ...and add to script
-    add_command(add_test
-      "${prefix}${test}${suffix}"
-      ${_TEST_EXECUTOR}
-      "${_TEST_EXECUTABLE}"
-      "${test_name}"
-      ${extra_args}
-      "${reporter_arg}"
-      "${output_dir_arg}"
-    )
-    add_command(set_tests_properties
-      "${prefix}${test}${suffix}"
-      PROPERTIES
-      WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-      ${properties}
-    )
-
-    if(environment_modifications)
-      add_command(set_tests_properties
-        "${prefix}${test}${suffix}"
-        PROPERTIES
-        ENVIRONMENT_MODIFICATION "${environment_modifications}")
-    endif()
-
-    list(APPEND tests "${prefix}${test}${suffix}")
-  endforeach()
-
-  # Create a list of all discovered tests, which users may use to e.g. set
-  # properties on the tests
-  add_command(set ${_TEST_LIST} ${tests})
-
-  # Write CTest script
-  file(WRITE "${_CTEST_FILE}" "${script}")
-endfunction()
-
-if(CMAKE_SCRIPT_MODE_FILE)
-  catch_discover_tests_impl(
-    TEST_EXECUTABLE ${TEST_EXECUTABLE}
-    TEST_EXECUTOR ${TEST_EXECUTOR}
-    TEST_WORKING_DIR ${TEST_WORKING_DIR}
-    TEST_SPEC ${TEST_SPEC}
-    TEST_EXTRA_ARGS ${TEST_EXTRA_ARGS}
-    TEST_PROPERTIES ${TEST_PROPERTIES}
-    TEST_PREFIX ${TEST_PREFIX}
-    TEST_SUFFIX ${TEST_SUFFIX}
-    TEST_LIST ${TEST_LIST}
-    TEST_REPORTER ${TEST_REPORTER}
-    TEST_OUTPUT_DIR ${TEST_OUTPUT_DIR}
-    TEST_OUTPUT_PREFIX ${TEST_OUTPUT_PREFIX}
-    TEST_OUTPUT_SUFFIX ${TEST_OUTPUT_SUFFIX}
-    TEST_DL_PATHS ${TEST_DL_PATHS}
-    TEST_DL_FRAMEWORK_PATHS ${TEST_DL_FRAMEWORK_PATHS}
-    CTEST_FILE ${CTEST_FILE}
+# Run test executable to get list of available tests
+if(NOT EXISTS "${TEST_EXECUTABLE}")
+  message(FATAL_ERROR
+    "Specified test executable '${TEST_EXECUTABLE}' does not exist"
   )
 endif()
+
+if(dl_paths)
+  cmake_path(CONVERT "${dl_paths}" TO_NATIVE_PATH_LIST paths)
+  set(ENV{${dl_paths_variable_name}} "${paths}")
+endif()
+
+execute_process(
+  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-tests --verbosity quiet
+  OUTPUT_VARIABLE output
+  RESULT_VARIABLE result
+  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
+)
+if(NOT ${result} EQUAL 0)
+  message(FATAL_ERROR
+    "Error running test executable '${TEST_EXECUTABLE}':\n"
+    "  Result: ${result}\n"
+    "  Output: ${output}\n"
+  )
+endif()
+
+string(REPLACE "\n" ";" output "${output}")
+
+# Run test executable to get list of available reporters
+execute_process(
+  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-reporters
+  OUTPUT_VARIABLE reporters_output
+  RESULT_VARIABLE reporters_result
+  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
+)
+if(NOT ${reporters_result} EQUAL 0)
+  message(FATAL_ERROR
+    "Error running test executable '${TEST_EXECUTABLE}':\n"
+    "  Result: ${reporters_result}\n"
+    "  Output: ${reporters_output}\n"
+  )
+endif()
+string(FIND "${reporters_output}" "${reporter}" reporter_is_valid)
+if(reporter AND ${reporter_is_valid} EQUAL -1)
+  message(FATAL_ERROR
+    "\"${reporter}\" is not a valid reporter!\n"
+  )
+endif()
+
+# Prepare reporter
+if(reporter)
+  set(reporter_arg "--reporter ${reporter}")
+endif()
+
+# Prepare output dir
+if(output_dir AND NOT IS_ABSOLUTE ${output_dir})
+  set(output_dir "${TEST_WORKING_DIR}/${output_dir}")
+  if(NOT EXISTS ${output_dir})
+    file(MAKE_DIRECTORY ${output_dir})
+  endif()
+endif()
+
+if(dl_paths)
+  foreach(path ${dl_paths})
+    cmake_path(NATIVE_PATH path native_path)
+    list(APPEND environment_modifications "${dl_paths_variable_name}=path_list_prepend:${native_path}")
+  endforeach()
+endif()
+
+# Parse output
+foreach(line ${output})
+  set(test ${line})
+  # Escape characters in test case names that would be parsed by Catch2
+  set(test_name ${test})
+  foreach(char , [ ])
+    string(REPLACE ${char} "\\${char}" test_name ${test_name})
+  endforeach(char)
+  # ...add output dir
+  if(output_dir)
+    string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean ${test_name})
+    set(output_dir_arg "--out ${output_dir}/${output_prefix}${test_name_clean}${output_suffix}")
+  endif()
+  
+  # ...and add to script
+  add_command(add_test
+    "${prefix}${test}${suffix}"
+    ${TEST_EXECUTOR}
+    "${TEST_EXECUTABLE}"
+    "${test_name}"
+    ${extra_args}
+    "${reporter_arg}"
+    "${output_dir_arg}"
+  )
+  add_command(set_tests_properties
+    "${prefix}${test}${suffix}"
+    PROPERTIES
+    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
+    ${properties}
+  )
+
+   if(environment_modifications)
+     add_command(set_tests_properties
+       "${prefix}${test}${suffix}"
+       PROPERTIES
+       ENVIRONMENT_MODIFICATION "${environment_modifications}")
+   endif()
+
+  list(APPEND tests "${prefix}${test}${suffix}")
+endforeach()
+
+# Create a list of all discovered tests, which users may use to e.g. set
+# properties on the tests
+add_command(set ${TEST_LIST} ${tests})
+
+# Write CTest script
+file(WRITE "${CTEST_FILE}" "${script}")

extras/CatchShardTests.cmake

@@ -1,7 +1,7 @@
 
 #              Copyright Catch2 Authors
 # Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
+#   (See accompanying file LICENSE_1_0.txt or copy at
 #        https://www.boost.org/LICENSE_1_0.txt)
 
 # SPDX-License-Identifier: BSL-1.0
@@ -46,7 +46,7 @@ function(catch_add_sharded_tests TARGET)
     APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
   )
 
-  set(shard_impl_script_file "${_CATCH_DISCOVER_SHARD_TESTS_IMPL_SCRIPT}")
+  set(shard_impl_script_file "${CMAKE_CURRENT_LIST_DIR}/CatchShardTestsImpl.cmake")
 
   add_custom_command(
     TARGET ${TARGET} POST_BUILD
@@ -64,11 +64,3 @@ function(catch_add_sharded_tests TARGET)
 
 
 endfunction()
-
-
-###############################################################################
-
-set(_CATCH_DISCOVER_SHARD_TESTS_IMPL_SCRIPT
-    ${CMAKE_CURRENT_LIST_DIR}/CatchShardTestsImpl.cmake
-  CACHE INTERNAL "Catch2 full path to CatchShardTestsImpl.cmake helper file"
-)

extras/CatchShardTestsImpl.cmake

@@ -1,7 +1,7 @@
 
 #              Copyright Catch2 Authors
 # Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
+#   (See accompanying file LICENSE_1_0.txt or copy at
 #        https://www.boost.org/LICENSE_1_0.txt)
 
 # SPDX-License-Identifier: BSL-1.0

extras/ParseAndAddCatchTests.cmake

@@ -187,7 +187,7 @@ function(ParseAndAddCatchTests_ParseFile SourceFile TestTarget)
             if(result)
                 set(HiddenTagFound ON)
                 break()
-            endif()
+            endif(result)
         endforeach(label)
         if(PARSE_CATCH_TESTS_NO_HIDDEN_TESTS AND ${HiddenTagFound} AND ${CMAKE_VERSION} VERSION_LESS "3.9")
             ParseAndAddCatchTests_PrintDebugMessage("Skipping test \"${CTestName}\" as it has [!hide], [.] or [.foo] label")

fuzzing/NullOStream.cpp

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 #include "NullOStream.h"
 
 void NullOStream::avoidOutOfLineVirtualCompilerWarning()

fuzzing/NullOStream.h

@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 #pragma once
 
 #include <ostream>

fuzzing/fuzz_TestSpecParser.cpp

@@ -1,10 +1,4 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
+//License: Boost 1.0
 //By Paul Dreik 2020
 
 #include <catch2/internal/catch_test_spec_parser.hpp>

fuzzing/fuzz_XmlWriter.cpp

@@ -1,10 +1,4 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
+//License: Boost 1.0
 //By Paul Dreik 2020
 
 #include <catch2/internal/catch_xmlwriter.hpp>

fuzzing/fuzz_textflow.cpp

@@ -1,10 +1,4 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
+//License: Boost 1.0
 //By Paul Dreik 2020
 
 #include <catch2/internal/catch_textflow.hpp>

meson.build

@@ -1,19 +0,0 @@
-#              Copyright Catch2 Authors
-# Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
-#        https://www.boost.org/LICENSE_1_0.txt)
-
-# SPDX-License-Identifier: BSL-1.0
-
-project(
-  'catch2',
-  'cpp',
-  version: '3.7.0', # CML version placeholder, don't delete
-  license: 'BSL-1.0',
-  meson_version: '>=0.54.1',
-)
-
-subdir('src/catch2')
-if get_option('tests')
-  subdir('tests')
-endif

meson_options.txt

@@ -1 +0,0 @@
-option('tests', type: 'boolean', value: true, description: 'Build the unit tests')

src/CMakeLists.txt

@@ -7,376 +7,334 @@ include(CatchMiscFunctions)
 set(Catch2_GUID_CMAKE "8d538cbe-01bf-4a2e-a98a-6c368fdf13d7" CACHE INTERNAL "Project GUID")
 set(Catch2WithMain_GUID_CMAKE "8bd3552a-2cfb-4a59-ab15-2031b97ada1e" CACHE INTERNAL "Project GUID")
 
+# Please keep these ordered alphabetically
 set(BENCHMARK_HEADERS
-  ${SOURCES_DIR}/benchmark/catch_benchmark.hpp
-  ${SOURCES_DIR}/benchmark/catch_benchmark_all.hpp
-  ${SOURCES_DIR}/benchmark/catch_chronometer.hpp
-  ${SOURCES_DIR}/benchmark/catch_clock.hpp
-  ${SOURCES_DIR}/benchmark/catch_constructor.hpp
-  ${SOURCES_DIR}/benchmark/catch_environment.hpp
-  ${SOURCES_DIR}/benchmark/catch_estimate.hpp
-  ${SOURCES_DIR}/benchmark/catch_execution_plan.hpp
-  ${SOURCES_DIR}/benchmark/catch_optimizer.hpp
-  ${SOURCES_DIR}/benchmark/catch_outlier_classification.hpp
-  ${SOURCES_DIR}/benchmark/catch_sample_analysis.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_analyse.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_stats.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_stats_fwd.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_complete_invoke.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_estimate_clock.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_measure.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_repeat.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_stats.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_timing.hpp
+    ${SOURCES_DIR}/benchmark/catch_benchmark.hpp
+    ${SOURCES_DIR}/benchmark/catch_benchmark_all.hpp
+    ${SOURCES_DIR}/benchmark/catch_chronometer.hpp
+    ${SOURCES_DIR}/benchmark/catch_clock.hpp
+    ${SOURCES_DIR}/benchmark/catch_constructor.hpp
+    ${SOURCES_DIR}/benchmark/catch_environment.hpp
+    ${SOURCES_DIR}/benchmark/catch_estimate.hpp
+    ${SOURCES_DIR}/benchmark/catch_execution_plan.hpp
+    ${SOURCES_DIR}/benchmark/catch_optimizer.hpp
+    ${SOURCES_DIR}/benchmark/catch_outlier_classification.hpp
+    ${SOURCES_DIR}/benchmark/catch_sample_analysis.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_analyse.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_complete_invoke.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_estimate_clock.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_measure.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_repeat.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_stats.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_timing.hpp
 )
 set(BENCHMARK_SOURCES
-  ${SOURCES_DIR}/benchmark/catch_chronometer.cpp
-  ${SOURCES_DIR}/benchmark/detail/catch_analyse.cpp
-  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.cpp
-  ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.cpp
-  ${SOURCES_DIR}/benchmark/detail/catch_stats.cpp
+    ${SOURCES_DIR}/benchmark/catch_chronometer.cpp
+    ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.cpp
+    ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.cpp
+    ${SOURCES_DIR}/benchmark/detail/catch_stats.cpp
 )
-set(BENCHMARK_FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
 
+SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
 
-set(IMPL_HEADERS
- "${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
-  ${SOURCES_DIR}/catch_user_config.hpp.in
-  ${SOURCES_DIR}/catch_all.hpp
-  ${SOURCES_DIR}/catch_approx.hpp
-  ${SOURCES_DIR}/catch_assertion_info.hpp
-  ${SOURCES_DIR}/catch_assertion_result.hpp
-  ${SOURCES_DIR}/catch_case_sensitive.hpp
-  ${SOURCES_DIR}/catch_config.hpp
-  ${SOURCES_DIR}/catch_get_random_seed.hpp
-  ${SOURCES_DIR}/catch_message.hpp
-  ${SOURCES_DIR}/catch_section_info.hpp
-  ${SOURCES_DIR}/catch_session.hpp
-  ${SOURCES_DIR}/catch_tag_alias.hpp
-  ${SOURCES_DIR}/catch_tag_alias_autoregistrar.hpp
-  ${SOURCES_DIR}/catch_template_test_macros.hpp
-  ${SOURCES_DIR}/catch_test_case_info.hpp
-  ${SOURCES_DIR}/catch_test_macros.hpp
-  ${SOURCES_DIR}/catch_test_spec.hpp
-  ${SOURCES_DIR}/catch_timer.hpp
-  ${SOURCES_DIR}/catch_tostring.hpp
-  ${SOURCES_DIR}/catch_totals.hpp
-  ${SOURCES_DIR}/catch_translate_exception.hpp
-  ${SOURCES_DIR}/catch_version.hpp
-  ${SOURCES_DIR}/catch_version_macros.hpp
-  ${SOURCES_DIR}/internal/catch_assertion_handler.hpp
-  ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.hpp
-  ${SOURCES_DIR}/internal/catch_clara.hpp
-  ${SOURCES_DIR}/internal/catch_commandline.hpp
-  ${SOURCES_DIR}/internal/catch_compare_traits.hpp
-  ${SOURCES_DIR}/internal/catch_compiler_capabilities.hpp
-  ${SOURCES_DIR}/internal/catch_config_android_logwrite.hpp
-  ${SOURCES_DIR}/internal/catch_config_counter.hpp
-  ${SOURCES_DIR}/internal/catch_config_prefix_messages.hpp
-  ${SOURCES_DIR}/internal/catch_config_static_analysis_support.hpp
-  ${SOURCES_DIR}/internal/catch_config_uncaught_exceptions.hpp
-  ${SOURCES_DIR}/internal/catch_config_wchar.hpp
-  ${SOURCES_DIR}/internal/catch_console_colour.hpp
-  ${SOURCES_DIR}/internal/catch_console_width.hpp
-  ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp
-  ${SOURCES_DIR}/internal/catch_context.hpp
-  ${SOURCES_DIR}/internal/catch_debug_console.hpp
-  ${SOURCES_DIR}/internal/catch_debugger.hpp
-  ${SOURCES_DIR}/internal/catch_decomposer.hpp
-  ${SOURCES_DIR}/internal/catch_enforce.hpp
-  ${SOURCES_DIR}/internal/catch_enum_values_registry.hpp
-  ${SOURCES_DIR}/internal/catch_errno_guard.hpp
-  ${SOURCES_DIR}/internal/catch_exception_translator_registry.hpp
-  ${SOURCES_DIR}/internal/catch_fatal_condition_handler.hpp
-  ${SOURCES_DIR}/internal/catch_floating_point_helpers.hpp
-  ${SOURCES_DIR}/internal/catch_getenv.hpp
-  ${SOURCES_DIR}/internal/catch_istream.hpp
-  ${SOURCES_DIR}/internal/catch_is_permutation.hpp
-  ${SOURCES_DIR}/internal/catch_jsonwriter.hpp
-  ${SOURCES_DIR}/internal/catch_lazy_expr.hpp
-  ${SOURCES_DIR}/internal/catch_leak_detector.hpp
-  ${SOURCES_DIR}/internal/catch_list.hpp
-  ${SOURCES_DIR}/internal/catch_logical_traits.hpp
-  ${SOURCES_DIR}/internal/catch_message_info.hpp
-  ${SOURCES_DIR}/internal/catch_meta.hpp
-  ${SOURCES_DIR}/internal/catch_move_and_forward.hpp
-  ${SOURCES_DIR}/internal/catch_noncopyable.hpp
-  ${SOURCES_DIR}/internal/catch_optional.hpp
-  ${SOURCES_DIR}/internal/catch_output_redirect.hpp
-  ${SOURCES_DIR}/internal/catch_parse_numbers.hpp
-  ${SOURCES_DIR}/internal/catch_platform.hpp
-  ${SOURCES_DIR}/internal/catch_polyfills.hpp
-  ${SOURCES_DIR}/internal/catch_preprocessor.hpp
-  ${SOURCES_DIR}/internal/catch_preprocessor_remove_parens.hpp
-  ${SOURCES_DIR}/internal/catch_random_floating_point_helpers.hpp
-  ${SOURCES_DIR}/internal/catch_random_integer_helpers.hpp
-  ${SOURCES_DIR}/internal/catch_random_number_generator.hpp
-  ${SOURCES_DIR}/internal/catch_random_seed_generation.hpp
-  ${SOURCES_DIR}/internal/catch_reporter_registry.hpp
-  ${SOURCES_DIR}/internal/catch_reporter_spec_parser.hpp
-  ${SOURCES_DIR}/internal/catch_result_type.hpp
-  ${SOURCES_DIR}/internal/catch_reusable_string_stream.hpp
-  ${SOURCES_DIR}/internal/catch_run_context.hpp
-  ${SOURCES_DIR}/internal/catch_section.hpp
-  ${SOURCES_DIR}/internal/catch_sharding.hpp
-  ${SOURCES_DIR}/internal/catch_singletons.hpp
-  ${SOURCES_DIR}/internal/catch_source_line_info.hpp
-  ${SOURCES_DIR}/internal/catch_startup_exception_registry.hpp
-  ${SOURCES_DIR}/internal/catch_stdstreams.hpp
-  ${SOURCES_DIR}/internal/catch_stream_end_stop.hpp
-  ${SOURCES_DIR}/internal/catch_string_manip.hpp
-  ${SOURCES_DIR}/internal/catch_stringref.hpp
-  ${SOURCES_DIR}/internal/catch_tag_alias_registry.hpp
-  ${SOURCES_DIR}/internal/catch_template_test_registry.hpp
-  ${SOURCES_DIR}/internal/catch_test_case_info_hasher.hpp
-  ${SOURCES_DIR}/internal/catch_test_case_registry_impl.hpp
-  ${SOURCES_DIR}/internal/catch_test_case_tracker.hpp
-  ${SOURCES_DIR}/internal/catch_test_failure_exception.hpp
-  ${SOURCES_DIR}/internal/catch_test_macro_impl.hpp
-  ${SOURCES_DIR}/internal/catch_test_registry.hpp
-  ${SOURCES_DIR}/internal/catch_test_run_info.hpp
-  ${SOURCES_DIR}/internal/catch_test_spec_parser.hpp
-  ${SOURCES_DIR}/internal/catch_textflow.hpp
-  ${SOURCES_DIR}/internal/catch_to_string.hpp
-  ${SOURCES_DIR}/internal/catch_uncaught_exceptions.hpp
-  ${SOURCES_DIR}/internal/catch_uniform_floating_point_distribution.hpp
-  ${SOURCES_DIR}/internal/catch_uniform_integer_distribution.hpp
-  ${SOURCES_DIR}/internal/catch_unique_name.hpp
-  ${SOURCES_DIR}/internal/catch_unique_ptr.hpp
-  ${SOURCES_DIR}/internal/catch_void_type.hpp
-  ${SOURCES_DIR}/internal/catch_wildcard_pattern.hpp
-  ${SOURCES_DIR}/internal/catch_windows_h_proxy.hpp
-  ${SOURCES_DIR}/internal/catch_xmlwriter.hpp
+set(INTERNAL_HEADERS
+   "${CMAKE_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
+   "${SOURCES_DIR}/catch_user_config.hpp.in"
+    ${SOURCES_DIR}/catch_all.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_all.hpp
+    ${SOURCES_DIR}/generators/catch_generators_all.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_all.hpp
+    ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.hpp
+    ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.hpp
+    ${SOURCES_DIR}/internal/catch_console_width.hpp
+    ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp
+    ${SOURCES_DIR}/internal/catch_noncopyable.hpp
+    ${SOURCES_DIR}/catch_approx.hpp
+    ${SOURCES_DIR}/internal/catch_assertion_handler.hpp
+    ${SOURCES_DIR}/catch_assertion_info.hpp
+    ${SOURCES_DIR}/catch_assertion_result.hpp
+    ${SOURCES_DIR}/internal/catch_test_macro_impl.hpp
+    ${SOURCES_DIR}/internal/catch_test_failure_exception.hpp
+    ${SOURCES_DIR}/internal/catch_case_sensitive.hpp
+    ${SOURCES_DIR}/internal/catch_clara.hpp
+    ${SOURCES_DIR}/internal/catch_commandline.hpp
+    ${SOURCES_DIR}/internal/catch_source_line_info.hpp
+    ${SOURCES_DIR}/internal/catch_compiler_capabilities.hpp
+    ${SOURCES_DIR}/catch_config.hpp
+    ${SOURCES_DIR}/internal/catch_config_android_logwrite.hpp
+    ${SOURCES_DIR}/internal/catch_config_counter.hpp
+    ${SOURCES_DIR}/internal/catch_config_uncaught_exceptions.hpp
+    ${SOURCES_DIR}/internal/catch_config_wchar.hpp
+    ${SOURCES_DIR}/internal/catch_console_colour.hpp
+    ${SOURCES_DIR}/internal/catch_context.hpp
+    ${SOURCES_DIR}/internal/catch_debug_console.hpp
+    ${SOURCES_DIR}/internal/catch_debugger.hpp
+    ${SOURCES_DIR}/internal/catch_decomposer.hpp
+    ${SOURCES_DIR}/internal/catch_enforce.hpp
+    ${SOURCES_DIR}/internal/catch_enum_values_registry.hpp
+    ${SOURCES_DIR}/internal/catch_errno_guard.hpp
+    ${SOURCES_DIR}/internal/catch_exception_translator_registry.hpp
+    ${SOURCES_DIR}/internal/catch_fatal_condition_handler.hpp
+    ${SOURCES_DIR}/internal/catch_floating_point_helpers.hpp
+    ${SOURCES_DIR}/internal/catch_istream.hpp
+    ${SOURCES_DIR}/internal/catch_unique_name.hpp
+    ${SOURCES_DIR}/internal/catch_sharding.hpp
+    ${SOURCES_DIR}/generators/catch_generator_exception.hpp
+    ${SOURCES_DIR}/generators/catch_generators.hpp
+    ${SOURCES_DIR}/generators/catch_generators_adapters.hpp
+    ${SOURCES_DIR}/generators/catch_generators_random.hpp
+    ${SOURCES_DIR}/generators/catch_generators_range.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_capture.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_config.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_enum_values_registry.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_exception.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_registry.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_tag_alias_registry.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.hpp
+    ${SOURCES_DIR}/internal/catch_lazy_expr.hpp
+    ${SOURCES_DIR}/internal/catch_leak_detector.hpp
+    ${SOURCES_DIR}/internal/catch_list.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_container_properties.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_contains.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_exception.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_floating_point.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_predicate.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_quantifiers.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_string.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_templated.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_vector.hpp
+    ${SOURCES_DIR}/catch_message.hpp
+    ${SOURCES_DIR}/internal/catch_message_info.hpp
+    ${SOURCES_DIR}/internal/catch_meta.hpp
+    ${SOURCES_DIR}/internal/catch_move_and_forward.hpp
+    ${SOURCES_DIR}/internal/catch_optional.hpp
+    ${SOURCES_DIR}/internal/catch_output_redirect.hpp
+    ${SOURCES_DIR}/internal/catch_platform.hpp
+    ${SOURCES_DIR}/internal/catch_polyfills.hpp
+    ${SOURCES_DIR}/internal/catch_preprocessor.hpp
+    ${SOURCES_DIR}/internal/catch_preprocessor_remove_parens.hpp
+    ${SOURCES_DIR}/internal/catch_random_number_generator.hpp
+    ${SOURCES_DIR}/internal/catch_random_seed_generation.hpp
+    ${SOURCES_DIR}/internal/catch_reporter_registry.hpp
+    ${SOURCES_DIR}/internal/catch_reporter_spec_parser.hpp
+    ${SOURCES_DIR}/internal/catch_result_type.hpp
+    ${SOURCES_DIR}/internal/catch_run_context.hpp
+    ${SOURCES_DIR}/internal/catch_section.hpp
+    ${SOURCES_DIR}/internal/catch_stdstreams.hpp
+    ${SOURCES_DIR}/catch_section_info.hpp
+    ${SOURCES_DIR}/catch_session.hpp
+    ${SOURCES_DIR}/internal/catch_singletons.hpp
+    ${SOURCES_DIR}/internal/catch_startup_exception_registry.hpp
+    ${SOURCES_DIR}/internal/catch_reusable_string_stream.hpp
+    ${SOURCES_DIR}/internal/catch_stream_end_stop.hpp
+    ${SOURCES_DIR}/internal/catch_string_manip.hpp
+    ${SOURCES_DIR}/internal/catch_stringref.hpp
+    ${SOURCES_DIR}/catch_tag_alias.hpp
+    ${SOURCES_DIR}/catch_tag_alias_autoregistrar.hpp
+    ${SOURCES_DIR}/internal/catch_tag_alias_registry.hpp
+    ${SOURCES_DIR}/catch_test_case_info.hpp
+    ${SOURCES_DIR}/internal/catch_test_case_registry_impl.hpp
+    ${SOURCES_DIR}/internal/catch_test_case_tracker.hpp
+    ${SOURCES_DIR}/catch_template_test_macros.hpp
+    ${SOURCES_DIR}/catch_test_macros.hpp
+    ${SOURCES_DIR}/internal/catch_template_test_registry.hpp
+    ${SOURCES_DIR}/internal/catch_test_registry.hpp
+    ${SOURCES_DIR}/catch_test_spec.hpp
+    ${SOURCES_DIR}/internal/catch_test_spec_parser.hpp
+    ${SOURCES_DIR}/internal/catch_textflow.hpp
+    ${SOURCES_DIR}/catch_timer.hpp
+    ${SOURCES_DIR}/internal/catch_to_string.hpp
+    ${SOURCES_DIR}/catch_tostring.hpp
+    ${SOURCES_DIR}/catch_totals.hpp
+    ${SOURCES_DIR}/catch_translate_exception.hpp
+    ${SOURCES_DIR}/internal/catch_uncaught_exceptions.hpp
+    ${SOURCES_DIR}/internal/catch_unique_ptr.hpp
+    ${SOURCES_DIR}/internal/catch_void_type.hpp
+    ${SOURCES_DIR}/catch_version.hpp
+    ${SOURCES_DIR}/catch_version_macros.hpp
+    ${SOURCES_DIR}/internal/catch_wildcard_pattern.hpp
+    ${SOURCES_DIR}/internal/catch_windows_h_proxy.hpp
+    ${SOURCES_DIR}/internal/catch_xmlwriter.hpp
+    ${SOURCES_DIR}/internal/catch_test_case_info_hasher.hpp
 )
 set(IMPL_SOURCES
-  ${SOURCES_DIR}/catch_approx.cpp
-  ${SOURCES_DIR}/catch_assertion_result.cpp
-  ${SOURCES_DIR}/catch_config.cpp
-  ${SOURCES_DIR}/catch_get_random_seed.cpp
-  ${SOURCES_DIR}/catch_message.cpp
-  ${SOURCES_DIR}/catch_registry_hub.cpp
-  ${SOURCES_DIR}/catch_session.cpp
-  ${SOURCES_DIR}/catch_tag_alias_autoregistrar.cpp
-  ${SOURCES_DIR}/catch_test_case_info.cpp
-  ${SOURCES_DIR}/catch_test_spec.cpp
-  ${SOURCES_DIR}/catch_timer.cpp
-  ${SOURCES_DIR}/catch_tostring.cpp
-  ${SOURCES_DIR}/catch_totals.cpp
-  ${SOURCES_DIR}/catch_translate_exception.cpp
-  ${SOURCES_DIR}/catch_version.cpp
-  ${SOURCES_DIR}/internal/catch_assertion_handler.cpp
-  ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.cpp
-  ${SOURCES_DIR}/internal/catch_clara.cpp
-  ${SOURCES_DIR}/internal/catch_commandline.cpp
-  ${SOURCES_DIR}/internal/catch_console_colour.cpp
-  ${SOURCES_DIR}/internal/catch_context.cpp
-  ${SOURCES_DIR}/internal/catch_debug_console.cpp
-  ${SOURCES_DIR}/internal/catch_debugger.cpp
-  ${SOURCES_DIR}/internal/catch_decomposer.cpp
-  ${SOURCES_DIR}/internal/catch_enforce.cpp
-  ${SOURCES_DIR}/internal/catch_enum_values_registry.cpp
-  ${SOURCES_DIR}/internal/catch_errno_guard.cpp
-  ${SOURCES_DIR}/internal/catch_exception_translator_registry.cpp
-  ${SOURCES_DIR}/internal/catch_fatal_condition_handler.cpp
-  ${SOURCES_DIR}/internal/catch_floating_point_helpers.cpp
-  ${SOURCES_DIR}/internal/catch_getenv.cpp
-  ${SOURCES_DIR}/internal/catch_istream.cpp
-  ${SOURCES_DIR}/internal/catch_jsonwriter.cpp
-  ${SOURCES_DIR}/internal/catch_lazy_expr.cpp
-  ${SOURCES_DIR}/internal/catch_leak_detector.cpp
-  ${SOURCES_DIR}/internal/catch_list.cpp
-  ${SOURCES_DIR}/internal/catch_message_info.cpp
-  ${SOURCES_DIR}/internal/catch_output_redirect.cpp
-  ${SOURCES_DIR}/internal/catch_parse_numbers.cpp
-  ${SOURCES_DIR}/internal/catch_polyfills.cpp
-  ${SOURCES_DIR}/internal/catch_random_number_generator.cpp
-  ${SOURCES_DIR}/internal/catch_random_seed_generation.cpp
-  ${SOURCES_DIR}/internal/catch_reporter_registry.cpp
-  ${SOURCES_DIR}/internal/catch_reporter_spec_parser.cpp
-  ${SOURCES_DIR}/internal/catch_reusable_string_stream.cpp
-  ${SOURCES_DIR}/internal/catch_run_context.cpp
-  ${SOURCES_DIR}/internal/catch_section.cpp
-  ${SOURCES_DIR}/internal/catch_singletons.cpp
-  ${SOURCES_DIR}/internal/catch_source_line_info.cpp
-  ${SOURCES_DIR}/internal/catch_startup_exception_registry.cpp
-  ${SOURCES_DIR}/internal/catch_stdstreams.cpp
-  ${SOURCES_DIR}/internal/catch_string_manip.cpp
-  ${SOURCES_DIR}/internal/catch_stringref.cpp
-  ${SOURCES_DIR}/internal/catch_tag_alias_registry.cpp
-  ${SOURCES_DIR}/internal/catch_test_case_info_hasher.cpp
-  ${SOURCES_DIR}/internal/catch_test_case_registry_impl.cpp
-  ${SOURCES_DIR}/internal/catch_test_case_tracker.cpp
-  ${SOURCES_DIR}/internal/catch_test_failure_exception.cpp
-  ${SOURCES_DIR}/internal/catch_test_registry.cpp
-  ${SOURCES_DIR}/internal/catch_test_spec_parser.cpp
-  ${SOURCES_DIR}/internal/catch_textflow.cpp
-  ${SOURCES_DIR}/internal/catch_uncaught_exceptions.cpp
-  ${SOURCES_DIR}/internal/catch_wildcard_pattern.cpp
-  ${SOURCES_DIR}/internal/catch_xmlwriter.cpp
+    ${SOURCES_DIR}/catch_approx.cpp
+    ${SOURCES_DIR}/internal/catch_assertion_handler.cpp
+    ${SOURCES_DIR}/catch_assertion_result.cpp
+    ${SOURCES_DIR}/internal/catch_clara.cpp
+    ${SOURCES_DIR}/internal/catch_commandline.cpp
+    ${SOURCES_DIR}/internal/catch_source_line_info.cpp
+    ${SOURCES_DIR}/catch_config.cpp
+    ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.cpp
+    ${SOURCES_DIR}/internal/catch_console_colour.cpp
+    ${SOURCES_DIR}/internal/catch_context.cpp
+    ${SOURCES_DIR}/internal/catch_debug_console.cpp
+    ${SOURCES_DIR}/internal/catch_debugger.cpp
+    ${SOURCES_DIR}/internal/catch_enforce.cpp
+    ${SOURCES_DIR}/internal/catch_enum_values_registry.cpp
+    ${SOURCES_DIR}/internal/catch_exception_translator_registry.cpp
+    ${SOURCES_DIR}/internal/catch_fatal_condition_handler.cpp
+    ${SOURCES_DIR}/internal/catch_floating_point_helpers.cpp
+    ${SOURCES_DIR}/internal/catch_istream.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.cpp
+    ${SOURCES_DIR}/internal/catch_list.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_floating_point.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_quantifiers.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_string.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_templated.cpp
+    ${SOURCES_DIR}/catch_message.cpp
+    ${SOURCES_DIR}/internal/catch_output_redirect.cpp
+    ${SOURCES_DIR}/catch_registry_hub.cpp
+    ${SOURCES_DIR}/internal/catch_random_number_generator.cpp
+    ${SOURCES_DIR}/internal/catch_random_seed_generation.cpp
+    ${SOURCES_DIR}/internal/catch_reporter_registry.cpp
+    ${SOURCES_DIR}/internal/catch_reporter_spec_parser.cpp
+    ${SOURCES_DIR}/internal/catch_result_type.cpp
+    ${SOURCES_DIR}/internal/catch_run_context.cpp
+    ${SOURCES_DIR}/internal/catch_section.cpp
+    ${SOURCES_DIR}/internal/catch_stdstreams.cpp
+    ${SOURCES_DIR}/catch_session.cpp
+    ${SOURCES_DIR}/internal/catch_singletons.cpp
+    ${SOURCES_DIR}/internal/catch_reusable_string_stream.cpp
+    ${SOURCES_DIR}/internal/catch_stringref.cpp
+    ${SOURCES_DIR}/internal/catch_string_manip.cpp
+    ${SOURCES_DIR}/internal/catch_tag_alias_registry.cpp
+    ${SOURCES_DIR}/catch_test_case_info.cpp
+    ${SOURCES_DIR}/internal/catch_test_case_registry_impl.cpp
+    ${SOURCES_DIR}/internal/catch_test_case_tracker.cpp
+    ${SOURCES_DIR}/internal/catch_test_registry.cpp
+    ${SOURCES_DIR}/internal/catch_textflow.cpp
+    ${SOURCES_DIR}/catch_test_spec.cpp
+    ${SOURCES_DIR}/internal/catch_test_spec_parser.cpp
+    ${SOURCES_DIR}/catch_timer.cpp
+    ${SOURCES_DIR}/catch_tostring.cpp
+    ${SOURCES_DIR}/catch_totals.cpp
+    ${SOURCES_DIR}/catch_version.cpp
+    ${SOURCES_DIR}/internal/catch_wildcard_pattern.cpp
+    ${SOURCES_DIR}/internal/catch_xmlwriter.cpp
+    ${SOURCES_DIR}/internal/catch_test_case_info_hasher.cpp
+    ${SOURCES_DIR}/generators/catch_generators_random.cpp
+    ${SOURCES_DIR}/generators/catch_generator_exception.cpp
+    ${SOURCES_DIR}/generators/catch_generators.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_container_properties.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_exception.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_predicate.cpp
+    ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.cpp
+    ${SOURCES_DIR}/catch_tag_alias_autoregistrar.cpp
+    ${SOURCES_DIR}/internal/catch_decomposer.cpp
+    ${SOURCES_DIR}/internal/catch_errno_guard.cpp
+    ${SOURCES_DIR}/internal/catch_lazy_expr.cpp
+    ${SOURCES_DIR}/internal/catch_leak_detector.cpp
+    ${SOURCES_DIR}/internal/catch_message_info.cpp
+    ${SOURCES_DIR}/internal/catch_polyfills.cpp
+    ${SOURCES_DIR}/internal/catch_startup_exception_registry.cpp
+    ${SOURCES_DIR}/internal/catch_uncaught_exceptions.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_capture.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_config.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_exception.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_registry.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.cpp
 )
-set(INTERNAL_FILES ${IMPL_SOURCES} ${IMPL_HEADERS})
-
-set(INTERFACE_HEADERS
-  ${SOURCES_DIR}/interfaces/catch_interfaces_all.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_capture.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_config.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_enum_values_registry.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_exception.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_tag_alias_registry.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_test_invoker.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.hpp
-)
-set(INTERFACE_SOURCES
-  ${SOURCES_DIR}/interfaces/catch_interfaces_capture.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_config.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_exception.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.cpp
-)
-set(INTERFACE_FILES ${INTERFACE_HEADERS} ${INTERFACE_SOURCES})
-
-set(GENERATOR_HEADERS
-  ${SOURCES_DIR}/generators/catch_generator_exception.hpp
-  ${SOURCES_DIR}/generators/catch_generators.hpp
-  ${SOURCES_DIR}/generators/catch_generators_adapters.hpp
-  ${SOURCES_DIR}/generators/catch_generators_all.hpp
-  ${SOURCES_DIR}/generators/catch_generators_random.hpp
-  ${SOURCES_DIR}/generators/catch_generators_range.hpp
-)
-set(GENERATOR_SOURCES
-  ${SOURCES_DIR}/generators/catch_generator_exception.cpp
-  ${SOURCES_DIR}/generators/catch_generators.cpp
-  ${SOURCES_DIR}/generators/catch_generators_random.cpp
-)
-set(GENERATOR_FILES ${GENERATOR_HEADERS} ${GENERATOR_SOURCES})
-
-set(MATCHER_HEADERS
-  ${SOURCES_DIR}/matchers/catch_matchers.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_all.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_container_properties.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_contains.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_range_equals.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_exception.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_floating_point.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_predicate.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_quantifiers.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_string.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_templated.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_vector.hpp
-  ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.hpp
-)
-set(MATCHER_SOURCES
-  ${SOURCES_DIR}/matchers/catch_matchers.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_container_properties.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_exception.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_floating_point.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_predicate.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_quantifiers.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_string.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_templated.cpp
-  ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.cpp
-)
-set(MATCHER_FILES ${MATCHER_HEADERS} ${MATCHER_SOURCES})
+set(INTERNAL_FILES ${IMPL_SOURCES} ${INTERNAL_HEADERS})
 
+# Please keep these ordered alphabetically
 set(REPORTER_HEADERS
-  ${SOURCES_DIR}/reporters/catch_reporter_automake.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_common_base.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_compact.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_console.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_event_listener.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_helpers.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_json.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_junit.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_multi.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_registrars.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_sonarqube.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_streaming_base.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_tap.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_teamcity.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_xml.hpp
-  ${SOURCES_DIR}/reporters/catch_reporters_all.hpp
+    ${SOURCES_DIR}/reporters/catch_reporters_all.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_automake.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_common_base.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_compact.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_console.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_event_listener.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_helpers.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_junit.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_multi.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_registrars.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_sonarqube.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_streaming_base.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_tap.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_teamcity.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_xml.hpp
 )
 set(REPORTER_SOURCES
-  ${SOURCES_DIR}/reporters/catch_reporter_automake.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_common_base.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_compact.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_console.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_event_listener.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_helpers.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_json.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_junit.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_multi.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_registrars.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_sonarqube.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_streaming_base.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_tap.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_teamcity.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_xml.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_automake.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_common_base.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_compact.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_console.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_event_listener.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_helpers.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_junit.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_multi.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_registrars.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_sonarqube.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_streaming_base.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_tap.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_teamcity.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_xml.cpp
 )
 set(REPORTER_FILES ${REPORTER_HEADERS} ${REPORTER_SOURCES})
 
-set(ALL_FILES
-  ${BENCHMARK_FILES}
-  ${GENERATOR_FILES}
+add_library(Catch2
   ${REPORTER_FILES}
-  ${INTERFACE_FILES}
   ${INTERNAL_FILES}
-  ${MATCHER_FILES}
+  ${BENCHMARK_HEADERS}
+  ${BENCHMARK_SOURCES}
 )
-
-set(FILTERED_FILES ${ALL_FILES})
-list(REMOVE_ITEM FILTERED_FILES "${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp")
-source_group(
-  TREE ${SOURCES_DIR}
-  PREFIX sources
-  FILES ${FILTERED_FILES}
-)
-source_group("generated headers"
-  FILES
-    "${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
-)
-
-add_library(Catch2 ${ALL_FILES})
-if (CATCH_ENABLE_REPRODUCIBLE_BUILD)
-    add_build_reproducibility_settings(Catch2)
-endif()
+add_build_reproducibility_settings(Catch2)
 add_library(Catch2::Catch2 ALIAS Catch2)
 
 if (ANDROID)
-    target_link_libraries(Catch2 PRIVATE log)
+    target_link_libraries(Catch2 INTERFACE log)
 endif()
 
-set_target_properties(Catch2 PROPERTIES
-                          DEBUG_POSTFIX "d"
-                                VERSION ${PROJECT_VERSION}
-                              SOVERSION ${PROJECT_VERSION})
+set_target_properties(Catch2 PROPERTIES DEBUG_POSTFIX "d")
 
-# require C++14
+# depend on bunch of C++11 and C++14 features to have C++14 enabled by default
 target_compile_features(Catch2
   PUBLIC
-    cxx_std_14
+    cxx_alignas
+    cxx_alignof
+    cxx_attributes
+    cxx_auto_type
+    cxx_constexpr
+    cxx_defaulted_functions
+    cxx_deleted_functions
+    cxx_final
+    cxx_lambdas
+    cxx_noexcept
+    cxx_override
+    cxx_range_for
+    cxx_rvalue_references
+    cxx_static_assert
+    cxx_strong_enums
+    cxx_trailing_return_types
+    cxx_unicode_literals
+    cxx_user_literals
+    cxx_variable_templates
+    cxx_variadic_macros
 )
 
 configure_file(
   "${SOURCES_DIR}/catch_user_config.hpp.in"
-  "${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
+  "${CMAKE_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
 )
 
 target_include_directories(Catch2
   PUBLIC
     $<BUILD_INTERFACE:${SOURCES_DIR}/..>
-    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-includes>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-includes>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
@@ -384,16 +342,12 @@ target_include_directories(Catch2
 add_library(Catch2WithMain
     ${SOURCES_DIR}/internal/catch_main.cpp
 )
-if (CATCH_ENABLE_REPRODUCIBLE_BUILD)
-    add_build_reproducibility_settings(Catch2WithMain)
-endif()
+add_build_reproducibility_settings(Catch2WithMain)
 add_library(Catch2::Catch2WithMain ALIAS Catch2WithMain)
 target_link_libraries(Catch2WithMain PUBLIC Catch2)
 set_target_properties(Catch2WithMain
   PROPERTIES
     OUTPUT_NAME "Catch2Main"
-        VERSION ${PROJECT_VERSION}
-      SOVERSION ${PROJECT_VERSION}
 )
 set_target_properties(Catch2WithMain PROPERTIES DEBUG_POSTFIX "d")
 
@@ -405,12 +359,8 @@ if (NOT_SUBPROJECT)
         Catch2WithMain
       EXPORT
         Catch2Targets
-      LIBRARY DESTINATION
+      DESTINATION
         ${CMAKE_INSTALL_LIBDIR}
-      ARCHIVE DESTINATION
-        ${CMAKE_INSTALL_LIBDIR}
-      RUNTIME DESTINATION
-        ${CMAKE_INSTALL_BINDIR}
     )
 
 
@@ -426,7 +376,7 @@ if (NOT_SUBPROJECT)
     install(
       DIRECTORY
         "${SOURCES_DIR}"
-        "${PROJECT_BINARY_DIR}/generated-includes/catch2" # Also install the generated header
+        "${CMAKE_BINARY_DIR}/generated-includes/catch2" # Also install the generated header
       DESTINATION
         "${CMAKE_INSTALL_INCLUDEDIR}"
       FILES_MATCHING
@@ -440,23 +390,41 @@ endif()
 if (CATCH_BUILD_EXAMPLES OR CATCH_BUILD_EXTRA_TESTS)
     add_library(Catch2_buildall_interface INTERFACE)
     target_sources(Catch2_buildall_interface INTERFACE
-      ${ALL_FILES}
+      ${REPORTER_FILES}
+      ${INTERNAL_FILES}
+      ${BENCHMARK_HEADERS}
+      ${BENCHMARK_SOURCES}
       # Also include main entry point
       ${SOURCES_DIR}/internal/catch_main.cpp
     )
     target_include_directories(Catch2_buildall_interface
       INTERFACE
         $<BUILD_INTERFACE:${SOURCES_DIR}/..>
-        $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-includes>
+        $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-includes>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
     )
-    target_compile_definitions(Catch2_buildall_interface
-      INTERFACE
-        CATCH_CONFIG_STATIC
-    )
     target_compile_features(Catch2_buildall_interface
       INTERFACE
-        cxx_std_14
+        cxx_alignas
+        cxx_alignof
+        cxx_attributes
+        cxx_auto_type
+        cxx_constexpr
+        cxx_defaulted_functions
+        cxx_deleted_functions
+        cxx_final
+        cxx_lambdas
+        cxx_noexcept
+        cxx_override
+        cxx_range_for
+        cxx_rvalue_references
+        cxx_static_assert
+        cxx_strong_enums
+        cxx_trailing_return_types
+        cxx_unicode_literals
+        cxx_user_literals
+        cxx_variable_templates
+        cxx_variadic_macros
     )
 endif()
 
@@ -468,10 +436,12 @@ set(CATCH_WARNING_TARGETS ${CATCH_WARNING_TARGETS} PARENT_SCOPE)
 # so we want to check & warn users if they do this. However, we won't abort
 # the configuration step so that we don't have to also provide an override.
 if (BUILD_SHARED_LIBS)
-    set_target_properties(Catch2 Catch2WithMain
-      PROPERTIES
-        WINDOWS_EXPORT_ALL_SYMBOLS ON
-    )
+    if (MSVC)
+        set_target_properties(Catch2 Catch2WithMain
+          PROPERTIES
+            WINDOWS_EXPORT_ALL_SYMBOLS ON
+        )
+    endif()
 
     get_target_property(_VisPreset Catch2 CXX_VISIBILITY_PRESET)
     if (NOT MSVC AND _VisPreset STREQUAL "hidden")

src/catch2/benchmark/catch_benchmark.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -10,28 +10,26 @@
 #ifndef CATCH_BENCHMARK_HPP_INCLUDED
 #define CATCH_BENCHMARK_HPP_INCLUDED
 
-#include <catch2/catch_user_config.hpp>
+#include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_context.hpp>
-#include <catch2/internal/catch_move_and_forward.hpp>
-#include <catch2/internal/catch_test_failure_exception.hpp>
+#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
-#include <catch2/interfaces/catch_interfaces_capture.hpp>
-#include <catch2/interfaces/catch_interfaces_config.hpp>
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-#include <catch2/benchmark/detail/catch_benchmark_stats.hpp>
+#include <catch2/internal/catch_move_and_forward.hpp>
+#include <catch2/benchmark/catch_chronometer.hpp>
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_environment.hpp>
 #include <catch2/benchmark/catch_execution_plan.hpp>
 #include <catch2/benchmark/detail/catch_estimate_clock.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/benchmark/detail/catch_analyse.hpp>
 #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
 #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
 
 #include <algorithm>
-#include <chrono>
-#include <exception>
+#include <functional>
 #include <string>
+#include <vector>
 #include <cmath>
 
 namespace Catch {
@@ -45,18 +43,16 @@ namespace Catch {
                 : fun(CATCH_MOVE(func)), name(CATCH_MOVE(benchmarkName)) {}
 
             template <typename Clock>
-            ExecutionPlan prepare(const IConfig &cfg, Environment env) {
+            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
                 auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
                 auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<IDuration>(run_time), 1, fun);
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
                 int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), CATCH_MOVE(fun), std::chrono::duration_cast<FDuration>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
             }
 
             template <typename Clock = default_clock>
             void run() {
-                static_assert( Clock::is_steady,
-                               "Benchmarking clock should be steady" );
                 auto const* cfg = getCurrentContext().getConfig();
 
                 auto env = Detail::measure_environment<Clock>();
@@ -68,7 +64,7 @@ namespace Catch {
                     });
 
                     BenchmarkInfo info {
-                        CATCH_MOVE(name),
+                        name,
                         plan.estimated_duration.count(),
                         plan.iterations_per_sample,
                         cfg->benchmarkSamples(),
@@ -83,10 +79,10 @@ namespace Catch {
                         return plan.template run<Clock>(*cfg, env);
                     });
 
-                    auto analysis = Detail::analyse(*cfg, samples.data(), samples.data() + samples.size());
-                    BenchmarkStats<> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
+                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
                     getResultCapture().benchmarkEnded(stats);
-                } CATCH_CATCH_ANON (TestFailureException const&) {
+                } CATCH_CATCH_ANON (TestFailureException) {
                     getResultCapture().benchmarkFailed("Benchmark failed due to failed assertion"_sr);
                 } CATCH_CATCH_ALL{
                     getResultCapture().benchmarkFailed(translateActiveException());

src/catch2/benchmark/catch_benchmark_all.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -33,8 +33,6 @@
 #include <catch2/benchmark/catch_sample_analysis.hpp>
 #include <catch2/benchmark/detail/catch_analyse.hpp>
 #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
-#include <catch2/benchmark/detail/catch_benchmark_stats.hpp>
-#include <catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp>
 #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/benchmark/detail/catch_estimate_clock.hpp>
 #include <catch2/benchmark/detail/catch_measure.hpp>

src/catch2/benchmark/catch_chronometer.cpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/catch_chronometer.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -12,6 +12,7 @@
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_optimizer.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/internal/catch_meta.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
@@ -32,10 +33,7 @@ namespace Catch {
                 void start() override { started = Clock::now(); }
                 void finish() override { finished = Clock::now(); }
 
-                IDuration elapsed() const {
-                    return std::chrono::duration_cast<std::chrono::nanoseconds>(
-                        finished - started );
-                }
+                ClockDuration<Clock> elapsed() const { return finished - started; }
 
                 TimePoint<Clock> started;
                 TimePoint<Clock> finished;

src/catch2/benchmark/catch_clock.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -11,16 +11,28 @@
 #define CATCH_CLOCK_HPP_INCLUDED
 
 #include <chrono>
+#include <ratio>
 
 namespace Catch {
     namespace Benchmark {
-        using IDuration = std::chrono::nanoseconds;
-        using FDuration = std::chrono::duration<double, std::nano>;
+        template <typename Clock>
+        using ClockDuration = typename Clock::duration;
+        template <typename Clock>
+        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
 
         template <typename Clock>
         using TimePoint = typename Clock::time_point;
 
         using default_clock = std::chrono::steady_clock;
+
+        template <typename Clock>
+        struct now {
+            TimePoint<Clock> operator()() const {
+                return Clock::now();
+            }
+        };
+
+        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
     } // namespace Benchmark
 } // namespace Catch
 

src/catch2/benchmark/catch_constructor.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -54,18 +54,14 @@ namespace Catch {
                 template <typename U>
                 void destruct_on_exit(std::enable_if_t<!Destruct, U>* = nullptr) { }
 
-#if defined( __GNUC__ ) && __GNUC__ <= 6
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-                T& stored_object() { return *reinterpret_cast<T*>( data ); }
+                T& stored_object() {
+                    return *static_cast<T*>(static_cast<void*>(data));
+                }
 
                 T const& stored_object() const {
-                    return *reinterpret_cast<T const*>( data );
+                    return *static_cast<T const*>(static_cast<void const*>(data));
                 }
-#if defined( __GNUC__ ) && __GNUC__ <= 6
-#    pragma GCC diagnostic pop
-#endif
+
 
                 alignas( T ) unsigned char data[sizeof( T )]{};
             };

src/catch2/benchmark/catch_environment.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -15,13 +15,21 @@
 
 namespace Catch {
     namespace Benchmark {
+        template <typename Duration>
         struct EnvironmentEstimate {
-            FDuration mean;
+            Duration mean;
             OutlierClassification outliers;
+
+            template <typename Duration2>
+            operator EnvironmentEstimate<Duration2>() const {
+                return { mean, outliers };
+            }
         };
+        template <typename Clock>
         struct Environment {
-            EnvironmentEstimate clock_resolution;
-            EnvironmentEstimate clock_cost;
+            using clock_type = Clock;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
         };
     } // namespace Benchmark
 } // namespace Catch

src/catch2/benchmark/catch_estimate.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -12,12 +12,17 @@
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Type>
+        template <typename Duration>
         struct Estimate {
-            Type point;
-            Type lower_bound;
-            Type upper_bound;
+            Duration point;
+            Duration lower_bound;
+            Duration upper_bound;
             double confidence_interval;
+
+            template <typename Duration2>
+            operator Estimate<Duration2>() const {
+                return { point, lower_bound, upper_bound, confidence_interval };
+            }
         };
     } // namespace Benchmark
 } // namespace Catch

src/catch2/benchmark/catch_execution_plan.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -17,38 +17,38 @@
 #include <catch2/benchmark/detail/catch_repeat.hpp>
 #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
 
-#include <vector>
+#include <algorithm>
+#include <iterator>
 
 namespace Catch {
     namespace Benchmark {
+        template <typename Duration>
         struct ExecutionPlan {
             int iterations_per_sample;
-            FDuration estimated_duration;
+            Duration estimated_duration;
             Detail::BenchmarkFunction benchmark;
-            FDuration warmup_time;
+            Duration warmup_time;
             int warmup_iterations;
 
-            template <typename Clock>
-            std::vector<FDuration> run(const IConfig &cfg, Environment env) const {
-                // warmup a bit
-                Detail::run_for_at_least<Clock>(
-                    std::chrono::duration_cast<IDuration>( warmup_time ),
-                    warmup_iterations,
-                    Detail::repeat( []() { return Clock::now(); } )
-                );
+            template <typename Duration2>
+            operator ExecutionPlan<Duration2>() const {
+                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
+            }
 
-                std::vector<FDuration> times;
-                const auto num_samples = cfg.benchmarkSamples();
-                times.reserve( num_samples );
-                for ( size_t i = 0; i < num_samples; ++i ) {
+            template <typename Clock>
+            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                // warmup a bit
+                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
+
+                std::vector<FloatDuration<Clock>> times;
+                times.reserve(cfg.benchmarkSamples());
+                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
                     Detail::ChronometerModel<Clock> model;
-                    this->benchmark( Chronometer( model, iterations_per_sample ) );
+                    this->benchmark(Chronometer(model, iterations_per_sample));
                     auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if ( sample_time < FDuration::zero() ) {
-                        sample_time = FDuration::zero();
-                    }
-                    times.push_back(sample_time / iterations_per_sample);
-                }
+                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
+                    return sample_time / iterations_per_sample;
+                });
                 return times;
             }
         };