aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Giessen <charles@lunarg.com>2023-09-13 14:03:22 -0600
committerJuan Ramos <114601453+juan-lunarg@users.noreply.github.com>2023-09-20 08:31:22 -0600
commit8a9f85e7125615995af864fd47f5e64e0aa9bc9c (patch)
tree8c37d8ae1f06ad240334f1e72a2d7cf4a97eddd3
parent54f0d66861b0586e49c0b6b2e301d44cdfe86a30 (diff)
downloadusermoji-8a9f85e7125615995af864fd47f5e64e0aa9bc9c.tar.xz
test: Turn windows tests on in github CI
Now that the Vulkan-Loader's find_package support is available, this repo can enable testing on windows and have it work. Github actions runs everything in 'admin mode' which causes the loader to ignore environment variables, which is how the tests find MockICD. Thus, to work around this behavior we build the loader with LOADER_USE_UNSAFE_FILE_SEARCH so that it will use environment variables again.
-rw-r--r--.github/workflows/tools.yml6
-rw-r--r--scripts/known_good.json3
2 files changed, 8 insertions, 1 deletions
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
index f3771964..dad2ec9c 100644
--- a/.github/workflows/tools.yml
+++ b/.github/workflows/tools.yml
@@ -116,7 +116,7 @@ jobs:
arch: ${{ matrix.arch }}
- name: Configure
- run: cmake -S. -B build -G "Ninja" -DCMAKE_BUILD_TYPE=${{matrix.config}} -D UPDATE_DEPS=ON -D INSTALL_ICD=ON
+ run: cmake -S. -B build -G "Ninja" -DCMAKE_BUILD_TYPE=${{matrix.config}} -D UPDATE_DEPS=ON -D INSTALL_ICD=ON -D BUILD_TESTS=ON
- name: Build
run: cmake --build ./build
@@ -124,6 +124,10 @@ jobs:
- name: Install
run: cmake --install build/ --prefix build/install
+ - name: Test
+ working-directory: ./build
+ run: ctest --output-on-failure
+
- name: Verify generated source files
run: python scripts/generate_source.py --verify external/${{matrix.config}}/Vulkan-Headers/build/install/share/vulkan/registry
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 239693ff..bbba09d8 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -32,6 +32,9 @@
"sub_dir": "Vulkan-Loader",
"build_dir": "Vulkan-Loader/build",
"install_dir": "Vulkan-Loader/build/install",
+ "cmake_options": [
+ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
+ ],
"commit": "d40385b1748ae5270fcab18c5aae1a2e5a301465",
"deps": [
{