Fix broken CI due to meta package name misalignment

GitHub Action is sunsetting the macOS 10.15 Actions runner. It will stop working intermittently until being completely removed by 2022-8-30: https://github.blog/changelog/2022-07-20-github-actions-the-macos-10-15-actions-runner-image-is-being-deprecated-and-will-be-removed-by-8-30-22

.appveyor.yml

@@ -0,0 +1,98 @@
+# Copyright 2016, 2017 Peter Dimov
+# Copyright 2017 - 2019 James E. King III
+# Copyright 2019 - 2021 Alexander Grund
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+#
+# Generic Appveyor build script for boostorg repositories
+# See: https://github.com/boostorg/boost-ci/
+#
+# Instructions for customizing this script for your library:
+#
+# 1. Customize the compilers and language levels you want.
+# 2. If you have more than include/, src/, test/, example/, examples/,
+#    benchmark/ or tools/ directories, set the environment variable DEPINST.
+#    For example if your build uses code in "bench/" and "fog/" directories:
+#      - DEPINST: --include bench --include fog
+# 3. Enable pull request builds in your boostorg/<library> account.
+#
+# That's it - the script will do everything else for you.
+#
+
+version: 1.0.{build}-{branch}
+
+shallow_clone: true
+
+branches:
+  only:
+    - master
+    - develop
+    - /bugfix\/.*/
+    - /feature\/.*/
+    - /fix\/.*/
+    - /pr\/.*/
+
+skip_commits:
+  files:
+    - LICENSE
+    - meta/*
+    - README.md
+
+matrix:
+  fast_finish: false
+  # Adding MAYFAIL to any matrix job allows it to fail but the build stays green:
+  allow_failures:
+    - MAYFAIL: true
+
+environment:
+  global:
+    SELF: logic
+    B2_CI_VERSION: 1
+    GIT_FETCH_JOBS: 4
+    # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
+    # to use the default for a given environment, comment it out; recommend you build debug and release however:
+    # on Windows it is important to exercise all the possibilities, especially shared vs static, however most
+    # libraries that care about this exercise it in their Jamfiles...
+    B2_ADDRESS_MODEL: 32,64
+    B2_LINK: shared,static
+    # B2_THREADING: threading=multi,single
+    B2_VARIANT: release
+
+  matrix:
+    - FLAVOR: Visual Studio 2017 C++2a Strict
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      B2_CXXFLAGS: -permissive-
+      B2_CXXSTD: 2a
+      B2_TOOLSET: msvc-14.1
+
+    - FLAVOR: Visual Studio 2017 C++14/17
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      B2_CXXSTD: 14,17
+      B2_TOOLSET: msvc-14.1
+
+    - FLAVOR: cygwin (32-bit)
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ADDPATH: C:\cygwin\bin;
+      B2_ADDRESS_MODEL: 32
+      B2_CXXSTD: 03,11,14,1z
+      B2_TOOLSET: gcc
+
+    - FLAVOR: cygwin (64-bit)
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ADDPATH: C:\cygwin64\bin;
+      B2_ADDRESS_MODEL: 64
+      B2_CXXSTD: 03,11,14,1z
+      B2_TOOLSET: gcc
+
+install:
+  - git clone --depth 1 https://github.com/boostorg/boost-ci.git C:\boost-ci-cloned
+  # Copy ci folder if not testing Boost.CI
+  - if NOT "%APPVEYOR_PROJECT_NAME%" == "boost-ci" xcopy /s /e /q /i /y C:\boost-ci-cloned\ci .\ci
+  - rmdir /s /q C:\boost-ci-cloned
+  - ci\appveyor\install.bat
+
+build: off
+
+test_script: ci\build.bat
+

.codecov.yml

@@ -0,0 +1,31 @@
+# Copyright 2019 - 2021 Alexander Grund
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+#
+# Sample codecov configuration file. Edit as required
+
+codecov:
+  max_report_age: off
+  require_ci_to_pass: yes
+  notify:
+    # Increase this if you have multiple coverage collection jobs
+    after_n_builds: 2
+    wait_for_ci: yes
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+# Change how pull request comments look
+comment:
+  layout: "reach,diff,flags,files,footer"
+
+# Ignore specific files or folders. Glob patterns are supported.
+# See https://docs.codecov.com/docs/ignoring-paths
+ignore:
+  - libs/logic/test/
+  - test/

.github/workflows/ci.yml

@@ -0,0 +1,452 @@
+# Copyright 2020-2021 Peter Dimov
+# Copyright 2021 Andrey Semashev
+# Copyright 2021 Alexander Grund
+# Copyright 2022-2025 James E. King III
+#
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+---
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+      - bugfix/**
+      - feature/**
+      - fix/**
+      - pr/**
+    paths-ignore:
+      - LICENSE
+      - meta/**
+      - README.md
+
+concurrency:
+  group: ${{format('{0}:{1}', github.repository, github.ref)}}
+  cancel-in-progress: true
+
+env:
+  SELF: logic
+  GIT_FETCH_JOBS: 8
+  NET_RETRY_COUNT: 5
+  B2_CI_VERSION: 1
+  B2_VARIANT: debug,release
+  B2_LINK: shared,static
+  LCOV_BRANCH_COVERAGE: 1
+
+jobs:
+  posix:
+    defaults:
+      run:
+        shell: bash
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # Linux, gcc
+          - { compiler: gcc-4.8,   cxxstd: '03,11',          os: ubuntu-latest, container: 'ubuntu:16.04' }
+          - { compiler: gcc-4.9,   cxxstd: '03,11',          os: ubuntu-latest, container: 'ubuntu:16.04' }
+          - { compiler: gcc-5,     cxxstd: '03,11,14,1z',    os: ubuntu-latest, container: 'ubuntu:18.04' }
+          - { compiler: gcc-6,     cxxstd: '03,11,14,17',    os: ubuntu-latest, container: 'ubuntu:18.04' }
+          - { compiler: gcc-7,     cxxstd: '03,11,14,17',    os: ubuntu-20.04 }
+          - { compiler: gcc-8,     cxxstd: '03,11,14,17,2a', os: ubuntu-20.04 }
+          - { compiler: gcc-9,     cxxstd: '03,11,14,17,2a', os: ubuntu-20.04 }
+          - { compiler: gcc-10,    cxxstd: '03,11,14,17,20', os: ubuntu-22.04 }
+          - { compiler: gcc-11,    cxxstd: '03,11,14,17,20', os: ubuntu-22.04 }
+          - { compiler: gcc-12,    cxxstd: '03,11,14,17,20', os: ubuntu-22.04 }
+          - { compiler: gcc-13,    cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 }
+          - { compiler: gcc-14,    cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 }
+          - { name: GCC w/ sanitizers, sanitize: yes,
+              compiler: gcc-13,    cxxstd: '03,11,14,17,20', os: ubuntu-24.04 }
+          - { name: Collect coverage, coverage: yes,
+              compiler: gcc-13,    cxxstd: '03,2b',          os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '32,64' }
+
+          # Linux, clang
+          - { compiler: clang-3.5, cxxstd: '03,11',          os: ubuntu-latest, container: 'ubuntu:16.04' }
+          - { compiler: clang-3.6, cxxstd: '03,11,14',       os: ubuntu-latest, container: 'ubuntu:16.04' }
+          - { compiler: clang-3.7, cxxstd: '03,11,14',       os: ubuntu-latest, container: 'ubuntu:16.04' }
+          - { compiler: clang-3.8, cxxstd: '03,11,14',       os: ubuntu-latest, container: 'ubuntu:16.04' }
+          - { compiler: clang-3.9, cxxstd: '03,11,14',       os: ubuntu-latest, container: 'ubuntu:18.04' }
+          - { compiler: clang-4.0, cxxstd: '03,11,14',       os: ubuntu-latest, container: 'ubuntu:18.04' }
+          - { compiler: clang-5.0, cxxstd: '03,11,14,1z',    os: ubuntu-latest, container: 'ubuntu:18.04' }
+          - { compiler: clang-6.0, cxxstd: '03,11,14,17',    os: ubuntu-20.04 }
+          - { compiler: clang-7,   cxxstd: '03,11,14,17',    os: ubuntu-20.04 }
+          # Note: clang-8 does not fully support C++20, so it is not compatible with some libstdc++ versions in this mode
+          - { compiler: clang-8,   cxxstd: '03,11,14,17,2a', os: ubuntu-20.04 , install: 'clang-8 g++-7', gcc_toolchain: 7 }
+          - { compiler: clang-9,   cxxstd: '03,11,14,17,2a', os: ubuntu-20.04 }
+          - { compiler: clang-10,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
+          - { compiler: clang-11,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
+          - { compiler: clang-12,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
+          # Clang isn't compatible with libstdc++-13, so use the slightly older one
+          - { compiler: clang-13,  cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'clang-13 g++-12', gcc_toolchain: 12 }
+          - { compiler: clang-14,  cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'clang-14 g++-12', gcc_toolchain: 12 }
+          - { compiler: clang-15,  cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'clang-15 g++-12', gcc_toolchain: 12 }
+          - { compiler: clang-16,  cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 }
+          # https://github.com/llvm/llvm-project/issues/59827: disabled 2b/23 for clang-17 with libstdc++13 in 24.04
+          - { compiler: clang-17,  cxxstd: '11,14,17,20',    os: ubuntu-24.04 }
+          - { compiler: clang-18,  cxxstd: '11,14,17,20,23,2c', os: ubuntu-24.04 }
+
+          # libc++
+          - { compiler: clang-6.0, cxxstd: '03,11,14',       os: ubuntu-latest, container: 'ubuntu:18.04', stdlib: libc++, install: 'clang-6.0 libc++-dev libc++abi-dev' }
+          - { compiler: clang-7,   cxxstd: '03,11,14,17',    os: ubuntu-20.04, stdlib: libc++, install: 'clang-7 libc++-7-dev libc++abi-7-dev' }
+          - { name: Clang w/ sanitizers, sanitize: yes,
+              compiler: clang-12,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04, stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev' }
+
+          - { name: MacOS w/ clang and sanitizers,
+              compiler: clang,     cxxstd: '03,11,14,17,20,2b', os: macos-13, sanitize: yes }
+          - { compiler: clang,     cxxstd: '03,11,14,17,20,2b', os: macos-14 }
+          - { compiler: clang,     cxxstd: '03,11,14,17,20,2b', os: macos-15 }
+
+          # Coverity Scan
+          # requires two github secrets in repo to activate; see ci/github/coverity.sh
+          # does not run on pull requests, only on pushes into develop and master
+          - { name: Coverity, coverity: yes,
+              compiler: clang-12,  cxxstd: '03,20',          os: ubuntu-20.04, ccache: no }
+
+          # multiarch (bigendian testing) - does not support coverage yet
+          - { name: Big-endian, multiarch: yes,
+              compiler: clang,     cxxstd: '17',             os: ubuntu-22.04, ccache: no, distro: fedora, edition: 34, arch: s390x }
+
+
+    timeout-minutes: 120
+    runs-on: ${{matrix.os}}
+    container:
+      image: ${{matrix.container}}
+      volumes:
+        - /node20217:/node20217:rw,rshared
+        - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
+    env: {B2_USE_CCACHE: 1}
+
+    steps:
+      - name: Setup environment
+        run: |
+            if [ -f "/etc/debian_version" ]; then
+                echo "DEBIAN_FRONTEND=noninteractive" >> $GITHUB_ENV
+                export DEBIAN_FRONTEND=noninteractive
+            fi
+            if [ -n "${{matrix.container}}" ] && [ -f "/etc/debian_version" ]; then
+                apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
+                apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common curl
+                # Need (newer) git, and the older Ubuntu container may require requesting the key manually using port 80
+                curl -sSL --retry ${NET_RETRY_COUNT:-5} 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE1DD270288B4E6030699E45FA1715D88E1DF1F24' | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/git-core_ubuntu_ppa.gpg
+                for i in {1..${NET_RETRY_COUNT:-3}}; do sudo -E add-apt-repository -y ppa:git-core/ppa && break || sleep 10; done
+                apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
+                osver=$(lsb_release -sr | cut -f1 -d.)
+                pkgs="g++ git xz-utils"
+                # Ubuntu 22+ has only Python 3 in the repos
+                if [ -n "$osver" ] && [ "$osver" -ge "22" ]; then
+                  pkgs+=" python-is-python3 libpython3-dev"
+                else
+                  pkgs+=" python libpython-dev"
+                fi
+                apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y $pkgs
+            fi
+            # For jobs not compatible with ccache, use "ccache: no" in the matrix
+            if [[ "${{ matrix.ccache }}" == "no" ]]; then
+                echo "B2_USE_CCACHE=0" >> $GITHUB_ENV
+            fi
+            git config --global pack.threads 0
+            if [[ "${{matrix.container}}" == "ubuntu:1"* ]]; then
+              # Node 20 doesn't work with Ubuntu 16/18  glibc: https://github.com/actions/checkout/issues/1590
+              curl -sL https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz | tar -xJ --strip-components 1 -C /node20217
+            fi
+
+      - uses: actions/checkout@v4
+        with:
+          # For coverage builds fetch the whole history, else only 1 commit using a 'fake ternary'
+          fetch-depth: ${{ matrix.coverage && '0' || '1' }}
+
+      - name: Cache ccache
+        uses: actions/cache@v4
+        if: env.B2_USE_CCACHE
+        with:
+          path: ~/.ccache
+          key: ${{matrix.os}}-${{matrix.container}}-${{matrix.compiler}}-${{github.sha}}
+          restore-keys: ${{matrix.os}}-${{matrix.container}}-${{matrix.compiler}}-
+
+      - name: Fetch Boost.CI
+        uses: actions/checkout@v4
+        with:
+          repository: boostorg/boost-ci
+          ref: master
+          path: boost-ci-cloned
+
+      - name: Get CI scripts folder
+        run: |
+            # Copy ci folder if not testing Boost.CI
+            [[ "$GITHUB_REPOSITORY" =~ "boost-ci" ]] || cp -r boost-ci-cloned/ci .
+            rm -rf boost-ci-cloned
+
+      - name: Install packages
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+            SOURCE_KEYS=("${{join(matrix.source_keys, '" "')}}")
+            SOURCES=("${{join(matrix.sources, '" "')}}")
+            # Add this by default
+            SOURCE_KEYS+=('http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x1E9377A2BA9EF27F')
+            SOURCES+=(ppa:ubuntu-toolchain-r/test)
+
+            ci/add-apt-keys.sh "${SOURCE_KEYS[@]}"
+            # Initial update before adding sources required to get e.g. keys
+            sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
+            ci/add-apt-repositories.sh "${SOURCES[@]}"
+
+            sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
+            if [[ -z "${{matrix.install}}" ]]; then
+                pkgs="${{matrix.compiler}}"
+                pkgs="${pkgs/gcc-/g++-}"
+            else
+                pkgs="${{matrix.install}}"
+            fi
+            sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y $pkgs
+
+      - name: Setup GCC Toolchain
+        if: matrix.gcc_toolchain
+        run: |
+            GCC_TOOLCHAIN_ROOT="$HOME/gcc-toolchain"
+            echo "GCC_TOOLCHAIN_ROOT=$GCC_TOOLCHAIN_ROOT" >> $GITHUB_ENV
+            if ! command -v dpkg-architecture; then
+                apt-get install -y dpkg-dev
+            fi
+            MULTIARCH_TRIPLET="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+            mkdir -p "$GCC_TOOLCHAIN_ROOT"
+            ln -s /usr/include "$GCC_TOOLCHAIN_ROOT/include"
+            ln -s /usr/bin "$GCC_TOOLCHAIN_ROOT/bin"
+            mkdir -p "$GCC_TOOLCHAIN_ROOT/lib/gcc/$MULTIARCH_TRIPLET"
+            ln -s "/usr/lib/gcc/$MULTIARCH_TRIPLET/${{matrix.gcc_toolchain}}" "$GCC_TOOLCHAIN_ROOT/lib/gcc/$MULTIARCH_TRIPLET/${{matrix.gcc_toolchain}}"
+
+      - name: Setup multiarch
+        if: matrix.multiarch
+        env:
+          BDDE_DISTRO: ${{matrix.distro}}
+          BDDE_EDITION: ${{matrix.edition}}
+          BDDE_ARCH: ${{matrix.arch}}
+        run: ci/github/setup_bdde.sh
+
+      - name: Setup Boost
+        env:
+          B2_ADDRESS_MODEL: ${{matrix.address-model}}
+          B2_COMPILER: ${{matrix.compiler}}
+          B2_CXXSTD: ${{matrix.cxxstd}}
+          B2_SANITIZE: ${{matrix.sanitize}}
+          B2_STDLIB: ${{matrix.stdlib}}
+          # More entries can be added in the same way, see the B2_ARGS assignment in ci/enforce.sh for the possible keys.
+          # B2_DEFINES: ${{matrix.defines}}
+          # Variables set here (to non-empty) will override the top-level environment variables, e.g.
+          # B2_VARIANT: ${{matrix.variant}}
+          # Set the (B2) target(s) to build, defaults to the test folder of the current library
+          # Can alternatively be done like this in the build step or in the build command of the build step, e.g. `run: B2_TARGETS=libs/$SELF/doc ci/build.sh`
+          # B2_TARGETS: libs/foo/test//bar
+        run: source ci/github/install.sh
+
+      - name: Setup coverage collection
+        if: matrix.coverage
+        run: ci/github/codecov.sh "setup"
+
+      - name: Run tests
+        if: '!matrix.coverity'
+        run: ci/build.sh
+
+      - name: Upload coverage
+        if: matrix.coverage
+        run: ci/codecov.sh "upload"
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Run coverity
+        if: matrix.coverity && github.event_name == 'push' && (github.ref_name == 'develop' || github.ref_name == 'master')
+        run: ci/github/coverity.sh
+        env:
+          COVERITY_SCAN_NOTIFICATION_EMAIL: ${{ secrets.COVERITY_SCAN_NOTIFICATION_EMAIL }}
+          COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+
+  windows:
+    defaults:
+      run:
+        shell: cmd
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { toolset: msvc-14.0, cxxstd: '14,latest',      addrmd: '32,64', os: windows-2019 }
+          - { toolset: msvc-14.2, cxxstd: '14,17,20',       addrmd: '32,64', os: windows-2019 }
+          - { toolset: msvc-14.3, cxxstd: '14,17,20,latest',addrmd: '32,64', os: windows-2022 }
+          - { name: Collect coverage, coverage: yes,
+              toolset: msvc-14.3, cxxstd: 'latest',         addrmd: '64',    os: windows-2022 }
+          - { toolset: clang-win, cxxstd: '14,17,latest',   addrmd: '32,64', os: windows-2022 }
+          - { toolset: gcc,       cxxstd: '03,11,14,17,2a', addrmd: '64',    os: windows-2019 }
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Fetch Boost.CI
+        uses: actions/checkout@v4
+        with:
+          repository: boostorg/boost-ci
+          ref: master
+          path: boost-ci-cloned
+      - name: Get CI scripts folder
+        run: |
+            REM Copy ci folder if not testing Boost.CI
+            if "%GITHUB_REPOSITORY%" == "%GITHUB_REPOSITORY:boost-ci=%" xcopy /s /e /q /i /y boost-ci-cloned\ci .\ci
+            rmdir /s /q boost-ci-cloned
+
+      - name: Setup Boost
+        run: ci\github\install.bat
+
+      - name: Run tests
+        if: '!matrix.coverage'
+        run: ci\build.bat
+        env:
+          B2_TOOLSET: ${{matrix.toolset}}
+          B2_CXXSTD: ${{matrix.cxxstd}}
+          B2_ADDRESS_MODEL: ${{matrix.addrmd}}
+
+      - name: Collect coverage
+        shell: powershell
+        if: matrix.coverage
+        run: ci\opencppcoverage.ps1
+        env:
+          B2_TOOLSET: ${{matrix.toolset}}
+          B2_CXXSTD: ${{matrix.cxxstd}}
+          B2_ADDRESS_MODEL: ${{matrix.addrmd}}
+
+      - name: Upload coverage
+        if: matrix.coverage
+        uses: codecov/codecov-action@v5
+        with:
+          disable_search: true
+          fail_ci_if_error: true
+          files: __out/cobertura.xml
+          name: github-actions
+          token: ${{secrets.CODECOV_TOKEN}}
+          verbose: true
+
+  MSYS2:
+    defaults:
+      run:
+        shell: msys2 {0}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { sys: MINGW32, compiler: gcc, cxxstd: '03,11,17,20' }
+          - { sys: MINGW64, compiler: gcc, cxxstd: '03,11,17,20' }
+
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup MSYS2 environment
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{matrix.sys}}
+          update: true
+          install: git python
+          pacboy: gcc:p cmake:p ninja:p
+
+      - name: Fetch Boost.CI
+        uses: actions/checkout@v4
+        with:
+          repository: boostorg/boost-ci
+          ref: master
+          path: boost-ci-cloned
+      - name: Get CI scripts folder
+        run: |
+            # Copy ci folder if not testing Boost.CI
+            [[ "$GITHUB_REPOSITORY" =~ "boost-ci" ]] || cp -r boost-ci-cloned/ci .
+            rm -rf boost-ci-cloned
+
+      - name: Setup Boost
+        env:
+          B2_COMPILER: ${{matrix.compiler}}
+          B2_CXXSTD: ${{matrix.cxxstd}}
+          B2_SANITIZE: ${{matrix.sanitize}}
+          B2_STDLIB: ${{matrix.stdlib}}
+        run: ci/github/install.sh
+
+      - name: Run tests
+        run: ci/build.sh
+
+      # Run also the CMake tests to avoid having to setup another matrix for CMake on MSYS
+      - name: Run CMake tests
+        run: |
+            cd "$BOOST_ROOT"
+            mkdir __build_cmake_test__ && cd __build_cmake_test__
+            cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBOOST_INCLUDE_LIBRARIES=$SELF -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON -DBoost_VERBOSE=ON ..
+            cmake --build . --target tests --config Debug -j$B2_JOBS
+            ctest --output-on-failure --build-config Debug
+
+  CMake:
+    defaults:
+      run:
+        shell: bash
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { os: ubuntu-20.04, build_shared: ON,  build_type: Debug, generator: 'Unix Makefiles' }
+          - { os: ubuntu-20.04, build_shared: OFF, build_type: Debug, generator: 'Unix Makefiles' }
+          - { os: windows-2019, build_shared: ON,  build_type: Debug, generator: 'Visual Studio 16 2019' }
+          - { os: windows-2019, build_shared: OFF, build_type: Debug, generator: 'Visual Studio 16 2019' }
+
+    timeout-minutes: 120
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Fetch Boost.CI
+        uses: actions/checkout@v4
+        with:
+          repository: boostorg/boost-ci
+          ref: master
+          path: boost-ci-cloned
+      - name: Get CI scripts folder
+        run: |
+            # Copy ci folder if not testing Boost.CI
+            [[ "$GITHUB_REPOSITORY" =~ "boost-ci" ]] || cp -r boost-ci-cloned/ci .
+            rm -rf boost-ci-cloned
+      - name: Setup Boost
+        env: {B2_DONT_BOOTSTRAP: 1}
+        run: source ci/github/install.sh
+
+      - name: Run CMake tests
+        run: |
+            cd "$BOOST_ROOT"
+            mkdir __build_cmake_test__ && cd __build_cmake_test__
+            cmake -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBOOST_INCLUDE_LIBRARIES=$SELF -DBUILD_SHARED_LIBS=${{matrix.build_shared}} -DBUILD_TESTING=ON -DBoost_VERBOSE=ON ..
+            cmake --build . --target tests --config ${{matrix.build_type}} -j$B2_JOBS
+            ctest --output-on-failure --build-config ${{matrix.build_type}}
+
+      - name: Run CMake subdir tests
+        run: |
+            cmake_test_folder="$BOOST_ROOT/libs/$SELF/test/cmake_test" # New unified folder
+            [ -d "$cmake_test_folder" ] || cmake_test_folder="$BOOST_ROOT/libs/$SELF/test/cmake_subdir_test"
+            cd "$cmake_test_folder"
+            mkdir __build_cmake_subdir_test__ && cd __build_cmake_subdir_test__
+            cmake -G "${{matrix.generator}}" -DBOOST_CI_INSTALL_TEST=OFF -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.build_shared}} ..
+            cmake --build . --config ${{matrix.build_type}} -j$B2_JOBS
+            ctest --output-on-failure --build-config ${{matrix.build_type}}
+
+      - name: Install Library
+        run: |
+            cd "$BOOST_ROOT"
+            mkdir __build_cmake_install_test__ && cd __build_cmake_install_test__
+            cmake -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBOOST_INCLUDE_LIBRARIES=$SELF -DBUILD_SHARED_LIBS=${{matrix.build_shared}} -DCMAKE_INSTALL_PREFIX=~/.local -DBoost_VERBOSE=ON -DBoost_DEBUG=ON ..
+            cmake --build . --target install --config ${{matrix.build_type}} -j$B2_JOBS
+      - name: Run CMake install tests
+        run: |
+            cmake_test_folder="$BOOST_ROOT/libs/$SELF/test/cmake_test" # New unified folder
+            [ -d "$cmake_test_folder" ] || cmake_test_folder="$BOOST_ROOT/libs/$SELF/test/cmake_install_test"
+            cd "$cmake_test_folder"
+            mkdir __build_cmake_install_test__ && cd __build_cmake_install_test__
+            cmake -G "${{matrix.generator}}" -DBOOST_CI_INSTALL_TEST=ON -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.build_shared}} -DCMAKE_PREFIX_PATH=~/.local ..
+            cmake --build . --config ${{matrix.build_type}} -j$B2_JOBS
+            ctest --output-on-failure --build-config ${{matrix.build_type}}

CMakeLists.txt

@@ -1,12 +1,9 @@
 # Copyright 2018 Mike Dev
 # Distributed under the Boost Software License, Version 1.0.
 # See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
-#
-# NOTE: CMake support for Boost.Logic is currently experimental at best
-#       and the interface is likely to change in the future
 
-cmake_minimum_required( VERSION 3.5 )
-project( BoostLogic LANGUAGES CXX )
+cmake_minimum_required( VERSION 3.5...3.20 )
+project( boost_logic VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX )
 
 add_library( boost_logic INTERFACE )
 add_library( Boost::logic ALIAS boost_logic )

Jamfile

@@ -1,10 +0,0 @@
-#  Boost.Logic Library Jamfile
-#
-#  Copyright (c) 2018 James E. King III
-#
-#  Use, modification, and distribution are subject to the
-#  Boost Software License, Version 1.0. (See accompanying file
-#  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-# please order by name to ease maintenance
-build-project test ;

README.md

@@ -1,8 +1,8 @@
-Logic, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), provides `boost::logic::tribool` for 3-state boolean logic.
+Logic, part of collection of the [Boost C++ Libraries](https://github.com/boostorg), provides `boost::logic::tribool` for 3-state boolean logic.
 
 ### License
 
-Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
+Distributed under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt).
 
 ### Properties
 
@@ -11,10 +11,11 @@ Distributed under the [Boost Software License, Version 1.0](http://www.boost.org
 
 ### Build Status
 
-Branch          | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
-:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- |
-[`master`](https://github.com/boostorg/logic/tree/master) | [![Build Status](https://travis-ci.org/boostorg/logic.svg?branch=master)](https://travis-ci.org/boostorg/logic) | [![Build status](https://ci.appveyor.com/api/projects/status/a898pj8spmo2t3x9/branch/master?svg=true)](https://ci.appveyor.com/project/jeking3/logic-vv3ct/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/16173/badge.svg)](https://scan.coverity.com/projects/boostorg-logic) | [![codecov](https://codecov.io/gh/boostorg/logic/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/logic/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/logic.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/logic.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/logic.html)
-[`develop`](https://github.com/boostorg/logic/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/logic.svg?branch=develop)](https://travis-ci.org/boostorg/logic) | [![Build status](https://ci.appveyor.com/api/projects/status/a898pj8spmo2t3x9/branch/develop?svg=true)](https://ci.appveyor.com/project/jeking3/logic-vv3ct/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/16173/badge.svg)](https://scan.coverity.com/projects/boostorg-logic) | [![codecov](https://codecov.io/gh/boostorg/logic/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/logic/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/logic.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/logic.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/logic.html)
+<!-- boost-ci/tools/makebadges.sh --project logic --appveyor 8mtghg32sqgc2syg --codecov 2RCqoPxHln --coverity 16173 -->
+| Branch          | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
+| :-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- |
+| [`master`](https://github.com/boostorg/logic/tree/master) | [![Build Status](https://github.com/boostorg/logic/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/logic/actions?query=branch:master) | [![Build status](https://ci.appveyor.com/api/projects/status/8mtghg32sqgc2syg/branch/master?svg=true)](https://ci.appveyor.com/project/cppalliance/logic/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/16173/badge.svg)](https://scan.coverity.com/projects/boostorg-logic) | [![codecov](https://codecov.io/gh/boostorg/logic/branch/master/graph/badge.svg?token=2RCqoPxHln)](https://codecov.io/gh/boostorg/logic/tree/master) | [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/logic.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/logic) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://www.boost.org/development/tests/master/developer/logic.html)
+| [`develop`](https://github.com/boostorg/logic/tree/develop) | [![Build Status](https://github.com/boostorg/logic/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/logic/actions?query=branch:develop) | [![Build status](https://ci.appveyor.com/api/projects/status/8mtghg32sqgc2syg/branch/develop?svg=true)](https://ci.appveyor.com/project/cppalliance/logic/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/16173/badge.svg)](https://scan.coverity.com/projects/boostorg-logic) | [![codecov](https://codecov.io/gh/boostorg/logic/branch/develop/graph/badge.svg?token=2RCqoPxHln)](https://codecov.io/gh/boostorg/logic/tree/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/logic.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/logic) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://www.boost.org/development/tests/develop/developer/logic.html)
 
 ### Directories
 
@@ -27,8 +28,7 @@ Branch          | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs |
 
 ### More information
 
-* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-logic)
+* [Ask questions](https://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-logic)
 * [Report bugs](https://github.com/boostorg/logic/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well.
-* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
-* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[logic]` tag at the beginning of the subject line.
-
+* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt).
+* Discussions about the library are held on the [Boost developers mailing list](https://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](https://www.boost.org/community/policy.html) before posting and add the `[logic]` tag at the beginning of the subject line.

appveyor.yml

@@ -1,149 +0,0 @@
-# Copyright 2016, 2017 Peter Dimov
-# Copyright (C) 2017 - 2019 James E. King III
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
-
-#
-# Generic Appveyor build script for boostorg repositories
-# See: https://github.com/boostorg/boost-ci/
-#
-# Instructions for customizing this script for your library:
-#
-# 1. Customize the compilers and language levels you want.
-# 2. If you have more than include/, src/, test/, example/, examples/,
-#    benchmark/ or tools/ directories, set the environment variable DEPINST.
-#    For example if your build uses code in "bench/" and "fog/" directories:
-#      - DEPINST: --include bench --include fog
-# 3. Enable pull request builds in your boostorg/<library> account.
-#
-# That's it - the script will do everything else for you.
-#
-
-version: 1.0.{build}-{branch}
-
-shallow_clone: true
-
-branches:
-  only:
-    - master
-    - develop
-    - /bugfix\/.*/
-    - /feature\/.*/
-    - /fix\/.*/
-    - /pr\/.*/
-
-matrix:
-  # Adding MAYFAIL to any matrix job allows it to fail but the build stays green:
-  allow_failures:
-    - MAYFAIL: true
-
-environment:
-  global:
-    # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
-    # to use the default for a given environment, comment it out; recommend you build debug and release however:
-    # on Windows it is important to exercise all the possibilities, especially shared vs static, however most
-    # libraries that care about this exercise it in their Jamfiles...
-    # B2_ADDRESS_MODEL: address-model=64,32
-    # B2_LINK: link=shared,static
-    # B2_THREADING: threading=multi,single
-    B2_VARIANT: variant=release
-
-  matrix:
-    - FLAVOR: Visual Studio 2019
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXFLAGS: cxxflags=-permissive-
-      B2_CXXSTD: latest # 2a
-      B2_TOOLSET: msvc-14.2
-
-    - FLAVOR: Visual Studio 2017 C++2a Strict
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXFLAGS: cxxflags=-permissive-
-      B2_CXXSTD: latest # 2a
-      B2_TOOLSET: msvc-14.1
-
-    - FLAVOR: Visual Studio 2017 C++17
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 17
-      B2_TOOLSET: msvc-14.1
-      B2_VARIANT: variant=debug
-
-    - FLAVOR: Visual Studio 2017 C++14 (Default)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64,32
-      B2_TOOLSET: msvc-14.1
-
-    - FLAVOR: clang-cl
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 11
-      B2_TOOLSET: clang-win
-
-    - FLAVOR: Visual Studio 2015 C++14 (Default)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_ADDRESS_MODEL: address-model=64,32
-      B2_TOOLSET: msvc-14.0
-      B2_VARIANT: variant=debug
-
-    - FLAVOR: Visual Studio 2010, 2012, 2013
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_TOOLSET: msvc-10.0,msvc-11.0,msvc-12.0
-      MAYFAIL: true
-      REASON: https://github.com/boostorg/logic/issues/8
-
-    - FLAVOR: cygwin (32-bit)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ADDPATH: C:\cygwin\bin;
-      B2_ADDRESS_MODEL: address-model=32
-      B2_CXXSTD: 03,11
-      # https://github.com/boostorg/test/issues/144
-      B2_DEFINES: define=_POSIX_C_SOURCE=200112L
-      B2_THREADING: threadapi=pthread
-      B2_TOOLSET: gcc
-      B2_VARIANT: variant=debug
-
-    - FLAVOR: cygwin (64-bit)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ADDPATH: C:\cygwin64\bin;
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 11,17
-      # https://github.com/boostorg/test/issues/144
-      B2_DEFINES: define=_POSIX_C_SOURCE=200112L define=__USE_ISOC99
-      B2_THREADING: threadapi=pthread
-      B2_TOOLSET: gcc
-
-    - FLAVOR: mingw32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: i686
-      B2_ADDRESS_MODEL: address-model=32
-      B2_CXXSTD: 03,11
-      SCRIPT: ci\appveyor\mingw.bat
-      B2_VARIANT: variant=debug
-
-    - FLAVOR: mingw64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: x86_64
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 11,17
-      B2_DEFINES: define=__USE_ISOC99
-      SCRIPT: ci\appveyor\mingw.bat
-
-install:
-  - set SELF=%APPVEYOR_PROJECT_NAME:-=_%
-  - git clone https://github.com/boostorg/boost-ci.git C:\boost-ci
-  - xcopy /s /e /q /i C:\boost-ci\ci .\ci
-  - ci\appveyor\install.bat
-
-build: off
-
-test_script:
-  - set SELF=%APPVEYOR_PROJECT_NAME:-=_%
-  - PATH=%ADDPATH%%PATH%
-  # The definition of B2_TOOLCXX omits B2_CXXSTD= if it was not defined above
-  - IF NOT DEFINED B2_CXXSTD (SET B2_TOOLCXX=toolset=%B2_TOOLSET%) ELSE (SET B2_TOOLCXX=toolset=%B2_TOOLSET% cxxstd=%B2_CXXSTD%)
-  # Echo the complete build command to the build log
-  - IF NOT DEFINED SCRIPT                         (ECHO b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
-  # Now go build...
-  - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)

build.jam

@@ -0,0 +1,24 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/config//boost_config
+    /boost/core//boost_core ;
+
+project /boost/logic
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_logic : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_logic test ]
+    ;
+
+call-if : boost-library logic
+    ;
+

doc/Jamfile.v2

@@ -12,13 +12,13 @@ project boost-sandbox/utility/doc ;
 import boostbook ;
 import doxygen ;
 
-doxygen reference : [ glob ../../../boost/logic/tribool.hpp ]
-                    [ glob ../../../boost/logic/tribool_fwd.hpp ]
-                    [ glob ../../../boost/logic/tribool_io.hpp ]
+doxygen reference : [ glob ../include/boost/logic/tribool.hpp ]
+                    [ glob ../include/boost/logic/tribool_fwd.hpp ]
+                    [ glob ../include/boost/logic/tribool_io.hpp ]
                   ;
-boostbook tribool 
-    : 
-    tribool.boostbook 
+boostbook tribool
+    :
+    tribool.boostbook
     :
         <xsl:param>boost.root=../../../..
         <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html

include/boost/logic/tribool.hpp

@@ -30,7 +30,7 @@ namespace detail {
  */
 struct indeterminate_t
 {
-#if BOOST_WORKAROUND(__BORLANDC__, < 0x0600)
+#if BOOST_WORKAROUND(BOOST_BORLANDC, < 0x0600)
   char dummy_; // BCB would use 8 bytes by default
 #endif
 };

meta/libraries.json

@@ -11,5 +11,6 @@
     ],
     "maintainers": [
         "Douglas Gregor <dgregor -at- cs.indiana.edu>"
-    ]
+    ],
+    "cxxstd": "03"
 }

test/Jamfile.v2

@@ -2,9 +2,9 @@
 
 # Copyright (C) 2002-2003 Douglas Gregor
 
-# Use, modification and distribution is subject to the Boost Software License, 
-# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at 
-# http://www.boost.org/LICENSE_1_0.txt) 
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
 
 # For more information, see http://www.boost.org/
 
@@ -13,13 +13,15 @@ import os ;
 import regex ;
 import testing ;
 
-local self = logic ;
+path-constant self : . ;
+
+project : requirements <library>/boost/logic//boost_logic ;
 
 rule test-expected-failures
 {
     local all_rules = ;
     local file ;
-    local tests_path = [ path.make $(BOOST_ROOT)/libs/$(self)/test/compile-fail ] ;
+    local tests_path = [ path.make $(self)/../test/compile-fail ] ;
     for file in [ path.glob-tree $(tests_path) : *.cpp ]
     {
         local rel_file = [ path.relative-to $(tests_path) $(file) ] ;
@@ -37,7 +39,7 @@ rule test-header-isolation
 {
     local all_rules = ;
     local file ;
-    local headers_path = [ path.make $(BOOST_ROOT)/libs/$(self)/include ] ;
+    local headers_path = [ path.make $(self)/../include ] ;
     for file in [ path.glob-tree $(headers_path) : *.hpp ]
     {
         local rel_file = [ path.relative-to $(headers_path) $(file) ] ;
@@ -53,7 +55,7 @@ rule test-header-isolation
     return $(all_rules) ;
 }
 
-  test-suite logic  : 
+  test-suite logic  :
     [ test-expected-failures ]
     [ test-header-isolation ]
     [ run tribool_test.cpp ]

test/cmake_test/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright 2021-2024 Alexander Grund
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_subdir_test LANGUAGES CXX)
+
+# Those 2 should work the same
+# while using find_package for the installed Boost avoids the need to manually specify dependencies
+if(BOOST_CI_INSTALL_TEST)
+    find_package(boost_logic REQUIRED)
+else()
+    set(BOOST_INCLUDE_LIBRARIES logic)
+    add_subdirectory(../../../.. deps/boost EXCLUDE_FROM_ALL)
+endif()
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::logic)
+
+enable_testing()
+add_test(NAME main COMMAND main)

test/cmake_test/main.cpp

@@ -0,0 +1,30 @@
+// Copyright Douglas Gregor 2002-2003. Use, modification and
+// distribution is subject to the Boost Software License, Version
+// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/logic/tribool.hpp>
+
+int main()
+{
+  using namespace boost::logic;
+
+  tribool x; // false
+  tribool y(true); // true
+  tribool z(indeterminate); // indeterminate
+
+#if defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS )
+  // c++03 allows for implicit conversion to bool
+  // c++11 uses an explicit conversion operator so this would not compile
+  //       and that is tested in the compile-fail/implicit.cpp file
+  // so we check the conversion to ensure it is sane
+  bool bx = x;
+  assert(bx == false);
+  bool by = y;
+  assert(by == true);
+  bool bz = z;
+  assert(bz == false);
+#endif
+
+  return 0;
+}

test/tribool_io_test.cpp

@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 #include <boost/logic/tribool.hpp>
 #include <boost/logic/tribool_io.hpp>
-#include <boost/test/minimal.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <sstream>
 #include <string>
 #include <iostream>
@@ -14,7 +14,7 @@
 #  include <locale>
 #endif
 
-int test_main(int, char*[])
+int main()
 {
   using namespace boost::logic;
 
@@ -23,13 +23,13 @@ int test_main(int, char*[])
   #if !defined(BOOST_NO_CWCHAR) && !defined(BOOST_NO_STD_WSTRING)
   std::wostringstream wout;
   wout << std::boolalpha << tribool(false);
-  BOOST_CHECK(wout.str() == L"false");
+  BOOST_TEST(wout.str() == L"false");
   wout.str(std::wstring());
   wout << std::boolalpha << tribool(true);
-  BOOST_CHECK(wout.str() == L"true");
+  BOOST_TEST(wout.str() == L"true");
   wout.str(std::wstring());
   wout << std::boolalpha << tribool(indeterminate);
-  BOOST_CHECK(wout.str() == L"indeterminate");
+  BOOST_TEST(wout.str() == L"indeterminate");
   #endif
 
   // Check tribool output
@@ -40,14 +40,14 @@ int test_main(int, char*[])
   x = false;
   out << x;
   std::cout << "Output false (noboolalpha): " << out.str() << std::endl;
-  BOOST_CHECK(out.str() == "0");
+  BOOST_TEST(out.str() == "0");
 
   // Output true (noboolalpha)
   out.str(std::string());
   x = true;
   out << x;
   std::cout << "Output true (noboolalpha): " << out.str() << std::endl;
-  BOOST_CHECK(out.str() == "1");
+  BOOST_TEST(out.str() == "1");
 
   // Output indeterminate (noboolalpha)
   out.str(std::string());
@@ -55,14 +55,14 @@ int test_main(int, char*[])
   out << x;
   std::cout << "Output indeterminate (noboolalpha): " << out.str()
             << std::endl;
-  BOOST_CHECK(out.str() == "2");
+  BOOST_TEST(out.str() == "2");
 
   // Output indeterminate (noboolalpha)
   out.str(std::string());
   out << indeterminate;
   std::cout << "Output indeterminate (noboolalpha): " << out.str()
             << std::endl;
-  BOOST_CHECK(out.str() == "2");
+  BOOST_TEST(out.str() == "2");
 
 #ifndef BOOST_NO_STD_LOCALE
   const std::numpunct<char>& punct =
@@ -73,7 +73,7 @@ int test_main(int, char*[])
   x = false;
   out << std::boolalpha << x;
   std::cout << "Output false (boolalpha): " << out.str() << std::endl;
-  BOOST_CHECK(out.str() == punct.falsename());
+  BOOST_TEST(out.str() == punct.falsename());
 
   // Output true (boolalpha)
   out.str(std::string());
@@ -81,7 +81,7 @@ int test_main(int, char*[])
   out << std::boolalpha << x;
   std::cout << "Output true (boolalpha): " << out.str() << std::endl;
 
-  BOOST_CHECK(out.str() == punct.truename());
+  BOOST_TEST(out.str() == punct.truename());
 
   // Output indeterminate (boolalpha - default name)
   out.str(std::string());
@@ -89,14 +89,14 @@ int test_main(int, char*[])
   out << std::boolalpha << x;
   std::cout << "Output indeterminate (boolalpha - default name): " << out.str()
             << std::endl;
-  BOOST_CHECK(out.str() == "indeterminate");
+  BOOST_TEST(out.str() == "indeterminate");
 
   // Output indeterminate (boolalpha - default name)
   out.str(std::string());
   out << std::boolalpha << indeterminate;
   std::cout << "Output indeterminate (boolalpha - default name): " << out.str()
             << std::endl;
-  BOOST_CHECK(out.str() == "indeterminate");
+  BOOST_TEST(out.str() == "indeterminate");
 
 #  if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
   // No template constructors, so we can't build the test locale
@@ -109,7 +109,7 @@ int test_main(int, char*[])
   out << std::boolalpha << x;
   std::cout << "Output indeterminate (boolalpha - \"maybe\"): " << out.str()
             << std::endl;
-  BOOST_CHECK(out.str() == "maybe");
+  BOOST_TEST(out.str() == "maybe");
 #  endif
 #endif // ! BOOST_NO_STD_LOCALE
 
@@ -120,7 +120,7 @@ int test_main(int, char*[])
     std::istringstream in("0");
     std::cout << "Input \"0\" (checks for false)" << std::endl;
     in >> x;
-    BOOST_CHECK(x == false);
+    BOOST_TEST(x == false);
   }
 
   // Input true (noboolalpha)
@@ -128,7 +128,7 @@ int test_main(int, char*[])
     std::istringstream in("1");
     std::cout << "Input \"1\" (checks for true)" << std::endl;
     in >> x;
-    BOOST_CHECK(x == true);
+    BOOST_TEST(x == true);
   }
 
   // Input false (noboolalpha)
@@ -136,14 +136,14 @@ int test_main(int, char*[])
     std::istringstream in("2");
     std::cout << "Input \"2\" (checks for indeterminate)" << std::endl;
     in >> x;
-    BOOST_CHECK(indeterminate(x));
+    BOOST_TEST(indeterminate(x));
   }
 
   // Input bad number (noboolalpha)
   {
     std::istringstream in("3");
     std::cout << "Input \"3\" (checks for failure)" << std::endl;
-    BOOST_CHECK(!(in >> x));
+    BOOST_TEST(!(in >> x));
   }
 
   // Input false (boolalpha)
@@ -151,7 +151,7 @@ int test_main(int, char*[])
     std::istringstream in("false");
     std::cout << "Input \"false\" (checks for false)" << std::endl;
     in >> std::boolalpha >> x;
-    BOOST_CHECK(x == false);
+    BOOST_TEST(x == false);
   }
 
   // Input true (boolalpha)
@@ -159,7 +159,7 @@ int test_main(int, char*[])
     std::istringstream in("true");
     std::cout << "Input \"true\" (checks for true)" << std::endl;
     in >> std::boolalpha >> x;
-    BOOST_CHECK(x == true);
+    BOOST_TEST(x == true);
   }
 
   // Input indeterminate (boolalpha)
@@ -168,7 +168,7 @@ int test_main(int, char*[])
     std::cout << "Input \"indeterminate\" (checks for indeterminate)"
               << std::endl;
     in >> std::boolalpha >> x;
-    BOOST_CHECK(indeterminate(x));
+    BOOST_TEST(indeterminate(x));
   }
 
   // Input bad string (boolalpha)
@@ -176,7 +176,7 @@ int test_main(int, char*[])
     std::istringstream in("bad");
     std::cout << "Input \"bad\" (checks for failure)"
               << std::endl;
-    BOOST_CHECK(!(in >> std::boolalpha >> x));
+    BOOST_TEST(!(in >> std::boolalpha >> x));
   }
 
 #if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
@@ -190,7 +190,7 @@ int test_main(int, char*[])
     std::cout << "Input \"maybe\" (checks for indeterminate, uses locales)"
               << std::endl;
     in >> std::boolalpha >> x;
-    BOOST_CHECK(indeterminate(x));
+    BOOST_TEST(indeterminate(x));
   }
 
   // Input indeterminate named "true_or_false" (boolalpha)
@@ -202,9 +202,9 @@ int test_main(int, char*[])
     std::cout << "Input \"true_or_false\" (checks for indeterminate)"
               << std::endl;
     in >> std::boolalpha >> x;
-    BOOST_CHECK(indeterminate(x));
+    BOOST_TEST(indeterminate(x));
   }
 #endif
 
-  return 0;
+  return boost::report_errors();
 }

test/tribool_rename_test.cpp

@@ -6,12 +6,12 @@
 // For more information, see http://www.boost.org
 
 #include <boost/logic/tribool.hpp>
-#include <boost/test/minimal.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 
 BOOST_TRIBOOL_THIRD_STATE(maybe)
 
-int test_main(int,char*[])
+int main()
 {
   using namespace boost::logic;
 
@@ -19,105 +19,104 @@ int test_main(int,char*[])
   tribool y(true); // true
   tribool z(maybe); // maybe
 
-  BOOST_CHECK(!x);
-  BOOST_CHECK(x == false);
-  BOOST_CHECK(false == x);
-  BOOST_CHECK(x != true);
-  BOOST_CHECK(true != x);
-  BOOST_CHECK(maybe(x == maybe));
-  BOOST_CHECK(maybe(maybe == x));
-  BOOST_CHECK(maybe(x != maybe));
-  BOOST_CHECK(maybe(maybe != x));
-  BOOST_CHECK(x == x);
-  BOOST_CHECK(!(x != x));
-  BOOST_CHECK(!(x && true));
-  BOOST_CHECK(!(true && x));
-  BOOST_CHECK(x || true);
-  BOOST_CHECK(true || x);
+  BOOST_TEST(!x);
+  BOOST_TEST(x == false);
+  BOOST_TEST(false == x);
+  BOOST_TEST(x != true);
+  BOOST_TEST(true != x);
+  BOOST_TEST(maybe(x == maybe));
+  BOOST_TEST(maybe(maybe == x));
+  BOOST_TEST(maybe(x != maybe));
+  BOOST_TEST(maybe(maybe != x));
+  BOOST_TEST(x == x);
+  BOOST_TEST(!(x != x));
+  BOOST_TEST(!(x && true));
+  BOOST_TEST(!(true && x));
+  BOOST_TEST(x || true);
+  BOOST_TEST(true || x);
 
-  BOOST_CHECK(y);
-  BOOST_CHECK(y == true);
-  BOOST_CHECK(true == y);
-  BOOST_CHECK(y != false);
-  BOOST_CHECK(false != y);
-  BOOST_CHECK(maybe(y == maybe));
-  BOOST_CHECK(maybe(maybe == y));
-  BOOST_CHECK(maybe(y != maybe));
-  BOOST_CHECK(maybe(maybe != y));
-  BOOST_CHECK(y == y);
-  BOOST_CHECK(!(y != y));
+  BOOST_TEST(y);
+  BOOST_TEST(y == true);
+  BOOST_TEST(true == y);
+  BOOST_TEST(y != false);
+  BOOST_TEST(false != y);
+  BOOST_TEST(maybe(y == maybe));
+  BOOST_TEST(maybe(maybe == y));
+  BOOST_TEST(maybe(y != maybe));
+  BOOST_TEST(maybe(maybe != y));
+  BOOST_TEST(y == y);
+  BOOST_TEST(!(y != y));
 
-  BOOST_CHECK(maybe(z || !z));
-  BOOST_CHECK(maybe(z == true));
-  BOOST_CHECK(maybe(true == z));
-  BOOST_CHECK(maybe(z == false));
-  BOOST_CHECK(maybe(false == z));
-  BOOST_CHECK(maybe(z == maybe));
-  BOOST_CHECK(maybe(maybe == z));
-  BOOST_CHECK(maybe(z != maybe));
-  BOOST_CHECK(maybe(maybe != z));
-  BOOST_CHECK(maybe(z == z));
-  BOOST_CHECK(maybe(z != z));
+  BOOST_TEST(maybe(z || !z));
+  BOOST_TEST(maybe(z == true));
+  BOOST_TEST(maybe(true == z));
+  BOOST_TEST(maybe(z == false));
+  BOOST_TEST(maybe(false == z));
+  BOOST_TEST(maybe(z == maybe));
+  BOOST_TEST(maybe(maybe == z));
+  BOOST_TEST(maybe(z != maybe));
+  BOOST_TEST(maybe(maybe != z));
+  BOOST_TEST(maybe(z == z));
+  BOOST_TEST(maybe(z != z));
 
-  BOOST_CHECK(!(x == y));
-  BOOST_CHECK(x != y);
-  BOOST_CHECK(maybe(x == z));
-  BOOST_CHECK(maybe(x != z));
-  BOOST_CHECK(maybe(y == z));
-  BOOST_CHECK(maybe(y != z));
+  BOOST_TEST(!(x == y));
+  BOOST_TEST(x != y);
+  BOOST_TEST(maybe(x == z));
+  BOOST_TEST(maybe(x != z));
+  BOOST_TEST(maybe(y == z));
+  BOOST_TEST(maybe(y != z));
 
-  BOOST_CHECK(!(x && y));
-  BOOST_CHECK(x || y);
-  BOOST_CHECK(!(x && z));
-  BOOST_CHECK(maybe(y && z));
-  BOOST_CHECK(maybe(z && z));
-  BOOST_CHECK(maybe(z || z));
-  BOOST_CHECK(maybe(x || z));
-  BOOST_CHECK(y || z);
+  BOOST_TEST(!(x && y));
+  BOOST_TEST(x || y);
+  BOOST_TEST(!(x && z));
+  BOOST_TEST(maybe(y && z));
+  BOOST_TEST(maybe(z && z));
+  BOOST_TEST(maybe(z || z));
+  BOOST_TEST(maybe(x || z));
+  BOOST_TEST(y || z);
 
-  BOOST_CHECK(maybe(y && maybe));
-  BOOST_CHECK(maybe(maybe && y));
-  BOOST_CHECK(!(x && maybe));
-  BOOST_CHECK(!(maybe && x));
+  BOOST_TEST(maybe(y && maybe));
+  BOOST_TEST(maybe(maybe && y));
+  BOOST_TEST(!(x && maybe));
+  BOOST_TEST(!(maybe && x));
 
-  BOOST_CHECK(maybe || y);
-  BOOST_CHECK(y || maybe);
-  BOOST_CHECK(maybe(x || maybe));
-  BOOST_CHECK(maybe(maybe || x));
+  BOOST_TEST(maybe || y);
+  BOOST_TEST(y || maybe);
+  BOOST_TEST(maybe(x || maybe));
+  BOOST_TEST(maybe(maybe || x));
 
   // Test the if (z) ... else (!z) ... else ... idiom
   if (z) {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
   else if (!z) {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
   else {
-    BOOST_CHECK(true);
+    BOOST_TEST(true);
   }
 
   z = true;
   if (z) {
-    BOOST_CHECK(true);
+    BOOST_TEST(true);
   }
   else if (!z) {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
   else {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
 
   z = false;
   if (z) {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
   else if (!z) {
-    BOOST_CHECK(true);
+    BOOST_TEST(true);
   }
   else {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
 
-  std::cout << "no errors detected\n";
-  return 0;
+  return boost::report_errors();
 }

test/tribool_test.cpp

@@ -5,10 +5,11 @@
 
 #include <boost/config.hpp>
 #include <boost/logic/tribool.hpp>
-#include <boost/test/minimal.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <boost/static_assert.hpp>
 #include <iostream>
 
-int test_main(int, char*[])
+int main()
 {
   using namespace boost::logic;
 
@@ -22,122 +23,122 @@ int test_main(int, char*[])
   //       and that is tested in the compile-fail/implicit.cpp file
   // so we check the conversion to ensure it is sane
   bool bx = x;
-  BOOST_CHECK(bx == false);
+  BOOST_TEST(bx == false);
   bool by = y;
-  BOOST_CHECK(by == true);
+  BOOST_TEST(by == true);
   bool bz = z;
-  BOOST_CHECK(bz == false);
+  BOOST_TEST(bz == false);
 #endif
 
-  BOOST_CHECK(!x);
-  BOOST_CHECK(x == false);
-  BOOST_CHECK(false == x);
-  BOOST_CHECK(x != true);
-  BOOST_CHECK(true != x);
-  BOOST_CHECK(indeterminate(x == indeterminate));
-  BOOST_CHECK(indeterminate(indeterminate == x));
-  BOOST_CHECK(indeterminate(x != indeterminate));
-  BOOST_CHECK(indeterminate(indeterminate != x));
-  BOOST_CHECK(x == x);
-  BOOST_CHECK(!(x != x));
-  BOOST_CHECK(!(x && true));
-  BOOST_CHECK(!(true && x));
-  BOOST_CHECK(x || true);
-  BOOST_CHECK(true || x);
+  BOOST_TEST(!x);
+  BOOST_TEST(x == false);
+  BOOST_TEST(false == x);
+  BOOST_TEST(x != true);
+  BOOST_TEST(true != x);
+  BOOST_TEST(indeterminate(x == indeterminate));
+  BOOST_TEST(indeterminate(indeterminate == x));
+  BOOST_TEST(indeterminate(x != indeterminate));
+  BOOST_TEST(indeterminate(indeterminate != x));
+  BOOST_TEST(x == x);
+  BOOST_TEST(!(x != x));
+  BOOST_TEST(!(x && true));
+  BOOST_TEST(!(true && x));
+  BOOST_TEST(x || true);
+  BOOST_TEST(true || x);
 
-  BOOST_CHECK(y);
-  BOOST_CHECK(y == true);
-  BOOST_CHECK(true == y);
-  BOOST_CHECK(y != false);
-  BOOST_CHECK(false != y);
-  BOOST_CHECK(indeterminate(y == indeterminate));
-  BOOST_CHECK(indeterminate(indeterminate == y));
-  BOOST_CHECK(indeterminate(y != indeterminate));
-  BOOST_CHECK(indeterminate(indeterminate != y));
-  BOOST_CHECK(y == y);
-  BOOST_CHECK(!(y != y));
+  BOOST_TEST(y);
+  BOOST_TEST(y == true);
+  BOOST_TEST(true == y);
+  BOOST_TEST(y != false);
+  BOOST_TEST(false != y);
+  BOOST_TEST(indeterminate(y == indeterminate));
+  BOOST_TEST(indeterminate(indeterminate == y));
+  BOOST_TEST(indeterminate(y != indeterminate));
+  BOOST_TEST(indeterminate(indeterminate != y));
+  BOOST_TEST(y == y);
+  BOOST_TEST(!(y != y));
 
-  BOOST_CHECK(indeterminate(z || !z));
-  BOOST_CHECK(indeterminate(z == true));
-  BOOST_CHECK(indeterminate(true == z));
-  BOOST_CHECK(indeterminate(z == false));
-  BOOST_CHECK(indeterminate(false == z));
-  BOOST_CHECK(indeterminate(z == indeterminate));
-  BOOST_CHECK(indeterminate(indeterminate == z));
-  BOOST_CHECK(indeterminate(z != indeterminate));
-  BOOST_CHECK(indeterminate(indeterminate != z));
-  BOOST_CHECK(indeterminate(z == z));
-  BOOST_CHECK(indeterminate(z != z));
+  BOOST_TEST(indeterminate(z || !z));
+  BOOST_TEST(indeterminate(z == true));
+  BOOST_TEST(indeterminate(true == z));
+  BOOST_TEST(indeterminate(z == false));
+  BOOST_TEST(indeterminate(false == z));
+  BOOST_TEST(indeterminate(z == indeterminate));
+  BOOST_TEST(indeterminate(indeterminate == z));
+  BOOST_TEST(indeterminate(z != indeterminate));
+  BOOST_TEST(indeterminate(indeterminate != z));
+  BOOST_TEST(indeterminate(z == z));
+  BOOST_TEST(indeterminate(z != z));
 
-  BOOST_CHECK(!(x == y));
-  BOOST_CHECK(x != y);
-  BOOST_CHECK(indeterminate(x == z));
-  BOOST_CHECK(indeterminate(x != z));
-  BOOST_CHECK(indeterminate(y == z));
-  BOOST_CHECK(indeterminate(y != z));
+  BOOST_TEST(!(x == y));
+  BOOST_TEST(x != y);
+  BOOST_TEST(indeterminate(x == z));
+  BOOST_TEST(indeterminate(x != z));
+  BOOST_TEST(indeterminate(y == z));
+  BOOST_TEST(indeterminate(y != z));
 
-  BOOST_CHECK(!(x && y));
-  BOOST_CHECK(x || y);
-  BOOST_CHECK(!(x && z));
-  BOOST_CHECK(indeterminate(y && z));
-  BOOST_CHECK(indeterminate(z && z));
-  BOOST_CHECK(indeterminate(z || z));
-  BOOST_CHECK(indeterminate(x || z));
-  BOOST_CHECK(y || z);
+  BOOST_TEST(!(x && y));
+  BOOST_TEST(x || y);
+  BOOST_TEST(!(x && z));
+  BOOST_TEST(indeterminate(y && z));
+  BOOST_TEST(indeterminate(z && z));
+  BOOST_TEST(indeterminate(z || z));
+  BOOST_TEST(indeterminate(x || z));
+  BOOST_TEST(y || z);
 
-  BOOST_CHECK(indeterminate(y && indeterminate));
-  BOOST_CHECK(indeterminate(indeterminate && y));
-  BOOST_CHECK(!(x && indeterminate));
-  BOOST_CHECK(!(indeterminate && x));
+  BOOST_TEST(indeterminate(y && indeterminate));
+  BOOST_TEST(indeterminate(indeterminate && y));
+  BOOST_TEST(!(x && indeterminate));
+  BOOST_TEST(!(indeterminate && x));
 
-  BOOST_CHECK(indeterminate || y);
-  BOOST_CHECK(y || indeterminate);
-  BOOST_CHECK(indeterminate(x || indeterminate));
-  BOOST_CHECK(indeterminate(indeterminate || x));
+  BOOST_TEST(indeterminate || y);
+  BOOST_TEST(y || indeterminate);
+  BOOST_TEST(indeterminate(x || indeterminate));
+  BOOST_TEST(indeterminate(indeterminate || x));
 
   // Test the if (z) ... else (!z) ... else ... idiom
   if (z) {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
   else if (!z) {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
   else {
-    BOOST_CHECK(true);
+    BOOST_TEST(true);
   }
 
   z = true;
   if (z) {
-    BOOST_CHECK(true);
+    BOOST_TEST(true);
   }
   else if (!z) {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
   else {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
 
   z = false;
   if (z) {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
   else if (!z) {
-    BOOST_CHECK(true);
+    BOOST_TEST(true);
   }
   else {
-    BOOST_CHECK(false);
+    BOOST_TEST(false);
   }
 
 #if !defined(BOOST_NO_CXX11_CONSTEXPR) 
   constexpr bool res_ors = indeterminate(false || tribool(false) || false || indeterminate); // true
-  BOOST_CHECK(res_ors);
+  BOOST_TEST(res_ors);
   char array_ors[res_ors ? 2 : 3];
-  BOOST_CHECK(sizeof(array_ors) / sizeof(char) == 2);
+  BOOST_TEST(sizeof(array_ors) / sizeof(char) == 2);
 
   constexpr bool res_ands = !indeterminate(!(true && tribool(true) && true && indeterminate)); // false
-  BOOST_CHECK(!res_ands);
+  BOOST_TEST(!res_ands);
   char array_ands[res_ands ? 2 : 3];
-  BOOST_CHECK(sizeof(array_ands) / sizeof(char) == 3);
+  BOOST_TEST(sizeof(array_ands) / sizeof(char) == 3);
 
   constexpr bool res_safe_bool = static_cast<bool>( tribool(true) );
   BOOST_STATIC_ASSERT(res_safe_bool);
@@ -149,6 +150,5 @@ int test_main(int, char*[])
 # endif
 #endif
 
-  std::cout << "no errors detected\n";
-  return 0;
+  return boost::report_errors();
 }