Mir

Merge lp://qastaging/~alan-griffiths/mir/fix-1196987 into lp://qastaging/~mir-team/mir/trunk

  1. fix-1196987
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 817
Proposed branch: lp://qastaging/~alan-griffiths/mir/fix-1196987
Merge into: lp://qastaging/~mir-team/mir/trunk
Diff against target: 102 lines (+14/-20)
5 files modified
CMakeLists.txt (+5/-10)
cross-compile-chroot.sh (+4/-0)
debian/control (+1/-0)
tests/CMakeLists.txt (+3/-10)
tools/setup-partial-armhf-chroot.sh (+1/-0)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/fix-1196987
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Thomas Voß (community) Approve
Kevin DuBois (community) Approve
Review via email: mp+172798@code.qastaging.launchpad.net

Commit message

Make gmock and umockdev dependencies of the tests, clean up, and make not building tests an option.

Description of the change

Make gmock and umockdev dependencies of the tests, clean up, and make not building tests an option.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

This doesn't address the ugliness of needing LD_PRELOAD=libumockdev-preload.so for unit-tests - but it does address the bug report.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:803
http://jenkins.qa.ubuntu.com/job/mir-ci/891/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1023/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/129/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/540

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/891/rebuild

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

FAILED: Continuous integration, rev:805
http://jenkins.qa.ubuntu.com/job/mir-ci/893/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1140/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1025
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/541

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/893/rebuild

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

FAILED: Continuous integration, rev:805
http://jenkins.qa.ubuntu.com/job/mir-ci/898/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1147/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1032
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/544

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/898/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

seems a useful option (provided its always set to ON by default)

review: Approve
Revision history for this message
Thomas Voß (thomas-voss) wrote :

lines 46-55: Why do we remove these options? They still are useful if we are building in a chroot with tests enabled and I think we shouldn't remove these options.

review: Needs Fixing
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> lines 46-55: Why do we remove these options? They still are useful if we are
> building in a chroot with tests enabled and I think we shouldn't remove these
> options.

Because all they do is output messages?

Revision history for this message
Thomas Voß (thomas-voss) wrote :

> > lines 46-55: Why do we remove these options? They still are useful if we are
> > building in a chroot with tests enabled and I think we shouldn't remove
> these
> > options.
>
> Because all they do is output messages?

My bad :) LGTM, then.

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

FAILED: Continuous integration, rev:806
http://jenkins.qa.ubuntu.com/job/mir-ci/905/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1159/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1044
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/550

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/905/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Dammit, in the cross-build case libumockdev is loaded into the partial chroot, but not detected by pkg_check_modules() unless installed on the host system. And my google foo has failed me. :(

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:807
http://jenkins.qa.ubuntu.com/job/mir-ci/910/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1167/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/554

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/910/rebuild

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

FAILED: Continuous integration, rev:808
http://jenkins.qa.ubuntu.com/job/mir-ci/911/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1169/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/149
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/555

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/911/rebuild

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

FAILED: Continuous integration, rev:809
http://jenkins.qa.ubuntu.com/job/mir-ci/912/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1170/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/150/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/556/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/912/rebuild

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

FAILED: Continuous integration, rev:810
http://jenkins.qa.ubuntu.com/job/mir-ci/913/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1171/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/151
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/557

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/913/rebuild

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

FAILED: Continuous integration, rev:811
http://jenkins.qa.ubuntu.com/job/mir-ci/914/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1172/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/558

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/914/rebuild

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

FAILED: Continuous integration, rev:812
http://jenkins.qa.ubuntu.com/job/mir-ci/917/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1179/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1064
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/155
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/561

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/917/rebuild

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

FAILED: Continuous integration, rev:814
http://jenkins.qa.ubuntu.com/job/mir-ci/918/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1180/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/562

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/918/rebuild

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

FAILED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/mir-ci/919/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1181/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1066
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/563

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/919/rebuild

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

PASSED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/mir-ci/920/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1067
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/158
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/158/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/564

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/920/rebuild

review: Approve (continuous-integration)

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