Merge lp:~vanvugt/mir/untest into lp:mir

[Daniel van Vugt]

Remember to honor MIR_ENABLE_TESTS and not emit tests if it's disabled.
(LP: #1352800)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1816
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2311/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/833
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/833/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/834
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/834/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/120
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2303
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10984

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

okay

review: Approve

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-04 08:51:16 +0000
+++ CMakeLists.txt	2014-08-05 09:20:55 +0000
@@ -188,33 +188,34 @@
 
 option(MIR_ENABLE_TESTS "Build tests" ON)
 
-if (MIR_ENABLE_TESTS)
-   find_package(Gtest REQUIRED)
-   include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
-   add_subdirectory(tests/)
-endif ()
 add_subdirectory(benchmarks/)
 add_subdirectory(tools/)
 add_subdirectory(examples/)
 add_subdirectory(guides/)
 add_subdirectory(cmake/)
 
-# There's no nice way to format this. Thanks CMake.
-add_test(LGPL-required
-  /bin/sh -c "! grep -rl 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/shared ${PROJECT_SOURCE_DIR}/include/shared ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform"
-)
-add_test(GPL-required
-  /bin/sh -c "! grep -rl 'GNU Lesser' ${PROJECT_SOURCE_DIR}/src/server ${PROJECT_SOURCE_DIR}/include/server ${PROJECT_SOURCE_DIR}/include/test ${PROJECT_SOURCE_DIR}/tests ${PROJECT_SOURCE_DIR}/examples"
-)
-
-add_test(NAME server-ABI-unchanged
-  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-  COMMAND sha1sum -c server-ABI-sha1sums
-)
-
-add_test(NAME client-ABI-unchanged
-  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-  COMMAND sha1sum -c client-ABI-sha1sums
-)
+if (MIR_ENABLE_TESTS)
+  find_package(Gtest REQUIRED)
+  include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
+  add_subdirectory(tests/)
+
+  # There's no nice way to format this. Thanks CMake.
+  add_test(LGPL-required
+    /bin/sh -c "! grep -rl 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/shared ${PROJECT_SOURCE_DIR}/include/shared ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform"
+  )
+  add_test(GPL-required
+    /bin/sh -c "! grep -rl 'GNU Lesser' ${PROJECT_SOURCE_DIR}/src/server ${PROJECT_SOURCE_DIR}/include/server ${PROJECT_SOURCE_DIR}/include/test ${PROJECT_SOURCE_DIR}/tests ${PROJECT_SOURCE_DIR}/examples"
+  )
+  
+  add_test(NAME server-ABI-unchanged
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    COMMAND sha1sum -c server-ABI-sha1sums
+  )
+  
+  add_test(NAME client-ABI-unchanged
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    COMMAND sha1sum -c client-ABI-sha1sums
+  )
+endif ()
 
 enable_coverage_report(mirserver)