Mir

Merge lp://qastaging/~afrantzis/mir/almost-fix-1547015-run-unit-tests-out-of-tree into lp://qastaging/mir

almost-fix-1547015-run-unit-tests-out-of-tree
Merge into development-branch

Proposed by Alexandros Frantzis on 2016-02-19

Status:

Merged

Approved by:

Alexandros Frantzis on 2016-02-22

Approved revision:

no longer in the source branch.

Merged at revision:

3326

Proposed branch:

lp://qastaging/~afrantzis/mir/almost-fix-1547015-run-unit-tests-out-of-tree

Merge into:

lp://qastaging/mir

Diff against target:

327 lines (+45/-52)

14 files modified

debian/mir-test-tools.install (+1/-1)
debian/mir-test-tools.lintian-overrides (+3/-0)
debian/rules (+9/-1)
include/test/mir_test_framework/executable_path.h (+1/-1)
tests/mir_test_framework/CMakeLists.txt (+4/-3)
tests/mir_test_framework/executable_path.cpp (+6/-6)
tests/mir_test_framework/testing-cursor-theme/CMakeLists.txt (+2/-0)
tests/mir_test_framework/udev-recordings/CMakeLists.txt (+1/-1)
tests/mir_test_framework/udev_environment.cpp (+1/-1)
tests/unit-tests/CMakeLists.txt (+13/-4)
tests/unit-tests/input/test_xcursor_loader.cpp (+1/-1)
tests/unit-tests/input_recordings/quanta_touchscreen/device.prop (+0/-30)
tests/unit-tests/test_module_deleter.cpp (+2/-2)
tests/unit-tests/test_shared_library_prober.cpp (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~afrantzis/mir/almost-fix-1547015-run-unit-tests-out-of-tree

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Cemil Azizoglu (community)		2016-02-19	Approve on 2016-02-22
Kevin DuBois (community)			Approve on 2016-02-22
Alan Griffiths			Approve on 2016-02-22
PS Jenkins bot (community)	continuous-integration		Approve on 2016-02-19
Mir CI Bot	continuous-integration		Approve on 2016-02-19
Review via email: mp+286678@code.qastaging.launchpad.net

Commit message

tests,debian: Fix various problems stopping us from running the packaged unit tests out of tree

Description of the change

tests,debian: Fix various problems stopping us from running the packaged unit tests out of tree

1. Gather all test data in build/bin/test-data (in-tree) or /usr/share/mir-test-data/ (out-of-tree/packaged) and ensure test binaries can find them in both scenarios.

2. Package the test data in mir-test-tools and work around various errors/warnings produced by lintian.

The "almost" part in the branch name refers to a currently unresolved error in ThreadedDispatcherDeathTest.exceptions_in_threadpool_trigger_terminatio we get when running the packaged mir_unit_tests on the phone.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-02-19:

FAILED: Continuous integration, rev:3326
https://mir-jenkins.ubuntu.com/job/mir-ci/341/
Executed test runs:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/341/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-02-19:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/342/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-19:

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

review: Approve (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-02-19:

What is the motivation for running the tests out of tree?

review: Abstain

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-19:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-02-22:

> What is the motivation for running the tests out of tree?

Good question, but there are somewhat justified reasons...

(a) We package them, so they should mostly work in the packaged form. Or else stop packaging them.

(b) Our phone images contain them (bug 1541262)

(c) There's a common belief that they are handy for new device bring-ups. Although that was not the original intention as we started out mocking the hardware, our tests have now grown (arguably evolved or de-evolved) into using the actual graphics hardware. So that common belief is starting to become justified.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-02-22:

(d) Recently we needed the packaged tests working in distro to help the kernel team easily bisect a kernel regression: bug 1540731

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2016-02-22:

... and the main motivation behind this fix:

(e) We need to be able to run the tests on the host architecture after we cross-compile (like we currently do in mir jenkaas for armhf).

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-02-22:

review: Approve

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-02-22:

@unit tests on device... I think that we should just split out the few tests from the integration tests that actually hit the hardware and call it mir_android_diagnostics... This would make the PES team happier (they're a bit put off that our sanity tests are a subset of a larger test suite...), and the image team happier (we're not hogging MBs of space), and us happier (our CI wouldn't have to hit these tests dependant on lightdm being stopped, system powered up, etc)

will move existing card (https://trello.com/c/PA5BkYxn) to active backlog

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-02-22:

lgtm

review: Approve

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-02-22: