eden-emu/Vulkan-Headers
14
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Headers.git synced 2025-05-14 15:38:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix testing for 3.15

Browse source
This commit is contained in:
Juan Ramos 2023-11-20 17:44:12 -07:00 • committed by Juan Ramos
parent d9542c985b
commit b93aa80bbc
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View file

@ -30,7 +30,8 @@ jobs:
cmakeVersion: ${{ matrix.cmake-version }} cmakeVersion: ${{ matrix.cmake-version }}
- uses: ilammy/msvc-dev-cmd@v1 - uses: ilammy/msvc-dev-cmd@v1
- run: cmake -S . -B build -D BUILD_TESTS=ON -G Ninja - run: cmake -S . -B build -D BUILD_TESTS=ON -G Ninja
- run: ctest --test-dir build --output-on-failure - run: ctest --output-on-failure
working-directory: build
reuse: reuse:
runs-on: ubuntu-latest runs-on: ubuntu-latest

8
tests/CMakeLists.txt
View file

@ -6,17 +6,13 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# ~~~ # ~~~
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24")
set(fresh "--fresh")
endif()
# Test add_subdirectory suppport # Test add_subdirectory suppport
add_test(NAME integration.add_subdirectory add_test(NAME integration.add_subdirectory
COMMAND ${CMAKE_CTEST_COMMAND} COMMAND ${CMAKE_CTEST_COMMAND}
--build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration --build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration
${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory
--build-generator ${CMAKE_GENERATOR} --build-generator ${CMAKE_GENERATOR}
--build-options -DFIND_PACKAGE_TESTING=OFF "${fresh}" --build-options -DFIND_PACKAGE_TESTING=OFF
) )
set(test_install_dir "${CMAKE_CURRENT_BINARY_DIR}/install") set(test_install_dir "${CMAKE_CURRENT_BINARY_DIR}/install")
@ -30,7 +26,7 @@ add_test(NAME integration.find_package
--build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration --build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration
${CMAKE_CURRENT_BINARY_DIR}/find_package ${CMAKE_CURRENT_BINARY_DIR}/find_package
--build-generator ${CMAKE_GENERATOR} --build-generator ${CMAKE_GENERATOR}
--build-options -DFIND_PACKAGE_TESTING=ON -DCMAKE_PREFIX_PATH=${test_install_dir} "${fresh}" --build-options -DFIND_PACKAGE_TESTING=ON -DCMAKE_PREFIX_PATH=${test_install_dir}
) )
# Installing comes before testing # Installing comes before testing