Unity

Merge lp:~michihenning/unity/phablet-coverage-tests into lp:unity/phablet

  1. phablet-coverage-tests
  2. Merge into phablet
Proposed by Michi Henning
Status: Merged
Approved by: Michał Sawicz
Approved revision: no longer in the source branch.
Merged at revision: 605
Proposed branch: lp:~michihenning/unity/phablet-coverage-tests
Merge into: lp:unity/phablet
Diff against target: 27 lines (+4/-4)
2 files modified
CMakeLists.txt (+0/-4)
cmake/modules/EnableCoverageReport.cmake (+4/-0)
To merge this branch: bzr merge lp:~michihenning/unity/phablet-coverage-tests
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+159268@code.launchpad.net

Commit message

Moved clean-coverage target from main CMakeLists.txt file to EnableCoverage module.

Description of the change

Moved clean-coverage target from main CMakeLists.txt file to EnableCoverage module.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:597
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/572/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/573
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/573/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/448
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1069

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/572/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-04-15 01:30:58 +0000
3+++ CMakeLists.txt 2013-04-17 00:57:28 +0000
4@@ -39,10 +39,6 @@
5 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
6 endif()
7
8-# This gets rid of any stale .gcda files. Run this if a running a binary causes lots of messages about
9-# about a "merge mismatch for summaries".
10-add_custom_target(clean-coverage COMMAND find ${CMAKE_BINARY_DIR} -name '*.gcda' | xargs rm -f)
11-
12 # Static C++ checks
13 add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
14 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
15
16=== modified file 'cmake/modules/EnableCoverageReport.cmake'
17--- cmake/modules/EnableCoverageReport.cmake 2013-02-28 10:14:01 +0000
18+++ cmake/modules/EnableCoverageReport.cmake 2013-04-17 00:57:28 +0000
19@@ -150,4 +150,8 @@
20
21 ENDIF()
22
23+ # This gets rid of any stale .gcda files. Run this if a running a binary causes lots of messages about
24+ # about a "merge mismatch for summaries".
25+ ADD_CUSTOM_TARGET(clean-coverage COMMAND find ${CMAKE_BINARY_DIR} -name '*.gcda' | xargs rm -f)
26+
27 ENDFUNCTION()

Subscribers

People subscribed via source and target branches