Unity Home Scope

Merge lp:~bregma/unity-scope-home/lp-1430248 into lp:unity-scope-home

  1. lp-1430248
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 179
Merged at revision: 179
Proposed branch: lp:~bregma/unity-scope-home/lp-1430248
Merge into: lp:unity-scope-home
Diff against target: 45 lines (+9/-7)
1 file modified
m4/gcov.m4 (+9/-7)
To merge this branch: bzr merge lp:~bregma/unity-scope-home/lp-1430248
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+252434@code.launchpad.net

Commit message

m4/gcov.m4: update to current lcov version

Description of the change

Updates GCOV macro to fix a FTBFS on the Ubuntu "Vivid Vervet" dev release.

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

FAILED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/108/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-home-vivid-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-home-vivid-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-home-vivid-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-home-ci/108/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'm4/gcov.m4'
2--- m4/gcov.m4 2013-02-14 12:58:43 +0000
3+++ m4/gcov.m4 2015-03-10 13:51:46 +0000
4@@ -13,6 +13,7 @@
5 [enable coverage testing with gcov]),
6 [use_gcov=$enableval], [use_gcov=no])
7
8+ AM_CONDITIONAL(HAVE_GCOV, test "x$use_gcov" = "xyes")
9 if test "x$use_gcov" = "xyes"; then
10 # we need gcc:
11 if test "$GCC" != "yes"; then
12@@ -21,16 +22,17 @@
13
14 # Check if ccache is being used
15 AC_CHECK_PROG(SHTOOL, shtool, shtool)
16- case `$SHTOOL path $CC` in
17- *ccache*[)] gcc_ccache=yes;;
18- *[)] gcc_ccache=no;;
19- esac
20+ if test "$SHTOOL"; then
21+ AS_CASE([`$SHTOOL path $CC`],
22+ [*ccache*], [gcc_ccache=yes],
23+ [gcc_ccache=no])
24+ fi
25
26 if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
27 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
28 fi
29
30- lcov_version_list="1.6 1.7 1.8 1.9"
31+ lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
32 AC_CHECK_PROG(LCOV, lcov, lcov)
33 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
34
35@@ -70,8 +72,8 @@
36 changequote([,])
37
38 # Add the special gcc flags
39- COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
40- COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
41+ COVERAGE_CFLAGS="-O0 --coverage"
42+ COVERAGE_CXXFLAGS="-O0 --coverage"
43 COVERAGE_LDFLAGS="-lgcov"
44
45 # Check availability of gcovr

Subscribers

People subscribed via source and target branches

to all changes: