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

CMake: Build tests only on make test #182

Merged
merged 2 commits into from
May 16, 2024
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
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ for:
- mkdir __build_cmake_test__
- cd __build_cmake_test__
- cmake -G "%GENERATOR%" -DCMAKE_CXX_STANDARD=%CXXSTD% %CMAKE_FLAGS% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ..
build_script: cmake --build . --config %configuration% --parallel 4
build_script: cmake --build . --config %configuration% --parallel 4 --target tests
test_script:
- ctest --output-on-failure -C %configuration% --parallel 4
- ps: |
Expand All @@ -204,7 +204,7 @@ for:
- cmake -G "%GENERATOR%" ..
- ps: |
cov-configure --msvc
cov-build --dir cov-int cmake --build . --config $env:configuration
cov-build --dir cov-int cmake --build --target tests . --config $env:configuration
If ($LastExitCode -ne 0) {
cat cov-int/build-log.txt
$host.SetShouldExit($LastExitCode)
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019 - 2022 Alexander Grund
# Copyright 2019 - 2024 Alexander Grund
# Distributed under the Boost Software License, Version 1.0.
# https://www.boost.org/LICENSE_1_0.txt

Expand Down Expand Up @@ -102,8 +102,8 @@ jobs:
extraFlags="$extraFlags -DCMAKE_CXX_FLAGS=-Wundef"
fi
cmake -DCMAKE_BUILD_TYPE=${{matrix.buildType}} -DBUILD_SHARED_LIBS=${{matrix.shared_lib}} -G "${{matrix.generator}}" $extraFlags ..
- name: Build & Install
run: cmake --build build --config ${{matrix.buildType}} --target install
- name: Build
run: cmake --build build --config ${{matrix.buildType}} --target tests

# Run test with both bash and powershell and watch for "Using std::cin" on bash but not on powershell
- name: Test
Expand All @@ -114,6 +114,9 @@ jobs:
shell: powershell
if: runner.os == 'Windows'
run: ctest --output-on-failure -C ${{matrix.buildType}} --verbose

- name: Install
run: cmake --build build --config ${{matrix.buildType}} --target install
- name: Test consumption
working-directory: build
run: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ jobs:
src_dir="$PWD/nowide_standalone_${{steps.get_tag.outputs.tag}}"
mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/../install "$src_dir"
cmake --build . --config Debug --target install
cmake --build . --config Debug --target tests
ctest --output-on-failure -C Debug --verbose
cmake --build . --config Debug --target install

- name: Create Boost version
run: |
Expand All @@ -75,8 +76,9 @@ jobs:
src_dir="$PWD/nowide_${{steps.get_tag.outputs.tag}}"
mkdir build && cd build
cmake -DBoost_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/../install "$src_dir"
cmake --build . --config Debug --target install
cmake --build . --config Debug --target tests
ctest --output-on-failure -C Debug --verbose
cmake --build . --config Debug --target install

- name: Create Release
if: github.event_name == 'push'
Expand Down
6 changes: 3 additions & 3 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Copyright 2019 - 2021 Alexander Grund
# Copyright 2019 - 2024 Alexander Grund
# Distributed under the Boost Software License, Version 1.0.
# https://www.boost.org/LICENSE_1_0.txt

include(CheckCXXCompilerFlag)
check_cxx_compiler_flag(-Wsuggest-override _BOOST_NOWIDE_SUGGEST_OVERRIDE_SUPPORTED)

add_library(boost_nowide_file_test_helpers STATIC file_test_helpers.cpp)
add_library(boost_nowide_file_test_helpers STATIC EXCLUDE_FROM_ALL file_test_helpers.cpp)
target_link_libraries(boost_nowide_file_test_helpers PRIVATE Boost::nowide)
target_compile_definitions(boost_nowide_file_test_helpers PRIVATE BOOST_ALL_NO_LIB)

Expand All @@ -27,7 +27,7 @@ function(boost_nowide_add_test name)
endif()
set(name ${PROJECT_NAME}-${name})

add_executable(${name} ${ARG_SRC})
add_executable(${name} EXCLUDE_FROM_ALL ${ARG_SRC})
add_dependencies(tests ${name})
target_link_libraries(${name} PRIVATE Boost::nowide ${ARG_LIBRARIES})
boost_add_warnings(${name} pedantic ${Boost_NOWIDE_WERROR})
Expand Down
Loading