From 26fd2311513e4542da9e33b6b21b936e8af8b1a5 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Tue, 14 Mar 2023 19:51:52 +0100
Subject: [PATCH] ci: run tests on msvc workflow
No tests were run, because the top CMakeLists.txt was not doing enable-testing().
---
.github/workflows/msvc.yml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
index d6968cd8336b..d7b51e292fab 100644
--- a/.github/workflows/msvc.yml
+++ b/.github/workflows/msvc.yml
@@ -21,9 +21,9 @@ jobs:
- { name: Windows static VCRT (x86), flags: -A Win32 -DSDL_FORCE_STATIC_VCRT=ON, artifact: 'SDL-VC-static-VCRT-x86' }
- { name: Windows (clang-cl x64), flags: -T ClangCL -A x64, artifact: 'SDL-clang-cl-x64' }
- { name: Windows (clang-cl x86), flags: -T ClangCL -A Win32, artifact: 'SDL-clang-cl-x86' }
- - { name: Windows (ARM), flags: -A ARM, artifact: 'SDL-VC-arm32' }
- - { name: Windows (ARM64), flags: -A ARM64, artifact: 'SDL-VC-arm64' }
- - { name: UWP (x64), flags: -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0", nowerror: true,
+ - { name: Windows (ARM), flags: -A ARM, artifact: 'SDL-VC-arm32', notests: true }
+ - { name: Windows (ARM64), flags: -A ARM64, artifact: 'SDL-VC-arm64', notests: true }
+ - { name: UWP (x64), flags: -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0", nowerror: true, notests: true,
project: VisualC-WinRT/SDL-UWP.sln, projectflags: '/p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0.17763.0', artifact: 'SDL-VC-UWP' }
steps:
@@ -38,8 +38,9 @@ jobs:
os.makedirs(builddir)
with open(f"{ builddir }/CMakeLists.txt", "w") as f:
f.write(textwrap.dedent(f"""\
- cmake_minimum_required(VERSION 3.0)
+ cmake_minimum_required(VERSION 3.0...3.25)
project(sdl_user)
+ enable_testing()
add_subdirectory("{ srcdir }" SDL)
"""))
- name: Configure (CMake)
@@ -58,7 +59,7 @@ jobs:
- name: Build (CMake)
run: cmake --build build/ --config Release --parallel
- name: Run build-time tests
- if: "! contains(matrix.platform.name, 'ARM')"
+ if: ${{ !matrix.platform.notests }}
run: |
$env:SDL_TESTS_QUICK=1
ctest -VV --test-dir build/ -C Release -j2