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

[Paweł Forysiuk]

Allow running test under debug tools with cmake

[lp:~tuxator/midori/cmake-debug-targets]

6424. By Cris Dywan on 2013-10-01

Set contained environment on tests running under tools

[Cris Dywan (kalikiana)]

Nice stuff. I totally love the approach with the prefix, much simpler than what we used to have with waf.

review: Approve

=== modified file 'cmake/ContainTest.cmake'
--- cmake/ContainTest.cmake	2013-08-19 00:10:08 +0000
+++ cmake/ContainTest.cmake	2013-10-01 22:00: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-08 21:38:36 +0000
+++ tests/CMakeLists.txt	2013-10-01 22:00:13 +0000
@@ -12,45 +12,41 @@
                     ${CMAKE_BINARY_DIR}
                     "${CMAKE_BINARY_DIR}/midori"
                     )
-file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.c)
-foreach(UNIT_SRC ${TESTS})
-    string(REPLACE ".c" "" UNIT ${UNIT_SRC})
-    add_executable(${UNIT} ${UNIT_SRC})
-    add_test(NAME ${UNIT} COMMAND ${UNIT})
-    contain_test(${UNIT})
-    target_link_libraries(${UNIT}
-                          ${LIBMIDORI}
-                          )
-    set_target_properties(${UNIT} PROPERTIES
-                          COMPILE_FLAGS ${CFLAGS}
-                          )
-endforeach ()
-
-file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vala)
-foreach(UNIT_SRC ${TESTS})
-    string(REPLACE ".vala" "" UNIT ${UNIT_SRC})
-    include(ValaPrecompile)
-    vala_precompile(UNIT_SRC_C ${UNIT}
-        ${UNIT_SRC}
-    PACKAGES
-        ${PKGS}
-    OPTIONS
-        ${VALAFLAGS}
-    CUSTOM_VAPIS
-        ${EXTRA_VAPIS}
-        "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
-        "${CMAKE_SOURCE_DIR}/katze/katze.vapi"
-        "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
-    )
-    add_executable(${UNIT} ${UNIT_SRC_C})
-    add_test(NAME ${UNIT} COMMAND ${UNIT})
-    contain_test(${UNIT})
-    target_link_libraries(${UNIT}
-                          ${LIBMIDORI}
-                          )
-    set_target_properties(${UNIT} PROPERTIES
-                          COMPILE_FLAGS "${VALA_CFLAGS}"
-                          )
+file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.c *.vala)
+foreach(UNIT_SRC ${TESTS})
+    if (${UNIT_SRC} MATCHES "(.vala)$")
+        string(REPLACE ".vala" "" UNIT ${UNIT_SRC})
+        include(ValaPrecompile)
+        vala_precompile(UNIT_SRC_C ${UNIT}
+            ${UNIT_SRC}
+        PACKAGES
+            ${PKGS}
+        OPTIONS
+            ${VALAFLAGS}
+        CUSTOM_VAPIS
+            ${EXTRA_VAPIS}
+            "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
+            "${CMAKE_SOURCE_DIR}/katze/katze.vapi"
+            "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
+        )
+
+        add_executable(${UNIT} ${UNIT_SRC_C})
+        set_target_properties(${UNIT} PROPERTIES
+                              COMPILE_FLAGS "${VALA_CFLAGS}"
+                              )
+    else()
+        string(REPLACE ".c" "" UNIT ${UNIT_SRC})
+        add_executable(${UNIT} ${UNIT_SRC})
+        set_target_properties(${UNIT} PROPERTIES
+                              COMPILE_FLAGS ${CFLAGS}
+                              )
+    endif()
+
+    target_link_libraries(${UNIT}
+                          ${LIBMIDORI}
+                          )
+    add_test(NAME ${UNIT} COMMAND ${UNIT})
+    contain_test (${UNIT})
 endforeach ()
 
 file(GLOB TESTS *.sh)