Merge lp:~afrantzis/mir/fix-1362646-gmock-build-dep into lp:mir

[Alexandros Frantzis]

tests: Explicitly depend on GMock target to avoid build races (LP: #1362646)

tests: Explicitly depend on GMock target to avoid build races

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1870
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2542/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1517
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1064
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1064/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/431
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2575
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12295

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Kevin DuBois (kdub)]

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2014-08-06 15:15:35 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2014-08-28 14:39:17 +0000
@@ -59,6 +59,9 @@
 
   ${SOURCES}
 )
+
+add_dependencies(mir_acceptance_tests GMock)
+
 uses_android_input(mir_acceptance_tests)
 
 
 
=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2014-08-26 09:27:49 +0000
+++ tests/integration-tests/CMakeLists.txt	2014-08-28 14:39:17 +0000
@@ -50,6 +50,8 @@
   ${MIR_COMMON_OBJECTS}
 )
 
+add_dependencies(mir_integration_tests GMock)
+
 uses_android_input(mir_integration_tests)
 
 target_link_libraries(
 
=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt	2014-08-15 15:04:40 +0000
+++ tests/mir_test_doubles/CMakeLists.txt	2014-08-28 14:39:17 +0000
@@ -38,6 +38,9 @@
 add_library(
   mir-test-doubles STATIC
   ${TEST_UTILS_SRCS})
+
+add_dependencies(mir-test-doubles GMock)
+
 uses_android_input(mir-test-doubles)
 
 target_link_libraries(
 
=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2014-08-15 15:04:40 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2014-08-28 14:39:17 +0000
@@ -36,6 +36,9 @@
   mir-test-framework STATIC
   ${TEST_FRAMEWORK_SRCS}
 )
+
+add_dependencies(mir-test-framework GMock)
+
 uses_android_input(mir-test-framework)
 
 target_link_libraries(
 
=== modified file 'tests/performance-tests/CMakeLists.txt'
--- tests/performance-tests/CMakeLists.txt	2014-08-15 15:04:40 +0000
+++ tests/performance-tests/CMakeLists.txt	2014-08-28 14:39:17 +0000
@@ -10,6 +10,8 @@
   ${PERFORMANCE_TESTS_SOURCES}
 )
 
+add_dependencies(mir_performance_tests GMock)
+
 target_link_libraries(
   mir_performance_tests
 
 
=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-08-26 09:27:49 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-08-28 14:39:17 +0000
@@ -47,6 +47,8 @@
   ${MIR_COMMON_OBJECTS}
 )
 
+add_dependencies(mir_unit_tests GMock)
+
 uses_android_input(mir_unit_tests)
 
 target_link_libraries(