indicator-power

Merge lp:~cyphermox/indicator-power/gtest-paths into lp:indicator-power/13.04

  1. gtest-paths
  2. Merge into trunk.13.04
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 164
Merged at revision: 164
Proposed branch: lp:~cyphermox/indicator-power/gtest-paths
Merge into: lp:indicator-power/13.04
Diff against target: 14 lines (+2/-2)
1 file modified
tests/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~cyphermox/indicator-power/gtest-paths
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+144381@code.launchpad.net

Description of the change

Fix path to gtest source.

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

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=raring,flavor=armhf/27/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=raring,flavor=i386/27/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/27//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

looking good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/Makefile.am'
2--- tests/Makefile.am 2012-07-03 22:20:35 +0000
3+++ tests/Makefile.am 2013-01-22 20:06:23 +0000
4@@ -12,8 +12,8 @@
5
6 check_LIBRARIES = libgtest.a
7 nodist_libgtest_a_SOURCES = \
8- $(GTEST_SOURCE)/src/gtest-all.cc \
9- $(GTEST_SOURCE)/src/gtest_main.cc
10+ $(GTEST_SOURCE)/gtest-all.cc \
11+ $(GTEST_SOURCE)/gtest_main.cc
12
13 AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I${top_srcdir}/src -Wall -Werror
14 AM_CXXFLAGS = $(GTEST_CXXFLAGS)

Subscribers

People subscribed via source and target branches