Merge lp:~alan-griffiths/mir/fix-1196987 into lp:~mir-team/mir/trunk

[Alan Griffiths]

Make gmock and umockdev dependencies of the tests, clean up, and make not building tests an option.

Make gmock and umockdev dependencies of the tests, clean up, and make not building tests an option.

[Alan Griffiths (alan-griffiths)]

This doesn't address the ugliness of needing LD_PRELOAD=libumockdev-preload.so for unit-tests - but it does address the bug report.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:803
http://jenkins.qa.ubuntu.com/job/mir-ci/891/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1023/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/129/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/540

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/891/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:805
http://jenkins.qa.ubuntu.com/job/mir-ci/893/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1140/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1025
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/541

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/893/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:805
http://jenkins.qa.ubuntu.com/job/mir-ci/898/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1147/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1032
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/544

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/898/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

seems a useful option (provided its always set to ON by default)

review: Approve

[Thomas Voß (thomas-voss)]

lines 46-55: Why do we remove these options? They still are useful if we are building in a chroot with tests enabled and I think we shouldn't remove these options.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> lines 46-55: Why do we remove these options? They still are useful if we are
> building in a chroot with tests enabled and I think we shouldn't remove these
> options.

Because all they do is output messages?

[Thomas Voß (thomas-voss)]

> > lines 46-55: Why do we remove these options? They still are useful if we are
> > building in a chroot with tests enabled and I think we shouldn't remove
> these
> > options.
>
> Because all they do is output messages?

My bad :) LGTM, then.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:806
http://jenkins.qa.ubuntu.com/job/mir-ci/905/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1159/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1044
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/550

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/905/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Dammit, in the cross-build case libumockdev is loaded into the partial chroot, but not detected by pkg_check_modules() unless installed on the host system. And my google foo has failed me. :(

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:807
http://jenkins.qa.ubuntu.com/job/mir-ci/910/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1167/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/554

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/910/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:808
http://jenkins.qa.ubuntu.com/job/mir-ci/911/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1169/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/149
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/555

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/911/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:809
http://jenkins.qa.ubuntu.com/job/mir-ci/912/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1170/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/150/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/556/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/912/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:810
http://jenkins.qa.ubuntu.com/job/mir-ci/913/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1171/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/151
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/557

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/913/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:811
http://jenkins.qa.ubuntu.com/job/mir-ci/914/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1172/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/558

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/914/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:812
http://jenkins.qa.ubuntu.com/job/mir-ci/917/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1179/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1064
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/155
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/561

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/917/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:814
http://jenkins.qa.ubuntu.com/job/mir-ci/918/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1180/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/562

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/918/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/mir-ci/919/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1181/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1066
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/563

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/919/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/mir-ci/920/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1067
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/158
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/158/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/564

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/920/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-03 21:41:28 +0000
+++ CMakeLists.txt	2013-07-05 10:16:26 +0000
@@ -110,10 +110,8 @@
 
 add_definitions(-DANDROID_USE_STD)
 
-# By default we can run our tests
-set( MIR_TESTS_AVAILABLE TRUE )
-
 if (MIR_PLATFORM STREQUAL "android")
+  find_package( PkgConfig )
   include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/3rd_party/android-deps)
   list(APPEND CMAKE_SYSTEM_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/3rd_party/android-deps")
 
@@ -131,11 +129,6 @@
   pkg_check_modules( GBM REQUIRED gbm>=9.0.0)
   pkg_check_modules( DRM REQUIRED libdrm )
   pkg_check_modules( UDEV REQUIRED libudev )
-  pkg_check_modules( UMOCKDEV umockdev-1.0 )
-  if ( NOT UMOCKDEV_FOUND )
-    message( WARNING "Umockdev not found, tests are disabled" )
-    set(MIR_TESTS_AVAILABLE FALSE)
-  endif ()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__GBM__")
 else ()
   message (FATAL_ERROR "MIR_BACKEND must be either 'android' or 'gbm'")
@@ -190,10 +183,12 @@
 # Restore -Werror for non-3rd-party code
 set (CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS})
 
-add_subdirectory(benchmarks/)
-if (MIR_TESTS_AVAILABLE)
+option(MIR_ENABLE_TESTS "Build tests" ON)
+
+if (MIR_ENABLE_TESTS)
   add_subdirectory(tests/)
 endif ()
+add_subdirectory(benchmarks/)
 add_subdirectory(tools/)
 add_subdirectory(examples/)
 add_subdirectory(guides/)

=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2013-05-10 00:39:29 +0000
+++ cross-compile-chroot.sh	2013-07-05 10:16:26 +0000
@@ -23,6 +23,10 @@
 mkdir ${BUILD_DIR}
 pushd ${BUILD_DIR} > /dev/null 
 
+    export PKG_CONFIG_PATH="${MIR_NDK_PATH}/usr/lib/pkgconfig:${MIR_NDK_PATH}/usr/lib/arm-linux-gnueabihf/pkgconfig"
+    export PKG_CONFIG_EXECUTABLE=`which pkg-config`
+    echo "Using PKG_CONFIG_PATH: $PKG_CONFIG_PATH"
+    echo "Using PKG_CONFIG_EXECUTABLE: $PKG_CONFIG_EXECUTABLE"
     cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake \
       -DBoost_COMPILER=-gcc \
       -DMIR_PLATFORM=android \

=== modified file 'debian/control'
--- debian/control	2013-07-02 00:13:55 +0000
+++ debian/control	2013-07-05 10:16:26 +0000
@@ -5,6 +5,7 @@
 XSBC-Original-Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
                cmake-data,
+               pkg-config,
                debhelper (>= 9),
                doxygen,
                xsltproc,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-07-03 23:42:13 +0000
+++ tests/CMakeLists.txt	2013-07-05 10:16:26 +0000
@@ -1,13 +1,6 @@
-if(NOT DEFINED ENV{MIR_TESTS_USE_REAL_GRAPHICS})
-  message(STATUS "Tests are NOT run with real graphics support.")
-else()
-  message(STATUS "Tests are run with real graphics.")
-endif()
-
-if(NOT DEFINED ENV{MIR_TESTS_USE_REAL_INPUT})
-  message(STATUS "Tests are NOT run with real input.")
-else()
-  message(STATUS "Tests are run with real input.")
+pkg_check_modules(UMOCKDEV umockdev-1.0)
+if (NOT UMOCKDEV_FOUND)
+  message(FATAL_ERROR "Umockdev not found, cannot build without disabling tests (via MIR_ENABLE_TESTS).")
 endif()
 
 if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")

=== modified file 'tools/setup-partial-armhf-chroot.sh'
--- tools/setup-partial-armhf-chroot.sh	2013-07-02 22:02:44 +0000
+++ tools/setup-partial-armhf-chroot.sh	2013-07-05 10:16:26 +0000
@@ -74,6 +74,7 @@
         libgles2-mesa-dev
         libxkbcommon0
         libxkbcommon-dev
+        libumockdev-dev
         liblttng-ust0
         liburcu1
         libuuid1