From c5f0baaa8fff996b62b6c103797b68995d4c6ad4 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Fri, 3 Oct 2014 10:09:15 +0300
Subject: [PATCH] 'make testall' now correctly kills the test MaxScale process.

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e83ee7861..d0d082b3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,6 @@ add_custom_target(testall
   COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR}
   COMMAND make install
   COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -c ${CMAKE_BINARY_DIR} &>/dev/null"
-  COMMAND make test
-  COMMAND /bin/sh -c "killall -KILL maxscale"
-  COMMENT "Running full test suite")
\ No newline at end of file
+  COMMAND /bin/sh -c "make test || echo \"Test results written to: ${CMAKE_BINARY_DIR}/Testing/Temporary/\""
+  COMMAND killall maxscale
+  COMMENT "Running full test suite" VERBATIM)
\ No newline at end of file