fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Enable test discovery in VS Test Explorer

Browse Source
This commit is contained in:
Herman S.
2026-03-05 16:18:23 +09:00
parent 16d2cc05c5
commit 086decfa6e
5 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -10,6 +10,11 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
option(XENIA_BUILD_TESTS "Build test suites" OFF) option(XENIA_BUILD_TESTS "Build test suites" OFF)
option(XENIA_BUILD_MISC "Build misc subprojects (trace viewers, shader compiler, vfs-dump, demos)" OFF) option(XENIA_BUILD_MISC "Build misc subprojects (trace viewers, shader compiler, vfs-dump, demos)" OFF)
if(XENIA_BUILD_TESTS)
enable_testing()
include(${PROJECT_SOURCE_DIR}/third_party/catch/contrib/Catch.cmake)
endif()
# Multi-config generators (VS, Ninja Multi-Config) # Multi-config generators (VS, Ninja Multi-Config)
get_property(_is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) get_property(_is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(_is_multi_config) if(_is_multi_config)

2
cmake/XeniaHelpers.cmake
View File

@@ -247,4 +247,6 @@ function(xe_test_suite name base_path)
# Disable Edit and Continue - breaks Catch2 __LINE__ usage # Disable Edit and Continue - breaks Catch2 __LINE__ usage
target_compile_options(${name} PRIVATE /Zi) target_compile_options(${name} PRIVATE /Zi)
endif() endif()
catch_discover_tests(${name})
endfunction() endfunction()

1
src/xenia/cpu/ppc/testing/CMakeLists.txt
View File

@@ -35,3 +35,4 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
endif() endif()
xe_target_defaults(xenia-cpu-ppc-tests) xe_target_defaults(xenia-cpu-ppc-tests)
add_test(NAME xenia-cpu-ppc-tests COMMAND xenia-cpu-ppc-tests)

2
src/xenia/cpu/testing/CMakeLists.txt
View File

@@ -3,5 +3,5 @@ xe_test_suite(xenia-cpu-tests ${CMAKE_CURRENT_SOURCE_DIR}
capstone fmt imgui capstone fmt imgui
xenia-base xenia-core xenia-cpu xenia-gpu xenia-base xenia-core xenia-cpu xenia-gpu
xenia-hid-skylander xenia-kernel xenia-ui xenia-patcher xenia-hid-skylander xenia-kernel xenia-ui xenia-patcher
$<$<STREQUAL:${CMAKE_SYSTEM_PROCESSOR},x86_64>:xenia-cpu-backend-x64> $<$<OR:$<STREQUAL:${CMAKE_SYSTEM_PROCESSOR},x86_64>,$<STREQUAL:${CMAKE_SYSTEM_PROCESSOR},AMD64>>:xenia-cpu-backend-x64>
) )

1
xenia-build.py
View File

@@ -1805,6 +1805,7 @@ class DevenvCommand(Command):
"-B", vs_build_dir, "-B", vs_build_dir,
"-G", "Visual Studio 17 2022", "-G", "Visual Studio 17 2022",
"-A", "x64", "-A", "x64",
"-DXENIA_BUILD_TESTS=ON",
]) ])
sln_path = os.path.join(vs_build_dir, "xenia.sln") sln_path = os.path.join(vs_build_dir, "xenia.sln")
print(f"Opening {sln_path} in Visual Studio...") print(f"Opening {sln_path} in Visual Studio...")