From ad6478f1346d3f004d88ce8c7e38479520bb6656 Mon Sep 17 00:00:00 2001
From: Simon Kallweit <64953474+skallweitNV@users.noreply.github.com>
Date: Fri, 13 Jun 2025 18:02:23 +0200
Subject: Re-enable running slang-rhi-tests (#7360)

* enable building slang-rhi-tests

* re-enable running slang-rhi-tests

* format code

* fix typo

* update slang-rhi

* build slang-rhi-tests without glfw dependency

* skip fence tests

---------

Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Co-authored-by: amey asgaonkar <160177341+aasgaonkar@users.noreply.github.com>
---
 .github/workflows/ci.yml | 25 ++-----------------------
 external/CMakeLists.txt  |  8 ++++++++
 external/slang-rhi       |  2 +-
 3 files changed, 11 insertions(+), 24 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
index d256b4956..ee3844f7c 160000
--- a/external/slang-rhi
+++ b/external/slang-rhi
@@ -1 +1 @@
-Subproject commit d256b49563e2d428e36902648cf49b253e42f713
+Subproject commit ee3844f7c15a52991536314563aa7188d6f59d2d
-- 
cgit v1.2.3