Merge lp:~kalikiana/midori/cmake-debug-targets into lp:~tuxator/midori/cmake-debug-targets

[Cris Dywan]

Set contained environment on tests running under tools

[Paweł Forysiuk (tuxator)]

Very nice! Thanks.

review: Approve

=== modified file 'cmake/ContainTest.cmake'
--- cmake/ContainTest.cmake	2013-08-19 00:10:08 +0000
+++ cmake/ContainTest.cmake	2013-10-01 21:41:13 +0000
@@ -15,4 +15,27 @@
                          TIMEOUT 42
                          ENVIRONMENT "${TEST_ENV}"
                          )
+
+    add_custom_target("gdb-${test_name}"
+        COMMAND env ${TEST_ENV} gdb
+        --batch -ex 'set print thread-events off'
+        -ex 'run' -ex 'bt'
+        ${CMAKE_BINARY_DIR}/tests/${UNIT}
+        )
+
+    add_custom_target("valgrind-${test_name}"
+        COMMAND env ${TEST_ENV} valgrind
+        -q --leak-check=no --num-callers=4
+        --show-possibly-lost=no
+        --undef-value-errors=yes
+        --track-origins=yes
+        ${CMAKE_BINARY_DIR}/tests/${UNIT}
+        )
+
+    add_custom_target("callgrind-${test_name}"
+        COMMAND env ${TEST_ENV} valgrind
+        --tool=callgrind
+        --callgrind-out-file=${UNIT}.callgrind
+        ${CMAKE_BINARY_DIR}/tests/${UNIT}
+        )
 endmacro(contain_test)

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-09-30 21:14:58 +0000
+++ tests/CMakeLists.txt	2013-10-01 21:41:13 +0000
@@ -47,26 +47,6 @@
                           )
     add_test(NAME ${UNIT} COMMAND ${UNIT})
     contain_test (${UNIT})
-
-    add_custom_target(gdb-${UNIT}
-                      COMMAND gdb
-                      --batch -ex 'set print thread-events off'
-                      -ex 'run' -ex 'bt'
-                      ${CMAKE_BINARY_DIR}/tests/${UNIT}
-                      )
-    add_custom_target(valgrind-${UNIT}
-                      COMMAND valgrind
-                      -q --leak-check=no --num-callers=4
-                      --show-possibly-lost=no
-                      --undef-value-errors=yes
-                      --track-origins=yes
-                      ${CMAKE_BINARY_DIR}/tests/${UNIT}
-                      )
-    add_custom_target(callgrind-${UNIT}
-                      COMMAND valgrind --tool=callgrind
-                      --callgrind-out-file=${UNIT}.callgrind
-                      ${CMAKE_BINARY_DIR}/tests/${UNIT}
-                      )
 endforeach ()
 
 file(GLOB TESTS *.sh)