Merge lp:~bregma/unity-system-compositor/add-autopkgtest into lp:unity-system-compositor

[Stephen M. Webb]

added autopkgtest (DEP-8) support and some tests

Added autopkgtest support. Added some tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:260
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/83

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/295/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Almost all of this diff is redundant? Could you please drop all the changes removing the trailing commas from the debian/control lists? Having the trailing commas makes diffs more readable, as all the changed lines are significant.

Other than that, LGTM.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:261
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/84

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/296/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks okay to me, although not sure why some of the dependency orderings have changed in control.

review: Approve

[Alan Griffiths (alan-griffiths)]

There are unrelated changes in debian/control - are they there for a reason?

review: Needs Information

[Stephen M. Webb (bregma)]

The unrelated changes in debian/control are due to running wrap-and-sort on it like a good little Debian packager. It gets hard to remember which packages are good citizens and which are contemptuous of best practices, so I just always run it.

If it really causes a problem, I can revert that change.

[Brandon Schaefer (brandontschaefer)]

Yay for tests

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-autolanding/123/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-amd64-autolanding/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-armhf-autolanding/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-i386-autolanding/14/console

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:261
https://mir-jenkins.ubuntu.com/job/usc-ci/5/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/5/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-0-fetch/128/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/123/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/123/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/8/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/8/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/8/console

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:262
https://mir-jenkins.ubuntu.com/job/usc-ci/13/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/15/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/312
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/304
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/304
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/19/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/19/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/19/console

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

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:262
https://mir-jenkins.ubuntu.com/job/usc-ci/17/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/20
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/371
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/363
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/363
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/24
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/24/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/24
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/24/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/24
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/24/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

I'm assuming this is unintentional.
8 + libmirclient-dev (>= 0.13.0),
9 + libmirserver-dev (>= 0.13.0),
10 libglm-dev,
11 - libmirclient-dev (>= 0.19.0),
12 - libmirserver-dev (>= 0.19.0),

review: Needs Fixing

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:263
https://mir-jenkins.ubuntu.com/job/usc-ci/62/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/85
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4529
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4519
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4519
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4519
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/89
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/89/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/89
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/89/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/89
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/89/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/89
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/89/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/89
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/89/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Still a good idea imo

review: Approve

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2017-03-31 02:26:14 +0000
+++ debian/control	2017-03-31 02:26:15 +0000
@@ -51,3 +51,15 @@
  .
  This package contains the Autopilots integration tests for the Unity System
  Compositor.
+
+Package: unity-system-compositor-tests
+Architecture: any
+Depends: unity-system-compositor (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Mir System Compositor unit tests
+ This is the system compositor using the Mir display server.
+ .
+ General tests for Unity System Compositor targeted at autopkgtest runs when a
+ dependency has changed.
+

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2017-03-31 02:26:15 +0000
@@ -0,0 +1,2 @@
+Tests: mir
+Depends: unity-system-compositor-tests

=== added file 'debian/tests/mir'
--- debian/tests/mir	1970-01-01 00:00:00 +0000
+++ debian/tests/mir	2017-03-31 02:26:15 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+/usr/bin/usc_integration_tests
+exit 0

=== added file 'debian/unity-system-compositor-tests.install'
--- debian/unity-system-compositor-tests.install	1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor-tests.install	2017-03-31 02:26:15 +0000
@@ -0,0 +1,2 @@
+usr/bin/usc_integration_tests
+usr/bin/usc_test_helper_wait_for_signal

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2016-04-18 14:58:36 +0000
+++ tests/integration-tests/CMakeLists.txt	2017-03-31 02:26:15 +0000
@@ -57,3 +57,6 @@
 
 add_dependencies(usc_integration_tests GMock)
 add_dependencies(usc_integration_tests usc_test_helper_wait_for_signal)
+
+install(TARGETS usc_integration_tests usc_test_helper_wait_for_signal
+        RUNTIME DESTINATION bin)