4 files changed, 32 insertions, 2 deletions
diff --git a/Tests/CTestTestTimeout/CMakeLists.txt b/Tests/CTestTestTimeout/CMakeLists.txt
index 15942c8..ed7f175 100644
--- a/Tests/CTestTestTimeout/CMakeLists.txt
+++ b/Tests/CTestTestTimeout/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8)
 PROJECT(CTestTestTimeout)
 
 SET(DART_ROOT "" CACHE STRING "" FORCE)
@@ -12,7 +12,19 @@ ADD_EXECUTABLE (Timeout timeout.c)
 
 ENABLE_TESTING ()
 
-ADD_TEST (TestTimeout Timeout)
+ADD_TEST(NAME TestTimeout
+  COMMAND ${CMAKE_COMMAND} -D Timeout=$<TARGET_FILE:Timeout>
+                           -D Log=${CMAKE_CURRENT_BINARY_DIR}/timeout.log
+                           -P ${CMAKE_CURRENT_SOURCE_DIR}/timeout.cmake
+  )
 SET_TESTS_PROPERTIES(TestTimeout PROPERTIES TIMEOUT 1)
 
+ADD_TEST(NAME CheckChild
+  COMMAND ${CMAKE_COMMAND} -D Timeout=$<TARGET_FILE:Timeout>
+                           -D Log=${CMAKE_CURRENT_BINARY_DIR}/timeout.log
+                           -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake
+  )
+SET_TESTS_PROPERTIES(CheckChild PROPERTIES DEPENDS TestTimeout)
+
+
 INCLUDE (CTest)
diff --git a/Tests/CTestTestTimeout/check.cmake b/Tests/CTestTestTimeout/check.cmake
new file mode 100644
index 0000000..b16f2aa
--- /dev/null
+++ b/Tests/CTestTestTimeout/check.cmake
@@ -0,0 +1,9 @@
+# Block just as long as timeout.cmake would if it were not killed.
+execute_process(COMMAND ${Timeout})
+
+# Verify that the log is empty, which indicates that the grandchild
+# was killed before it finished sleeping.
+file(READ "${Log}" LOG)
+if(NOT "${LOG}" STREQUAL "")
+  message(FATAL_ERROR "${LOG}")
+endif()
diff --git a/Tests/CTestTestTimeout/timeout.c b/Tests/CTestTestTimeout/timeout.c
index 559b6a5..ba91bc0 100644
--- a/Tests/CTestTestTimeout/timeout.c
+++ b/Tests/CTestTestTimeout/timeout.c
@@ -4,6 +4,8 @@
 # include <unistd.h>
 #endif
 
+#include <stdio.h>
+
 int main(void)
 {
 #if defined(_WIN32)
@@ -11,5 +13,6 @@ int main(void)
 #else
   sleep(5);
 #endif
+  printf("timeout process finished sleeping!\n");
   return -1;
 }
diff --git a/Tests/CTestTestTimeout/timeout.cmake b/Tests/CTestTestTimeout/timeout.cmake
new file mode 100644
index 0000000..198cc97
--- /dev/null
+++ b/Tests/CTestTestTimeout/timeout.cmake
@@ -0,0 +1,6 @@
+# Remove the log file.
+file(REMOVE ${Log})
+
+# Run a child that sleeps longer than the timout of this test.
+# Log its output so check.cmake can verify it dies.
+execute_process(COMMAND ${Timeout} OUTPUT_FILE ${Log})