Merge lp:~dandrader/unity/phablet_fixUtilsPluginTests into lp:unity/phablet

Proposed by Daniel d'Andrada
Status: Merged
Approved by: Albert Astals Cid
Approved revision: no longer in the source branch.
Merged at revision: 663
Proposed branch: lp:~dandrader/unity/phablet_fixUtilsPluginTests
Merge into: lp:unity/phablet
Diff against target: 26 lines (+8/-7)
1 file modified
tests/plugins/Utils/CMakeLists.txt (+8/-7)
To merge this branch: bzr merge lp:~dandrader/unity/phablet_fixUtilsPluginTests
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+162789@code.launchpad.net

Commit message

Run tests for plugins/Utils as part of alltests target

Description of the change

Run tests for plugins/Utils as part of alltests target

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Good :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/plugins/Utils/CMakeLists.txt'
2--- tests/plugins/Utils/CMakeLists.txt 2013-04-17 14:02:20 +0000
3+++ tests/plugins/Utils/CMakeLists.txt 2013-05-07 14:50:31 +0000
4@@ -7,14 +7,15 @@
5 macro(run_tests)
6 set(_test_list "")
7 foreach(_test ${ARGN})
8- add_test(NAME ${_test}
9- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${_test}
10+ set(testCommand ${CMAKE_CURRENT_BINARY_DIR}/${_test}Exec
11 -o ${CMAKE_BINARY_DIR}/${_test}.xml,xunitxml
12- -o -,txt
13- )
14- add_executable(${_test} ${_test}.cpp modeltest.cpp)
15- qt5_use_modules(${_test} Test Core Qml)
16- target_link_libraries(${_test}
17+ -o -,txt)
18+ add_test(NAME ${_test} COMMAND ${testCommand})
19+ add_dependencies(alltests ${_test})
20+ add_custom_target(${_test} ${testCommand})
21+ add_executable(${_test}Exec ${_test}.cpp modeltest.cpp)
22+ qt5_use_modules(${_test}Exec Test Core Qml)
23+ target_link_libraries(${_test}Exec
24 Utils-qml
25 )
26 set(_test_list "${_test_list};${_test}")

Subscribers

People subscribed via source and target branches