diff options
| -rw-r--r-- | .github/workflows/ci.yml | 25 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 8 | ||||
| m--------- | external/slang-rhi | 0 |
3 files changed, 10 insertions, 23 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47fab6531..54bfeb70f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -278,30 +278,9 @@ jobs: -skip-reference-image-generation \ -show-adapter-info - name: Run slang-rhi tests - if: false # steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' && matrix.full-gpu-tests - shell: pwsh + if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' && matrix.full-gpu-tests run: | - if (!(Test-Path -Path "external/slang-rhi/build")) { - Write-Host "Building slang-rhi if it doesn't exist" - Push-Location external/slang-rhi - cmake --preset msvc -S . -B build - cmake --build build --config ${{matrix.config}} - Write-Host "Copying DLLs from bin directory to slang-rhi build location..." - Copy-Item -Path "$bin_dir\*.dll" -Destination "build\${{matrix.config}}" -Force - Pop-Location - } - $testExe = Get-ChildItem -Path "external/slang-rhi/build" -Recurse -Filter "slang-rhi-tests.exe" | Select-Object -First 1 - if ($testExe) { - Write-Host "Found slang-rhi tests executable at: $($testExe.FullName)" - $testDir = $testExe.Directory.FullName - Push-Location $testDir - Write-Host "Running slang-rhi tests..." - .\slang-rhi-tests.exe -check-devices -tce="ray-tracing-*,cmd-query-resolve-host" - Pop-Location - } else { - Write-Error "Could not find slang-rhi-tests.exe" - exit 1 - } + "$bin_dir/slang-rhi-tests" -check-devices -tce=ray-tracing-*,cmd-query-resolve-host,fence-* - name: Run slangpy tests if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' && matrix.full-gpu-tests shell: pwsh diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 97fd7c1f7..2b37e1ef4 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -182,6 +182,8 @@ target_include_directories( # slang-rhi if(SLANG_ENABLE_SLANG_RHI) set(SLANG_RHI_BUILD_FROM_SLANG_REPO ON) + set(SLANG_RHI_BUILD_TESTS ON) + set(SLANG_RHI_BUILD_TESTS_WITH_GLFW OFF) set(SLANG_RHI_INSTALL OFF) set(SLANG_RHI_BINARY_DIR ${CMAKE_BINARY_DIR}/$<CONFIG>/bin) set(SLANG_RHI_FETCH_SLANG OFF) @@ -219,6 +221,12 @@ if(SLANG_ENABLE_SLANG_RHI) ${system} ) endif() + + # Output slang-rhi-tests to the bin directory so we can run it easily. + set_target_properties( + slang-rhi-tests + PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<CONFIG>/bin + ) endif() # Tidy things up: diff --git a/external/slang-rhi b/external/slang-rhi -Subproject d256b49563e2d428e36902648cf49b253e42f71 +Subproject ee3844f7c15a52991536314563aa7188d6f59d2 |