Mir

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

  1. fix-1362646-gmock-build-dep
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 1873
Proposed branch: lp:~afrantzis/mir/fix-1362646-gmock-build-dep
Merge into: lp:mir
Diff against target: 80 lines (+15/-0)
6 files modified
tests/acceptance-tests/CMakeLists.txt (+3/-0)
tests/integration-tests/CMakeLists.txt (+2/-0)
tests/mir_test_doubles/CMakeLists.txt (+3/-0)
tests/mir_test_framework/CMakeLists.txt (+3/-0)
tests/performance-tests/CMakeLists.txt (+2/-0)
tests/unit-tests/CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~afrantzis/mir/fix-1362646-gmock-build-dep
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Kevin DuBois (community) Approve
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+232582@code.launchpad.net

Commit message

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

Description of the change

tests: Explicitly depend on GMock target to avoid build races

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
Kevin DuBois (kdub) :
review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/acceptance-tests/CMakeLists.txt'
2--- tests/acceptance-tests/CMakeLists.txt 2014-08-06 15:15:35 +0000
3+++ tests/acceptance-tests/CMakeLists.txt 2014-08-28 14:39:17 +0000
4@@ -59,6 +59,9 @@
5
6 ${SOURCES}
7 )
8+
9+add_dependencies(mir_acceptance_tests GMock)
10+
11 uses_android_input(mir_acceptance_tests)
12
13
14
15=== modified file 'tests/integration-tests/CMakeLists.txt'
16--- tests/integration-tests/CMakeLists.txt 2014-08-26 09:27:49 +0000
17+++ tests/integration-tests/CMakeLists.txt 2014-08-28 14:39:17 +0000
18@@ -50,6 +50,8 @@
19 ${MIR_COMMON_OBJECTS}
20 )
21
22+add_dependencies(mir_integration_tests GMock)
23+
24 uses_android_input(mir_integration_tests)
25
26 target_link_libraries(
27
28=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
29--- tests/mir_test_doubles/CMakeLists.txt 2014-08-15 15:04:40 +0000
30+++ tests/mir_test_doubles/CMakeLists.txt 2014-08-28 14:39:17 +0000
31@@ -38,6 +38,9 @@
32 add_library(
33 mir-test-doubles STATIC
34 ${TEST_UTILS_SRCS})
35+
36+add_dependencies(mir-test-doubles GMock)
37+
38 uses_android_input(mir-test-doubles)
39
40 target_link_libraries(
41
42=== modified file 'tests/mir_test_framework/CMakeLists.txt'
43--- tests/mir_test_framework/CMakeLists.txt 2014-08-15 15:04:40 +0000
44+++ tests/mir_test_framework/CMakeLists.txt 2014-08-28 14:39:17 +0000
45@@ -36,6 +36,9 @@
46 mir-test-framework STATIC
47 ${TEST_FRAMEWORK_SRCS}
48 )
49+
50+add_dependencies(mir-test-framework GMock)
51+
52 uses_android_input(mir-test-framework)
53
54 target_link_libraries(
55
56=== modified file 'tests/performance-tests/CMakeLists.txt'
57--- tests/performance-tests/CMakeLists.txt 2014-08-15 15:04:40 +0000
58+++ tests/performance-tests/CMakeLists.txt 2014-08-28 14:39:17 +0000
59@@ -10,6 +10,8 @@
60 ${PERFORMANCE_TESTS_SOURCES}
61 )
62
63+add_dependencies(mir_performance_tests GMock)
64+
65 target_link_libraries(
66 mir_performance_tests
67
68
69=== modified file 'tests/unit-tests/CMakeLists.txt'
70--- tests/unit-tests/CMakeLists.txt 2014-08-26 09:27:49 +0000
71+++ tests/unit-tests/CMakeLists.txt 2014-08-28 14:39:17 +0000
72@@ -47,6 +47,8 @@
73 ${MIR_COMMON_OBJECTS}
74 )
75
76+add_dependencies(mir_unit_tests GMock)
77+
78 uses_android_input(mir_unit_tests)
79
80 target_link_libraries(

Subscribers

People subscribed via source and target branches