Unity

Merge lp://qastaging/~gordallott/unity/include-google-test into lp://qastaging/unity

  1. include-google-test
  2. Merge into trunk
Proposed by Gord Allott
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 2060
Proposed branch: lp://qastaging/~gordallott/unity/include-google-test
Merge into: lp://qastaging/unity
Diff against target: 107 lines (+25/-16)
2 files modified
CMakeLists.txt (+7/-0)
tests/CMakeLists.txt (+18/-16)
To merge this branch: bzr merge lp://qastaging/~gordallott/unity/include-google-test
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+96556@code.qastaging.launchpad.net

Description of the change

Includes the google test library in our build system, could use some slimming down after some investigation

UNBLOCK

To post a comment you must log in.
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/395/console reported an error when processing this lp:~gordallott/unity/include-google-test branch.
Not merging it.

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

will surely work with the new shiny gtest package in precise!

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.