Merge lp:~cyphermox/ido/gtest-source into lp:ido/13.04
Proposed by
Mathieu Trudel-Lapierre
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Charles Kerr | ||||
Approved revision: | 126 | ||||
Merged at revision: | 124 | ||||
Proposed branch: | lp:~cyphermox/ido/gtest-source | ||||
Merge into: | lp:ido/13.04 | ||||
Diff against target: |
134 lines (+13/-69) 5 files modified
configure.ac (+1/-2) debian/changelog (+7/-0) m4/gtest.m4 (+0/-63) src/idotimeline.c (+4/-3) tests/Makefile.am (+1/-1) |
||||
To merge this branch: | bzr merge lp:~cyphermox/ido/gtest-source | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+146722@code.launchpad.net |
Commit message
Fix building against gtest/xorg-gtest.
Description of the change
Fix building against gtest/xorg-gtest. xorg-gtest provides gtest source files, and overrides GTEST_SOURCE via its own m4 file shipped in the distro. Since it's called after CHECK_GTEST, it overrides anything the previous call did -- this renders our own version of m4/gtest.m4 obsolete too.
To post a comment you must log in.
FAILED: Continuous integration, rev:124 jenkins. qa.ubuntu. com/job/ ido-ci/ 24/ jenkins. qa.ubuntu. com/job/ ido-ci/ ./build= pbuilder, distribution= coverity- raring, flavor= amd64/24/ console jenkins. qa.ubuntu. com/job/ ido-ci/ ./build= pbuilder, distribution= raring, flavor= i386/24/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ ido-ci/ 24//rebuild/?
http://