Merge lp:~afrantzis/mir/build-options-for-tests into lp:mir

[Alexandros Frantzis]

build: Expose options to allow building but not running tests by default

build: Expose options to allow building but not running tests by default

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1264
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~afrantzis/mir/build-options-for-tests/+merge/197051/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/462/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/191
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/191/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/191/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1264
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/463/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/192
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/192/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/192/console

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Daniel van Vugt (vanvugt)]

Seems OK but I suggest there's no need for options: MIR_BUILD_*_TESTS
We only really need options for MIR_RUN_*_TESTS.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/216/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/404
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/118
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/118/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/14/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/424
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/34/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/126
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/126/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/127/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/34/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/230/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/437
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/47/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/132
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/132/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/47/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/238/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/456/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/452
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/62/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/140
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/140/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/141/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/62/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/243/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/467
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/77/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/145
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/145/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/77/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/245/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/474/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/470
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/80/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/147
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/147/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/80/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/248/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/478/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/474
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/84/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/150
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/150/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/151/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/84/console

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Note: this MP affects CMake options used by the CI scripts, so we need to coordinate with CI before landing this.

[Daniel van Vugt (vanvugt)]

We've been trying to land it for days, so please do coordinate :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1265
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/665/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/640
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/636/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/244/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/391
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/391/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/394/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/244/console

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

review: Needs Fixing (continuous-integration)

[Chris Gagnon (chris.gagnon)]

Build hooks have been added to the armhf builders approve for landing

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2014-01-10 03:59:43 +0000
+++ cmake/MirCommon.cmake	2014-01-13 17:30:43 +0000
@@ -1,11 +1,14 @@
 cmake_minimum_required (VERSION 2.6)
 # Create target to discover tests
 
-option(
+include(CMakeDependentOption)
+
+CMAKE_DEPENDENT_OPTION(
   DISABLE_GTEST_TEST_DISCOVERY
   "If set to ON, disables fancy test autodiscovery and switches back to classic add_test behavior"
   OFF
-)
+  "NOT MIR_IS_CROSS_COMPILING"
+  ON)
 
 option(
   ENABLE_MEMCHECK_OPTION
@@ -34,7 +37,7 @@
 endif(ENABLE_MEMCHECK_OPTION)
 
 function (mir_discover_tests EXECUTABLE)
-  if(BUILD_ANDROID OR DISABLE_GTEST_TEST_DISCOVERY)
+  if(DISABLE_GTEST_TEST_DISCOVERY)
     add_test(${EXECUTABLE} ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} "${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE}")
 
     if (${ARGC} GREATER 1)
@@ -81,7 +84,7 @@
 
 function (mir_add_memcheck_test)
   if (ENABLE_MEMCHECK_OPTION)
-      if(BUILD_ANDROID OR DISABLE_GTEST_TEST_DISCOVERY)
+      if(DISABLE_GTEST_TEST_DISCOVERY)
           ADD_TEST("memcheck-test" "sh" "-c" "${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} ${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error; if [ $? != 0 ]; then exit 0; else exit 1; fi")
       else()
         add_custom_target(

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-01-13 11:36:15 +0000
+++ tests/CMakeLists.txt	2014-01-13 17:30:43 +0000
@@ -23,17 +23,21 @@
   ${PROJECT_SOURCE_DIR}/include/client
   ${PROJECT_SOURCE_DIR}/include/test)
 
-option(MIR_ENABLE_ACCEPTANCE_TESTS "Build & run acceptance tests" ON)
-option(MIR_ENABLE_INTEGRATION_TESTS "Build & run integration tests" ON)
-option(MIR_ENABLE_UNIT_TESTS "Build & run unit tests" ON)
-
-add_subdirectory(acceptance-tests/)
-add_subdirectory(integration-tests/)
-
-#we check the other tests in their own cmake file
-if (MIR_ENABLE_UNIT_TESTS)
+option(MIR_BUILD_ACCEPTANCE_TESTS "Build acceptance tests" ON)
+option(MIR_BUILD_INTEGRATION_TESTS "Build integration tests" ON)
+option(MIR_BUILD_UNIT_TESTS "Build unit tests" ON)
+
+if (MIR_BUILD_ACCEPTANCE_TESTS)
+  add_subdirectory(acceptance-tests/)
+endif (MIR_BUILD_ACCEPTANCE_TESTS)
+
+if (MIR_BUILD_INTEGRATION_TESTS)
+  add_subdirectory(integration-tests/)
+endif (MIR_BUILD_INTEGRATION_TESTS)
+
+if (MIR_BUILD_UNIT_TESTS)
   add_subdirectory(unit-tests/)
-endif (MIR_ENABLE_UNIT_TESTS)
+endif (MIR_BUILD_UNIT_TESTS)
 
 add_subdirectory(mir_test/)
 add_subdirectory(mir_test_framework/)

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2014-01-13 11:36:15 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2014-01-13 17:30:43 +0000
@@ -1,3 +1,5 @@
+include(CMakeDependentOption)
+
 include_directories(
   ${CMAKE_SOURCE_DIR}
   ${PROTOBUF_INCLUDE_DIRS}
@@ -65,13 +67,16 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-if (MIR_PLATFORM STREQUAL "android")
-    #don't discover the test, we'll run it later on a phone
-else()
-    if(MIR_ENABLE_ACCEPTANCE_TESTS)
-    mir_discover_tests(mir_acceptance_tests)
-  endif()
-endif()
+CMAKE_DEPENDENT_OPTION(
+  MIR_RUN_ACCEPTANCE_TESTS
+  "Run acceptance tests as part of default testing"
+  ON
+  "MIR_BUILD_ACCEPTANCE_TESTS"
+  OFF)
+
+if (MIR_RUN_ACCEPTANCE_TESTS)
+  mir_discover_tests(mir_acceptance_tests)
+endif (MIR_RUN_ACCEPTANCE_TESTS)
 
 install(
     TARGETS mir_acceptance_tests

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2014-01-10 03:59:43 +0000
+++ tests/integration-tests/CMakeLists.txt	2014-01-13 17:30:43 +0000
@@ -1,3 +1,5 @@
+include(CMakeDependentOption)
+
 include_directories(${CMAKE_SOURCE_DIR})
 
 set(
@@ -64,13 +66,16 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-if (MIR_PLATFORM STREQUAL "android")
-  #don't discover the test, we'll run it later on a phone
-else()
-  if(MIR_ENABLE_INTEGRATION_TESTS)
-    mir_discover_tests(mir_integration_tests)
-  endif()
-endif()
+CMAKE_DEPENDENT_OPTION(
+  MIR_RUN_INTEGRATION_TESTS
+  "Run integration tests as part of default testing"
+  ON
+  "MIR_BUILD_INTEGRATION_TESTS"
+  OFF)
+
+if (MIR_RUN_INTEGRATION_TESTS)
+  mir_discover_tests(mir_integration_tests)
+endif (MIR_RUN_INTEGRATION_TESTS)
 
 install(
     TARGETS mir_integration_tests

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-01-10 03:59:43 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-01-13 17:30:43 +0000
@@ -1,3 +1,5 @@
+include(CMakeDependentOption)
+
 add_definitions(-DTEST_RECORDINGS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/input_recordings/")
 
 include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${UMOCKDEV_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
@@ -62,7 +64,16 @@
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dregister=")
 endif()
 
-mir_discover_tests(mir_unit_tests LD_PRELOAD=libumockdev-preload.so.0)
+CMAKE_DEPENDENT_OPTION(
+  MIR_RUN_UNIT_TESTS
+  "Run unit tests as part of default testing"
+  ON
+  "MIR_BUILD_UNIT_TESTS"
+  OFF)
+
+if (MIR_RUN_UNIT_TESTS)
+  mir_discover_tests(mir_unit_tests LD_PRELOAD=libumockdev-preload.so.0)
+endif (MIR_RUN_UNIT_TESTS)
 
 install(
     TARGETS mir_unit_tests