Merge lp:~aacid/qtmir/provide_what_we_require into lp:qtmir

[Albert Astals Cid]

Check we provide the same unity-application-impl that we require

 * Are there any related MPs required for this MP to build/function as expected?
No, but you need prereq for the test not to fail

 * Did you perform an exploratory manual test run of your code change and any related functionality?
N/A

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[Gerry Boland (gerboland)]

Nice

review: Approve

[Lukáš Tinkl (lukas-kde)]

Doesn't quite work, https://launchpadlibrarian.net/305610031/buildlog_ubuntu-xenial-amd64.qtmir-gles_0.5.1+16.04.20170208-0ubuntu1_BUILDING.txt.gz

/<<BUILDDIR>>/qtmir-gles-0.5.1+16.04.20170208/tests/check-requires-provides.sh: line 5: [: : integer expression expected
Error: We require unity-shell-application=26 but only provide unity-application-impl-

review: Needs Fixing

[lp:~aacid/qtmir/provide_what_we_require]

599. By Albert Astals Cid on 2017-02-08

Skip the test for the gles build

600. By Albert Astals Cid on 2017-02-08

-only

601. By Albert Astals Cid on 2017-02-08

Fix the workaround for -gles

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:601
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/482/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4051
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4079
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3916
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3916/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3916
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3916/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3916
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3916/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3916
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3916/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3916
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3916/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3916
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3916/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/482/rebuild

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Yup, me and CI happy now

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Yes

review: Approve

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-01-18 21:31:58 +0000
+++ tests/CMakeLists.txt	2017-02-08 15:52:26 +0000
@@ -11,3 +11,9 @@
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/convert-to-gles.sh
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
+
+add_test(
+    NAME requires-provides
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/check-requires-provides.sh
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+)

=== added file 'tests/check-requires-provides.sh'
--- tests/check-requires-provides.sh	1970-01-01 00:00:00 +0000
+++ tests/check-requires-provides.sh	2017-02-08 15:52:26 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# don't run the test on the gles build
+dummy=`grep "Package: qtmir-desktop" debian/control`
+if [ $? -ne 0 ]; then
+    exit 0
+fi
+
+requires=`grep unity-shell-application= CMakeLists.txt | sed -E 's/.*=(.*)\)/\1/'`
+provides=`grep unity-application-impl- debian/control | sed -E 's/.*unity-application-impl-(.*),/\1/'`
+if [ "$requires" -eq "$provides" ]; then
+    exit 0
+else
+    echo "Error: We require unity-shell-application=$requires but provide unity-application-impl-$provides"
+    exit 1
+fi