From 7608148194ff6f6d52fe8387d619458dc90b1bd4 Mon Sep 17 00:00:00 2001
From: Tyler Yankee <tyler.yankee@kitware.com>
Date: Mon, 27 Jul 2026 08:33:54 -0400
Subject: [PATCH] Tests: Harden assertions around {write,delete}_regv

Issue: #27990
---
 Tests/Complex/CMakeLists.txt          | 26 +++++++++++++++++++++++---
 Tests/ComplexOneConfig/CMakeLists.txt | 26 +++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 8a064a4740..f411bebc73 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -297,11 +297,31 @@ if (WIN32)
       ${Complex_SOURCE_DIR}/Library/dummy
       "${dir}/${file}"
       COPYONLY)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E write_regv "${hkey}" "${dir}")
+
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E write_regv "${hkey}" "${dir}"
+      RESULT_VARIABLE write_regv_result)
+    if(NOT write_regv_result EQUAL 0)
+      message(SEND_ERROR "write_regv failed with result ${write_regv_result}")
+    endif()
     find_path(REGISTRY_TEST_PATH
       ${file}
-      "[${hkey}]" DOC "Registry_Test_Path")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E delete_regv "${hkey}")
+      "[${hkey}]"
+      NO_DEFAULT_PATH
+      DOC "Registry_Test_Path")
+    if(NOT REGISTRY_TEST_PATH)
+      message(SEND_ERROR "Registry value was not found after write_regv")
+    elseif(NOT EXISTS "${REGISTRY_TEST_PATH}/${file}")
+      message(SEND_ERROR "Registry-resolved path does not contain ${file}: ${REGISTRY_TEST_PATH}")
+    endif()
+
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E delete_regv "${hkey}"
+      RESULT_VARIABLE delete_regv_result)
+    if(NOT delete_regv_result EQUAL 0)
+      message(SEND_ERROR "delete_regv failed with result ${delete_regv_result}")
+    endif()
+
     execute_process(COMMAND ${CMAKE_COMMAND} -E rm -f "${dir}/${file}")
   endif ()
 endif ()
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt
index 4b00e5d548..fa276df31a 100644
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/CMakeLists.txt
@@ -254,11 +254,31 @@ if (WIN32)
       ${Complex_SOURCE_DIR}/Library/dummy
       "${dir}/${file}"
       COPYONLY)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E write_regv "${hkey}" "${dir}")
+
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E write_regv "${hkey}" "${dir}"
+      RESULT_VARIABLE write_regv_result)
+    if(NOT write_regv_result EQUAL 0)
+      message(SEND_ERROR "write_regv failed with result ${write_regv_result}")
+    endif()
     find_path(REGISTRY_TEST_PATH
       ${file}
-      "[${hkey}]" DOC "Registry_Test_Path")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E delete_regv "${hkey}")
+      "[${hkey}]"
+      NO_DEFAULT_PATH
+      DOC "Registry_Test_Path")
+    if(NOT REGISTRY_TEST_PATH)
+      message(SEND_ERROR "Registry value was not found after write_regv")
+    elseif(NOT EXISTS "${REGISTRY_TEST_PATH}/${file}")
+      message(SEND_ERROR "Registry-resolved path does not contain ${file}: ${REGISTRY_TEST_PATH}")
+    endif()
+
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E delete_regv "${hkey}"
+      RESULT_VARIABLE delete_regv_result)
+    if(NOT delete_regv_result EQUAL 0)
+      message(SEND_ERROR "delete_regv failed with result ${delete_regv_result}")
+    endif()
+
     execute_process(COMMAND ${CMAKE_COMMAND} -E rm -f "${dir}/${file}")
   endif ()
 endif ()