Skip to content

Commit 0292ab7

Browse files
committed
Fixing the Catch2 upgrade to v3, removed old catch main, updated action to use all cores
1 parent aad6fa2 commit 0292ab7

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
2121

2222
- name: Build
23-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
23+
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -- -j
2424

2525
- name: Test
2626
working-directory: ${{github.workspace}}/build
2727
# Didn't configure to use ctest. Opted for a custom target to run instead
28-
run: cmake --build build --target test
28+
run: cmake --build build --target test -- -j
2929

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FetchContent_Declare(
99
)
1010
FetchContent_MakeAvailable(Catch2)
1111

12-
list(APPEND TEST_SOURCES main.cpp
12+
list(APPEND TEST_SOURCES
1313
test_dbc.cpp
1414
test_utils.cpp)
1515

test/main.cpp

Lines changed: 0 additions & 2 deletions
This file was deleted.

test/test_dbc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <catch2/catch.hpp>
1+
#include <catch2/catch_test_macros.hpp>
22
#include "defines.hpp"
33
#include <libdbc/dbc.hpp>
44

test/test_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <catch2/catch.hpp>
1+
#include <catch2/catch_test_macros.hpp>
22
#include "defines.hpp"
33
#include <libdbc/utils/utils.hpp>
44

0 commit comments

Comments
 (0)