Mir

Merge lp:~vanvugt/mir/fix-1263724 into lp:mir

  1. fix-1263724
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Gerry Boland
Approved revision: no longer in the source branch.
Merged at revision: 1300
Proposed branch: lp:~vanvugt/mir/fix-1263724
Merge into: lp:mir
Diff against target: 13 lines (+3/-1)
1 file modified
benchmarks/CMakeLists.txt (+3/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1263724
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Gerry Boland (community) Approve
Mir development team Pending
Review via email: mp+199992@code.launchpad.net

Commit message

Fix build failure when -DMIR_ENABLE_TESTS=NO (LP: #1263724)

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

FAILED: Continuous integration, rev:1300
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/574/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/509
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/505
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/113/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/300
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/300/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/303
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/303/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/113
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/113/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/141/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2610

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/574/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

The failures are:
  (1) bug 1239955
  (2) unknown

But seemingly nothing to do with this branch.

Revision history for this message
Gerry Boland (gerboland) wrote :

Works for me, thanking you

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'benchmarks/CMakeLists.txt'
2--- benchmarks/CMakeLists.txt 2013-10-15 10:10:05 +0000
3+++ benchmarks/CMakeLists.txt 2013-12-24 03:08:23 +0000
4@@ -2,7 +2,9 @@
5 benchmarks
6 )
7
8-add_subdirectory(android-input)
9+if (MIR_ENABLE_TESTS)
10+ add_subdirectory(android-input)
11+endif ()
12 add_subdirectory(cpu)
13 add_subdirectory(memory)
14

Subscribers

People subscribed via source and target branches