mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Tests/Instrumentation: Re-home interrupt case to bottom

Browse Source 
Prepare for a future commit which adds another test suite by
consistently locating all variants at the bottom.
This commit is contained in:
Tyler Yankee
2026-07-29 12:59:21 -04:00
committed by Brad King
parent 742668c64a
commit fb200b417a
1 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/Instrumentation/RunCMakeTest.cmake
+32 -33
View File
@@ -436,39 +436,6 @@ function(instrument test)
endif()
endfunction()
if (INSTRUMENTATION_INTERRUPT_REAL)
# RunCMake.InstrumentationInterrupt runs ONLY the real-signal/
# console-event interrupt case, as it must be excluded from MemCheck.
#
# POSIX delivers a real SIGINT to a contained process group. On Windows, only
# the Ninja generator is exercised: its native tool reliably stops on the
# console event and does not re-broadcast it to the runner; the other Windows
# make-family generators are covered by the injection seam instead.
if (NOT WIN32 OR RunCMake_GENERATOR MATCHES "Ninja")
instrument(interrupt-build INTERRUPT
CHECK_SCRIPT check-interrupted.cmake
)
# Interrupt a parallel `cmake --install` with a real OS signal, proving the
# cooperative cancellation stops pending install scripts and skips the hook.
instrument(interrupt-install INSTALL_INTERRUPT
CHECK_SCRIPT check-installation-interrupted.cmake
)
# Interrupt a `ctest` run with a real OS signal, proving the scheduler stops
# launching pending tests, skips the hook, and preserves the `ctest -F`
# checkpoint so the interrupted test set can be resumed.
instrument(interrupt-test CTEST_INTERRUPT
CHECK_SCRIPT check-test-interrupted.cmake
)
# Interrupt a `ctest` run and then resume it with `ctest -F`, proving the
# checkpoint keeps the finished test (skipped on resume) but not the
# in-flight test killed by the interrupt (re-run on resume).
instrument(interrupt-test-failover CTEST_FAILOVER
CHECK_SCRIPT check-test-failover.cmake
)
endif()
return()
endif()
# Bad Queries
instrument(bad-option BAD_QUERY
CHECK_SCRIPT check-query-dir.cmake
@@ -743,3 +710,35 @@ if(NOT Skip_BUILD_MAKE_PROGRAM_Case)
)
endif()
endif()
if (INSTRUMENTATION_INTERRUPT_REAL)
# RunCMake.InstrumentationInterrupt runs ONLY the real-signal/
# console-event interrupt case, as it must be excluded from MemCheck.
#
# POSIX delivers a real SIGINT to a contained process group. On Windows, only
# the Ninja generator is exercised: its native tool reliably stops on the
# console event and does not re-broadcast it to the runner; the other Windows
# make-family generators are covered by the injection seam instead.
if (NOT WIN32 OR RunCMake_GENERATOR MATCHES "Ninja")
instrument(interrupt-build INTERRUPT
CHECK_SCRIPT check-interrupted.cmake
)
# Interrupt a parallel `cmake --install` with a real OS signal, proving the
# cooperative cancellation stops pending install scripts and skips the hook.
instrument(interrupt-install INSTALL_INTERRUPT
CHECK_SCRIPT check-installation-interrupted.cmake
)
# Interrupt a `ctest` run with a real OS signal, proving the scheduler stops
# launching pending tests, skips the hook, and preserves the `ctest -F`
# checkpoint so the interrupted test set can be resumed.
instrument(interrupt-test CTEST_INTERRUPT
CHECK_SCRIPT check-test-interrupted.cmake
)
# Interrupt a `ctest` run and then resume it with `ctest -F`, proving the
# checkpoint keeps the finished test (skipped on resume) but not the
# in-flight test killed by the interrupt (re-run on resume).
instrument(interrupt-test-failover CTEST_FAILOVER
CHECK_SCRIPT check-test-failover.cmake
)
endif()
endif()