Merge lp:~vanvugt/mir/fix-1271434 into lp:mir

[Daniel van Vugt]

Avoid linking to umockdev on platforms (android) which don't yet use it.
This allows mir_unit_tests to run on touch images again (LP: #1271434)

Technically the dependency on udev is also unused on Android right now. But that's tangled up in "mirplatform", which requires further work to make conditional.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1351
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/714/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/444
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/444/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/448
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/316
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/316/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/328
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3281

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/714/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

This certainly fixes the "can't run" problem - but I wonder if this is the right fix - why did we introduce a dependency on umockdev?

review: Needs Information

[Daniel van Vugt (vanvugt)]

The change occurred in r1343. RAOF hinted that it might be used in future input testing, but obviously not yet.

As long as umockdev isn't used on Android, I'd like to not link to it. Being able to copy Mir bin+lib to a fresh touch image and instantly run all the tests is very handy.

[Alan Griffiths (alan-griffiths)]

Sure

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-01-17 06:22:01 +0000
+++ debian/control	2014-01-23 08:33:38 +0000
@@ -31,8 +31,8 @@
                libgoogle-glog-dev,
                liblttng-ust-dev,
                libxkbcommon-dev,
-               libumockdev-dev,
-               umockdev,
+               libumockdev-dev [!armhf],
+               umockdev [!armhf],
                libudev-dev,
                google-mock (>= 1.6.0+svn437),
                valgrind [!arm64],

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-01-22 08:32:55 +0000
+++ tests/CMakeLists.txt	2014-01-23 08:33:38 +0000
@@ -1,6 +1,13 @@
-pkg_check_modules(UMOCKDEV REQUIRED umockdev-1.0)
-if (NOT UMOCKDEV_FOUND)
-  message(FATAL_ERROR "Umockdev not found, cannot build without disabling tests (via MIR_ENABLE_TESTS).")
+
+if (MIR_PLATFORM STREQUAL "mesa")
+  set (UMOCKDEV_REQUIRED YES)
+endif()
+
+if (UMOCKDEV_REQUIRED)
+  pkg_check_modules(UMOCKDEV REQUIRED umockdev-1.0)
+  if (NOT UMOCKDEV_FOUND)
+    message(FATAL_ERROR "Umockdev not found, cannot build without disabling tests (via MIR_ENABLE_TESTS).")
+  endif()
 endif()
 
 include_directories(${MIR_3RD_PARTY_INCLUDE_DIRECTORIES})

=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2014-01-22 08:32:55 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2014-01-23 08:33:38 +0000
@@ -25,12 +25,13 @@
   socket_detect_server.cpp
 )
 
-include_directories(${UMOCKDEV_INCLUDE_DIRS})
-list(APPEND TEST_FRAMEWORK_SRCS
-  udev_environment.cpp
-)
-# Umockdev uses glib, which uses the deprecated "register" storage qualifier
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dregister=")
+if (UMOCKDEV_REQUIRED)
+  include_directories(${UMOCKDEV_INCLUDE_DIRS})
+  list(APPEND TEST_FRAMEWORK_SRCS udev_environment.cpp)
+  list(APPEND TEST_FRAMEWORK_LIBS ${UMOCKDEV_LIBRARIES})
+  # Umockdev uses glib, which uses the deprecated "register" storage qualifier
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dregister=")
+endif ()
 
 add_library(
   mir-test-framework STATIC
@@ -53,8 +54,6 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-target_link_libraries(
-  mir-test-framework
-
-  ${UMOCKDEV_LIBRARIES}
+target_link_libraries(mir-test-framework
+  ${TEST_FRAMEWORK_LIBS}
 )

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-01-22 08:32:55 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-01-23 08:33:38 +0000
@@ -11,9 +11,12 @@
   test_asio_main_loop.cpp
   shared_library_test.cpp
   test_raii.cpp
-  test_udev_wrapper.cpp
 )
 
+if (UMOCKDEV_REQUIRED)
+  list(APPEND UNIT_TEST_SOURCES test_udev_wrapper.cpp)
+endif ()
+
 add_subdirectory(options/)
 add_subdirectory(client/)
 add_subdirectory(compositor/)
@@ -55,13 +58,11 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-target_link_libraries(
-  mir_unit_tests
-
-  ${UMOCKDEV_LIBRARIES}
-)
-# Umockdev uses glib, which uses the deprecated "register" allocation specifier
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dregister=")
+if (UMOCKDEV_REQUIRED)
+  target_link_libraries(mir_unit_tests ${UMOCKDEV_LIBRARIES})
+  # Umockdev uses glib, which uses the deprecated "register" allocation specifier
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dregister=")
+endif ()
 
 CMAKE_DEPENDENT_OPTION(
   MIR_RUN_UNIT_TESTS
@@ -71,7 +72,11 @@
   OFF)
 
 if (MIR_RUN_UNIT_TESTS)
-  mir_discover_tests(mir_unit_tests LD_PRELOAD=libumockdev-preload.so.0)
+  if (UMOCKDEV_REQUIRED)
+    mir_discover_tests(mir_unit_tests LD_PRELOAD=libumockdev-preload.so.0)
+  else ()
+    mir_discover_tests(mir_unit_tests)
+  endif ()
 endif (MIR_RUN_UNIT_TESTS)
 
 install(