diff options
| author | Juan Ramos <juan@lunarg.com> | 2023-11-20 17:44:12 -0700 |
|---|---|---|
| committer | Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> | 2023-11-20 18:07:10 -0700 |
| commit | b93aa80bbc96f422abb4fd5bf3f4e118496be0e0 (patch) | |
| tree | 4be31ed52bea9ac2c374bdca6937ebb6efe55f12 | |
| parent | d9542c985b2f2bcf77cd86fd4568eb7d13e2b1db (diff) | |
| download | vulkan-headers-b93aa80bbc96f422abb4fd5bf3f4e118496be0e0.tar.gz | |
Fix testing for 3.15
| -rw-r--r-- | .github/workflows/ci.yml | 3 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 205107c..ff621b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,8 @@ jobs: cmakeVersion: ${{ matrix.cmake-version }} - uses: ilammy/msvc-dev-cmd@v1 - 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: runs-on: ubuntu-latest diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 93e8078..177b28f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,17 +6,13 @@ # SPDX-License-Identifier: Apache-2.0 # ~~~ -if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24") - set(fresh "--fresh") -endif() - # Test add_subdirectory suppport add_test(NAME integration.add_subdirectory COMMAND ${CMAKE_CTEST_COMMAND} --build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory --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") @@ -30,7 +26,7 @@ add_test(NAME integration.find_package --build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration ${CMAKE_CURRENT_BINARY_DIR}/find_package --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 |