Merge lp:~raof/mir/fix-1587569 into lp:mir

[Chris Halse Rogers]

Make mir-test-assist into a shared library.

Since we're shipping this for downstream users we might as well make it a shared library. This has a number of advantages:
*) We know that all symbols can be resolved by code we ship (this was not true), and
*) We can build it however we want without breaking downstreams.

Fixes: https://bugs.launchpad.net/mir/+bug/1587569

Ship mir-test-assist as a shared library, decoupling our compile options from downstream's.

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

FAILED: Continuous integration, rev:3526
https://mir-jenkins.ubuntu.com/job/mir-ci/1061/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1169/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1217
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1208
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1208
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1179/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1179/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1179
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1179/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/1179
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1179/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1179/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

What the?... Is it just this branch?

05:21:23 11: [ FAILED ] 10 tests, listed below:
05:21:23 11: [ FAILED ] ClientLibraryThread.handles_no_signals
05:21:23 11: [ FAILED ] ClientLibraryThread.does_not_interfere_with_client_signal_handling
05:21:24 11: [ FAILED ] ServerShutdown.normal_exit_removes_endpoint
05:21:24 11: [ FAILED ] ClientCredsTestFixture.session_authorizer_receives_pid_of_connecting_clients
05:21:24 11: [ FAILED ] ClientCredsTestFixture.authorizer_may_prevent_connection_of_clients
05:21:24 11: [ FAILED ] ServerDisconnect.is_detected_by_client
05:21:24 11: [ FAILED ] ServerDisconnect.doesnt_stop_client_calling_API_functions
05:21:24 11: [ FAILED ] ServerStartup.creates_endpoint_on_filesystem
05:21:24 11: [ FAILED ] ServerStartup.after_server_sigkilled_can_start_new_instance
05:21:24 11: [ FAILED ] UnresponsiveClient.does_not_hang_server

[Chris Halse Rogers (raof)]

The ClientCookies test appears to be leaking state, resulting in the
above valgrind errors; I'm investigating.

[Chris Halse Rogers (raof)]

Ah, OK. The problem here appears to be that ~StubInputPlatform() is duplicated; in the stub platform module and also built directly into the acceptance-tests.

Leaving it only in the input module fixes the failures, but breaks the InputPlatformProbing tests which need the typeinfo for StubInputPlatform for $REASONS.

I'll fix this tomorrow.

[lp:~raof/mir/fix-1587569]

3527. By Chris Halse Rogers on 2016-06-02

Don't include stub_input_platform.cpp twice.

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

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

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

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

SET IT ALL ON FIRE

Unmerged revisions

3527. By Chris Halse Rogers on 2016-06-02

Don't include stub_input_platform.cpp twice.

3526. By Chris Halse Rogers on 2016-06-01

Don't special-case LTO for test framework.

It would be sensible for us to only enable LTO for our main libraries, but stripping it off
ad-hoc is not the best way to do that ☺

3525. By Chris Halse Rogers on 2016-06-01

Make mir-test-assist into a shared library.

Since we're shipping this for downstream users we might as well make it a shared library. This
has a number of advantages:
*) We know that all symbols can be resolved by code we ship (this was not true), and
*) We can build it however we want without breaking downstreams.

=== modified file 'debian/mirtest-dev.install'
--- debian/mirtest-dev.install	2015-06-25 16:47:02 +0000
+++ debian/mirtest-dev.install	2016-06-02 02:14:18 +0000
@@ -1,3 +1,3 @@
 usr/include/mirtest
 usr/lib/*/pkgconfig/mirtest.pc
-usr/lib/*/libmir-test-assist.a
+usr/lib/*/libmir-test-assist.so

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-03-30 08:59:35 +0000
+++ tests/CMakeLists.txt	2016-06-02 02:14:18 +0000
@@ -96,7 +96,7 @@
 add_subdirectory(test-clients/)
 add_subdirectory(loader-tests/)
 
-add_library(mir-test-assist STATIC
+add_library(mir-test-assist SHARED
   $<TARGET_OBJECTS:mir-public-test>
   $<TARGET_OBJECTS:mir-public-test-doubles>
   $<TARGET_OBJECTS:mir-public-test-doubles-platform>
@@ -107,6 +107,9 @@
   mirclient
   mirserver
 
+  mir-test-doubles-static
+  mir-test-doubles-udev-static
+
   ${Boost_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
@@ -123,7 +126,7 @@
 )
 
 install(TARGETS mir-test-assist
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/test/mir
   DESTINATION "include/mirtest"

=== modified file 'tests/mir_test/CMakeLists.txt'
--- tests/mir_test/CMakeLists.txt	2016-05-26 02:12:27 +0000
+++ tests/mir_test/CMakeLists.txt	2016-06-02 02:14:18 +0000
@@ -1,7 +1,3 @@
-# We don't want LTO objects in a published archive (libmir-test-assist.a)
-string (REPLACE " -flto " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-string (REPLACE " -flto " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-
 add_library(mir-public-test OBJECT
   cross_process_action.cpp
   cross_process_sync.cpp

=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt	2016-05-26 02:12:27 +0000
+++ tests/mir_test_doubles/CMakeLists.txt	2016-06-02 02:14:18 +0000
@@ -70,10 +70,6 @@
   )
 endif()
 
-# We don't want LTO objects in a published archive (libmir-test-assist.a)
-string (REPLACE " -flto " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-string (REPLACE " -flto " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-
 add_library(mir-public-test-doubles OBJECT
   nested_mock_egl.cpp
   null_logger.cpp
@@ -122,3 +118,7 @@
 add_library(mir-test-doubles-udev OBJECT
   ${MIR_TEST_DOUBLES_UDEV_SRCS}
 )
+
+add_library(mir-test-doubles-udev-static STATIC
+  $<TARGET_OBJECTS:mir-test-doubles-udev>
+)

=== modified file 'tests/mir_test_doubles/mock_udev.cpp'
--- tests/mir_test_doubles/mock_udev.cpp	2016-02-15 08:46:51 +0000
+++ tests/mir_test_doubles/mock_udev.cpp	2016-06-02 02:14:18 +0000
@@ -18,6 +18,8 @@
 
 #include "mir/test/doubles/mock_udev.h"
 
+#include <dlfcn.h>
+
 namespace mtd = mir::test::doubles;
 
 namespace
@@ -39,15 +41,42 @@
 
 char const* udev_device_get_devnode(udev_device* dev)
 {
-    return global_udev->udev_device_get_devnode(dev);
+    static char const* (* const real_get_devnode)(udev_device*) =
+        reinterpret_cast<char const*(*)(udev_device*)>(dlsym(RTLD_NEXT, "udev_device_get_devnode"));
+    if (global_udev != nullptr)
+    {
+        return global_udev->udev_device_get_devnode(dev);
+    }
+    else
+    {
+        return real_get_devnode(dev);
+    }
 }
 
 char const* udev_device_get_property_value(udev_device* dev, char const* property)
 {
-    return global_udev->udev_device_get_property_value(dev, property);
+    static char const* (* const real_get_property_value)(udev_device*, char const*) =
+        reinterpret_cast<char const*(*)(udev_device*, char const*)>(dlsym(RTLD_NEXT, "udev_device_get_property_value"));
+    if (global_udev != nullptr)
+    {
+        return global_udev->udev_device_get_property_value(dev, property);
+    }
+    else
+    {
+        return real_get_property_value(dev, property);
+    }
 }
 
 udev_device* udev_device_unref(udev_device* device)
 {
-    return global_udev->udev_device_unref(device);
+    static udev_device* (* const real_device_unref)(udev_device*) =
+        reinterpret_cast<udev_device*(*)(udev_device*)>(dlsym(RTLD_NEXT, "udev_device_unref"));
+    if (global_udev != nullptr)
+    {
+        return global_udev->udev_device_unref(device);
+    }
+    else
+    {
+        return real_device_unref(device);
+    }
 }

=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2016-05-26 02:12:27 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2016-06-02 02:14:18 +0000
@@ -21,10 +21,6 @@
     -DMIR_BUILD_PREFIX="${CMAKE_BINARY_DIR}"
     )
 
-# We don't want LTO objects in a published archive (libmir-test-assist.a)
-string (REPLACE " -flto " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-string (REPLACE " -flto " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-
 add_library(mir-public-test-framework OBJECT
   any_surface.cpp
   async_server_runner.cpp
@@ -43,7 +39,6 @@
   process.cpp
   server_runner.cpp
   socket_detect_server.cpp
-  stub_input_platform.cpp
   stub_client_platform_factory.cpp
   stub_server_platform_factory.cpp
   stub_session.cpp

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2016-05-26 02:12:27 +0000
+++ tests/unit-tests/CMakeLists.txt	2016-06-02 02:14:18 +0000
@@ -135,6 +135,7 @@
 
   mir-test-static
   mir-test-framework-static
+  mirplatforminputstub
 
   ${PROTOBUF_LITE_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
@@ -169,6 +170,7 @@
 
   mir-test-static
   mir-test-framework-static
+  mirplatforminputstub
 
   ${PROTOBUF_LITE_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}