Mir

Merge lp:~alan-griffiths/mir/fix-1583536 into lp:mir

Proposed by Alan Griffiths on 2016-05-19
Status: Merged
Approved by: Alan Griffiths on 2016-05-20
Approved revision: 3512
Merged at revision: 3515
Proposed branch: lp:~alan-griffiths/mir/fix-1583536
Merge into: lp:mir
Diff against target: 66 lines (+14/-2)
4 files modified
tests/mir_test/CMakeLists.txt (+4/-0)
tests/mir_test_doubles/CMakeLists.txt (+5/-1)
tests/mir_test_framework/CMakeLists.txt (+4/-0)
tests/mirtest.pc.in (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1583536
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2016-05-20
Cemil Azizoglu (community) Approve on 2016-05-19
Kevin DuBois (community) 2016-05-19 Approve on 2016-05-19
Review via email: mp+295227@code.launchpad.net

Commit message

Make the mirtest-dev package useful for downstream projects

Description of the change

1. Don't compile the mir-test-assist objects for LTO
2. Include all the objects needed to link successfully
3. Include all the transitive dependencies in the .pc

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3512
https://mir-jenkins.ubuntu.com/job/mir-ci/997/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1082/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1130
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1121
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1121
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1092/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1092
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1092/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1092
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1092/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1092
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1092/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1092
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1092/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Alan Griffiths (alan-griffiths) wrote :

Failure is lp:1576690, triggering rebuild

Kevin DuBois (kdub) wrote :

lgtm

review: Approve
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3512
https://mir-jenkins.ubuntu.com/job/mir-ci/999/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1085/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1133
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1124
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1124
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1095
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1095/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1095/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1095
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1095/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1095
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1095/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1095/console

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

review: Needs Fixing (continuous-integration)
Cemil Azizoglu (cemil-azizoglu) wrote :

ok

review: Approve
Alan Griffiths (alan-griffiths) wrote :

> FAILED: Continuous integration, rev:3512
> https://mir-jenkins.ubuntu.com/job/mir-ci/999/
> Executed test runs:
> FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1085/console
> SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1133
> SUCCESS: https://mir-
> jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1124
> SUCCESS: https://mir-
> jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1124
> SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-
> mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1095
> deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,
> compiler=clang,platform=mesa,release=vivid+overlay/1095/artifact/output/*zip*/
> output.zip
> FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-
> mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1095/console

lp:1576690

> SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-
> armhf,compiler=gcc,platform=android,release=vivid+overlay/1095
> deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-
> armhf,compiler=gcc,platform=android,release=vivid+overlay/1095/artifact/output
> /*zip*/output.zip
> SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-
> mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1095
> deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,c
> ompiler=gcc,platform=android,release=vivid+overlay/1095/artifact/output/*zip*/
> output.zip
> FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-
> mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1095/console

logged as
lp:1583970

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

Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3512
https://mir-jenkins.ubuntu.com/job/mir-ci/1005/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1095
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1143
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1134
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1134
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1105/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1105/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1105/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1105/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1105/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/mir_test/CMakeLists.txt'
2--- tests/mir_test/CMakeLists.txt 2015-06-23 16:08:35 +0000
3+++ tests/mir_test/CMakeLists.txt 2016-05-19 15:39:22 +0000
4@@ -1,3 +1,7 @@
5+# We don't want LTO objects in a published archive (libmir-test-assist.a)
6+string (REPLACE " -flto " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
7+string (REPLACE " -flto " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
8+
9 add_library(mir-public-test OBJECT
10 cross_process_action.cpp
11 cross_process_sync.cpp
12
13=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
14--- tests/mir_test_doubles/CMakeLists.txt 2016-05-04 09:06:26 +0000
15+++ tests/mir_test_doubles/CMakeLists.txt 2016-05-19 15:39:22 +0000
16@@ -16,7 +16,6 @@
17 mock_input_device.cpp
18 mock_frame_dropping_policy_factory.cpp
19 mock_timer.cpp
20- stub_buffer.cpp
21 test_protobuf_client.cpp
22 test_protobuf_socket_server.cpp
23 triggered_main_loop.cpp
24@@ -71,11 +70,16 @@
25 )
26 endif()
27
28+# We don't want LTO objects in a published archive (libmir-test-assist.a)
29+string (REPLACE " -flto " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
30+string (REPLACE " -flto " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
31+
32 add_library(mir-public-test-doubles OBJECT
33 nested_mock_egl.cpp
34 null_logger.cpp
35 stub_display_configuration.cpp ${CMAKE_SOURCE_DIR}/include/test/mir/test/doubles/stub_display_configuration.h
36 fake_display.cpp ${CMAKE_SOURCE_DIR}/include/test/mir/test/doubles/fake_display.h
37+ stub_buffer.cpp
38 )
39
40 add_library(mir-test-doubles-static STATIC
41
42=== modified file 'tests/mir_test_framework/CMakeLists.txt'
43--- tests/mir_test_framework/CMakeLists.txt 2016-03-29 07:30:50 +0000
44+++ tests/mir_test_framework/CMakeLists.txt 2016-05-19 15:39:22 +0000
45@@ -21,6 +21,10 @@
46 -DMIR_BUILD_PREFIX="${CMAKE_BINARY_DIR}"
47 )
48
49+# We don't want LTO objects in a published archive (libmir-test-assist.a)
50+string (REPLACE " -flto " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
51+string (REPLACE " -flto " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
52+
53 add_library(mir-public-test-framework OBJECT
54 any_surface.cpp
55 async_server_runner.cpp
56
57=== modified file 'tests/mirtest.pc.in'
58--- tests/mirtest.pc.in 2015-06-25 16:47:02 +0000
59+++ tests/mirtest.pc.in 2016-05-19 15:39:22 +0000
60@@ -6,5 +6,5 @@
61 Description: Mir test assist library
62 Version: @MIR_VERSION@
63 Requires: mirserver mirplatform mirclient
64-Libs: -L@LIBDIR@ -lmir-test-assist
65+Libs: -L@LIBDIR@ -lmir-test-assist -ldl
66 Cflags: -I@INCLUDEDIR@

Subscribers

People subscribed via source and target branches