diff options
| author | Olli Salli <ollisal@gmail.com> | 2010-10-01 17:35:03 +0300 |
|---|---|---|
| committer | Olli Salli <ollisal@gmail.com> | 2010-10-01 17:35:03 +0300 |
| commit | f726518059fa6801433f44212d41fba37ef8d4b0 (patch) | |
| tree | 4287a4b1dbbf9288ede75092a5a8fdd512d3b66a /cmake/modules | |
| parent | 7c2bcc8f3aa78333429ec801c5964e2ffc3571ca (diff) | |
Actually check for memory errors/slowness in *tpqt4/the test*, not /bin/sh
This was totally ridiculous...!
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/TpQt4Macros.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/modules/TpQt4Macros.cmake b/cmake/modules/TpQt4Macros.cmake index 2d01d870..0c2f281b 100644 --- a/cmake/modules/TpQt4Macros.cmake +++ b/cmake/modules/TpQt4Macros.cmake @@ -327,14 +327,14 @@ macro(tpqt4_add_generic_unit_test _fancyName _name) list(APPEND _telepathy_qt4_test_cases test-${_name}) # Valgrind and Callgrind targets - _tpqt4_add_check_targets(${_fancyName} ${_name} ${SH} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name}) + _tpqt4_add_check_targets(${_fancyName} ${_name} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name}) endmacro(tpqt4_add_generic_unit_test _fancyName _name) macro(tpqt4_add_dbus_unit_test _fancyName _name) tpqt4_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp) add_executable(test-${_name} ${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp) target_link_libraries(test-${_name} ${QT_LIBRARIES} ${QT_QTTEST_LIBRARY} telepathy-qt4 tp-qt4-tests ${ARGN}) - set(with_session_bus ${SH} ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh) + set(with_session_bus ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh) add_test(${_fancyName} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name}) list(APPEND _telepathy_qt4_test_cases test-${_name}) @@ -342,13 +342,13 @@ macro(tpqt4_add_dbus_unit_test _fancyName _name) _tpqt4_add_check_targets(${_fancyName} ${_name} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name}) endmacro(tpqt4_add_dbus_unit_test _fancyName _name) -macro(_tpqt4_add_check_targets _fancyName _name) +macro(_tpqt4_add_check_targets _fancyName _name _runnerScript) set_tests_properties(${_fancyName} PROPERTIES FAIL_REGULAR_EXPRESSION "^FAIL!") # Standard check target - add_custom_target(check-${_fancyName} ${ARGN}) + add_custom_target(check-${_fancyName} ${SH} ${_runnerScript} ${ARGN}) add_dependencies(check-${_fancyName} test-${_name}) # Lcov target @@ -360,7 +360,7 @@ macro(_tpqt4_add_check_targets _fancyName _name) add_custom_command( TARGET check-valgrind-${_fancyName} - COMMAND G_SLICE=always-malloc valgrind + COMMAND G_SLICE=always-malloc ${SH} ${_runnerScript} /usr/bin/valgrind --tool=memcheck --leak-check=full --leak-resolution=high @@ -379,7 +379,7 @@ macro(_tpqt4_add_check_targets _fancyName _name) add_dependencies(check-callgrind-${_fancyName} test-${_name}) add_custom_command( TARGET check-callgrind-${_fancyName} - COMMAND valgrind + COMMAND ${SH} ${_runnerScript} /usr/bin/valgrind --tool=callgrind --dump-instr=yes --log-file=${CMAKE_CURRENT_BINARY_DIR}/test-${_fancyName}.callgrind.log |