Nux

Merge lp://qastaging/~fginther/nux/add-code-coverage into lp://qastaging/nux

Proposed by Francis Ginther
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 732
Merged at revision: 732
Proposed branch: lp://qastaging/~fginther/nux/add-code-coverage
Merge into: lp://qastaging/nux
Diff against target: 259 lines (+163/-6)
7 files modified
Makefile.am (+1/-0)
Makefile.am.coverage (+49/-0)
Nux/Makefile.am (+4/-2)
NuxCore/Makefile.am (+4/-2)
NuxGraphics/Makefile.am (+4/-2)
configure.ac (+12/-0)
m4/gcov.m4 (+89/-0)
To merge this branch: bzr merge lp://qastaging/~fginther/nux/add-code-coverage
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Brandon Schaefer (community) Approve
Allan LeSage (community) Approve
Review via email: mp+138007@code.qastaging.launchpad.net

Commit message

Add code coverage reporting with coverage-html and coverage-xml targets.

Coverage reporting can be enabled with --enable-gcov.

Description of the change

Add code coverage reporting with coverage-html and coverage-xml targets.

Coverage reporting can be enabled with --enable-gcov.

Testing:
 - Built coverage targets and verified results.
 - Built in pbuilder chroot with hooks to enable gcovr report.

To post a comment you must log in.
Revision history for this message
Allan LeSage (allanlesage) wrote :

* Teensy correction restores coverage for the NuxGraphics dir:

=== modified file 'NuxGraphics/Makefile.am'
--- NuxGraphics/Makefile.am 2012-12-04 19:36:00 +0000
+++ NuxGraphics/Makefile.am 2012-12-05 15:32:28 +0000
@@ -18,7 +18,7 @@
   $(NUX_GRAPHICS_CFLAGS) \
   $(MAINTAINER_CFLAGS) \
   $(GEIS_CFLAGS) \
- $(COVERAGE_FLAGS)
+ $(COVERAGE_CFLAGS)

 libnux_graphics_@NUX_API_VERSION@_la_LIBADD = \
   $(top_builddir)/NuxCore/libnux-core-@NUX_API_VERSION@.la \

* I'll attach a diff of what was necessary to get tests running FYI.

* We could consider splitting these tests into "small" and "large" but can take that up in another MP :) .

* The choice to make "make coverage-html" et.al. not depend on "make check" is evidently a considered one to which I don't object.

Approval contingent on the small correction above.

review: Approve
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

It looks good to me, but possibly making it easier to know you need to do a make check or make check-headless before running make coverage-html would be nice. Or possibly to check if no *.gcda files are found through an error message saying to run those commands.

Otherwise looks good to me :)

Revision history for this message
Francis Ginther (fginther) wrote :

> It looks good to me, but possibly making it easier to know you need to do a
> make check or make check-headless before running make coverage-html would be
> nice. Or possibly to check if no *.gcda files are found through an error
> message saying to run those commands.
>
> Otherwise looks good to me :)

Brandon, I added make check to the two main coverage targets to make it more intuitive for developers. This still allows our jenkins automation to run make check-headless via hook scripts instead of make check and collect the results with gcovr.

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Awesome, im happy with that :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

Sorry, Jenkins failure which should be fixed now -> reapproving.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

It looks like Brandon did something weird in his branch and hence the conflict. I see some coverage related commits in bzr log --include-merged lp:nux ....

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

What the heck...all I did was a bzr merge...check it out, then a bzr revert...then did my own thing and pushed the other branch. I don't see how this should carry any info with it...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches