Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: switch from GTest to Catch2 #574

Merged
merged 4 commits into from
Apr 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .github/actions/cmake_config/Dockerfile

This file was deleted.

16 changes: 0 additions & 16 deletions .github/actions/cmake_config/action.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/actions/cmake_config/entrypoint.sh

This file was deleted.

18 changes: 18 additions & 0 deletions .github/actions/quick_cmake/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Quick CMake config
description: 'Runs CMake 3.4+ (if already setup)'
inputs:
args:
description: 'Other arguments'
required: false
default: ''

runs:
using: composite
steps:
- run: |
mkdir -p build-tmp
touch build-tmp/tmp
rm -r build-tmp/*
(cd build-tmp && cmake .. ${{ inputs.args}})
rm -r build-tmp
shell: bash
135 changes: 99 additions & 36 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,81 +39,144 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: CMake 3.4
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.4.3
cmake-version: "3.4"
- name: Check CMake 3.4
uses: ./.github/actions/quick_cmake

- name: CMake 3.5
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.5.2
cmake-version: "3.5"
- name: Check CMake 3.5
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.6
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.6.3
cmake-version: "3.6"
- name: Check CMake 3.6
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.7
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.7.2
cmake-version: "3.7"
- name: Check CMake 3.7
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.8
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.8.2
cmake-version: "3.8"
- name: Check CMake 3.8
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.9
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.9.6
cmake-version: "3.9"
- name: Check CMake 3.9
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.10
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.10.3
cmake-version: "3.10"
- name: Check CMake 3.10
uses: ./.github/actions/quick_cmake
if: success() || failure()
- name: CMake 3.11 (full)
uses: ./.github/actions/cmake_config

- name: CMake 3.11
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.11"
- name: Check CMake 3.11 (full)
uses: ./.github/actions/quick_cmake
with:
version: 3.11.4
options: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
if: success() || failure()

- name: CMake 3.12
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.12.4
cmake-version: "3.12"
- name: Check CMake 3.12
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.13
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.13.5
cmake-version: "3.13"
- name: Check CMake 3.13
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.14
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.14.7
cmake-version: "3.14"
- name: Check CMake 3.14
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.15
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.15.6
cmake-version: "3.15"
- name: Check CMake 3.15
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.16
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.16.8
cmake-version: "3.16"
- name: Check CMake 3.16
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.17
uses: ./.github/actions/cmake_config
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.17"
- name: Check CMake 3.17
uses: ./.github/actions/quick_cmake
if: success() || failure()

- name: CMake 3.18
uses: jwlawson/actions-setup-cmake@v1.8
with:
version: 3.17.3
cmake-version: "3.18"
- name: Check CMake 3.18
uses: ./.github/actions/quick_cmake
if: success() || failure()
- name: CMake 3.18 (full)
uses: ./.github/actions/cmake_config

- name: CMake 3.19
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.19"
- name: Check CMake 3.19 (full)
uses: ./.github/actions/quick_cmake
with:
version: 3.18.0
options: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
if: success() || failure()

- name: CMake 3.20
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.20"
- name: Check CMake 3.20
uses: ./.github/actions/quick_cmake
if: success() || failure()


1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ a.out*
/node_modules/*
/package.json
/yarn.lock
/CLI11.hpp
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

2 changes: 2 additions & 0 deletions CPPLINT.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ linelength=120 # As in .clang-format
filter=-build/c++11 # Reports e.g. chrono and thread, which overlap with Chromium's API. Not applicable to general C++ projects.
filter=-build/include_order # Requires unusual include order that encourages creating not self-contained headers
filter=-readability/nolint # Conflicts with clang-tidy
filter=-readability/check # Catch uses CHECK(a == b) (Tests only)
filter=-build/namespaces # Currently using it for one test (Tests only)
filter=-runtime/references # Requires fundamental change of API, don't see need for this
filter=-whitespace/blank_line # Unnecessarily strict with blank lines that otherwise help with readability
filter=-whitespace/indent # Requires strange 3-space indent of private/protected/public markers
Expand Down
49 changes: 0 additions & 49 deletions cmake/AddGoogletest.cmake

This file was deleted.

1 change: 0 additions & 1 deletion extern/googletest
Submodule googletest deleted from 859bfe
Loading