Merge lp:~dobey/unity-scope-click/check-valgrind into lp:unity-scope-click/devel

[dobey]

Add rules for running the unit tests under valgrind.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:256
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/60/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Wonderful

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ CMakeLists.txt	2014-05-14 22:01:40 +0000
@@ -74,6 +74,17 @@
   DEPENDS test-integration-click-scope
 )
 
+# Add a custom target for running the tests under valgrind.
+add_custom_target (test-valgrind
+  DEPENDS test-click-scope-valgrind
+)
+
+# Add a custom target for running the tests under valgrind with the
+# full leak checks enabled.
+add_custom_target (test-leaks
+  DEPENDS test-click-scope-leaks
+)
+
 # Also let "make check" and partners work.
 add_custom_target (check
   DEPENDS test
@@ -82,3 +93,11 @@
 add_custom_target (check-integration
   DEPENDS test-integration
 )
+
+add_custom_target (check-valgrind
+  DEPENDS test-valgrind
+)
+
+add_custom_target (check-leaks
+  DEPENDS test-leaks
+)
\ No newline at end of file

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ scope/tests/CMakeLists.txt	2014-05-14 22:01:40 +0000
@@ -61,6 +61,15 @@
   DEPENDS ${CLICKSCOPE_TESTS_TARGET}
 )
 
+add_custom_target(test-click-scope-valgrind
+  COMMAND valgrind --tool=memcheck ${CMAKE_CURRENT_BINARY_DIR}/${CLICKSCOPE_TESTS_TARGET}
+  DEPENDS ${CLICKSCOPE_TESTS_TARGET}
+)
+
+add_custom_target(test-click-scope-leaks
+  COMMAND valgrind --tool=memcheck --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full ${CMAKE_CURRENT_BINARY_DIR}/${CLICKSCOPE_TESTS_TARGET}
+  DEPENDS ${CLICKSCOPE_TESTS_TARGET}
+)
 add_custom_target (test-click-scope-disabled
   COMMAND GTEST_ALSO_RUN_DISABLED_TESTS=1 ${CMAKE_CURRENT_BINARY_DIR}/${CLICKSCOPE_TESTS_TARGET}
   DEPENDS ${CLICKSCOPE_TESTS_TARGET}