1
=== modified file 'debian/mir-test-tools.install'
2
--- debian/mir-test-tools.install	2014-08-06 03:10:56 +0000
3
+++ debian/mir-test-tools.install	2014-08-29 16:22:45 +0000
4
@@ -5,3 +5,5 @@
5
5
usr/bin/mir_performance_tests
5
usr/bin/mir_performance_tests
6
6
usr/lib/*/mir/tools/libmirclientlttng.so
6
usr/lib/*/mir/tools/libmirclientlttng.so
7
7
usr/lib/*/mir/tools/libmirserverlttng.so
7
usr/lib/*/mir/tools/libmirserverlttng.so
8
8
usr/lib/*/libmir-all-bare.so.25
9
9
usr/lib/*/libmir-all-bare.so
10
8
10
11
=== modified file 'src/CMakeLists.txt'
12
--- src/CMakeLists.txt	2014-08-29 11:16:38 +0000
13
+++ src/CMakeLists.txt	2014-08-29 16:22:45 +0000
14
@@ -18,3 +18,4 @@
15
18
set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
18
set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
16
19
set(MIR_COMMON_OBJECTS ${MIR_COMMON_OBJECTS} PARENT_SCOPE)
19
set(MIR_COMMON_OBJECTS ${MIR_COMMON_OBJECTS} PARENT_SCOPE)
17
20
set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
20
set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
18
21
set(MIRSERVER_ABI ${MIRSERVER_ABI} PARENT_SCOPE)
19
21
\ No newline at end of file
22
\ No newline at end of file
20
22
23
21
=== modified file 'src/server/CMakeLists.txt'
22
--- src/server/CMakeLists.txt	2014-08-29 12:51:40 +0000
23
+++ src/server/CMakeLists.txt	2014-08-29 16:22:45 +0000
24
@@ -101,3 +101,5 @@
25
101
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
101
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
26
102
  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
102
  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
27
103
)
103
)
28
104
29
105
set(MIRSERVER_ABI ${MIRSERVER_ABI} PARENT_SCOPE)
30
104
\ No newline at end of file
106
\ No newline at end of file
31
105
107
32
=== modified file 'tests/CMakeLists.txt'
33
--- tests/CMakeLists.txt	2014-08-06 03:10:56 +0000
34
+++ tests/CMakeLists.txt	2014-08-29 16:22:45 +0000
35
@@ -29,6 +29,48 @@
36
29
option(MIR_BUILD_PERFORMANCE_TESTS "Build performance tests" ON)
29
option(MIR_BUILD_PERFORMANCE_TESTS "Build performance tests" ON)
37
30
option(MIR_BUILD_UNIT_TESTS "Build unit tests" ON)
30
option(MIR_BUILD_UNIT_TESTS "Build unit tests" ON)
38
31
31
39
32
if (MIR_BUILD_INTEGRATION_TESTS OR MIR_BUILD_UNIT_TESTS)
40
33
  add_library(mir-all-bare SHARED
41
34
    ${MIR_SERVER_OBJECTS}
42
35
    $<TARGET_OBJECTS:mirclientobjects>
43
36
    ${MIR_PLATFORM_OBJECTS}
44
37
    ${MIR_COMMON_OBJECTS}
45
38
  )
46
39
  
47
40
  target_link_libraries(mir-all-bare
48
41
    3rd_party
49
42
    mirdraw
50
43
    mirtestdraw
51
44
    mirclientrpc
52
45
    mirclientlttngstatic
53
46
  
54
47
    ${PROTOBUF_LIBRARIES}
55
48
    ${Boost_LIBRARIES}
56
49
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
57
50
    ${DRM_LDFLAGS}
58
51
    ${GBM_LDFLAGS}
59
52
    ${MIR_PLATFORM_REFERENCES}
60
53
    ${MIR_COMMON_REFERENCES}
61
54
    ${MIR_SERVER_REFERENCES}
62
55
  )
63
56
64
57
  if (MIR_TEST_PLATFORM STREQUAL "android")
65
58
  target_link_libraries(mir-all-bare 
66
59
    mirsharedandroid
67
60
    ${ANDROID_PROPERTIES_LDFLAGS}
68
61
  )
69
62
  endif()
70
63
71
64
  set_target_properties(mir-all-bare
72
65
    PROPERTIES
73
66
    SOVERSION ${MIRSERVER_ABI}
74
67
  )
75
68
76
69
  install(TARGETS mir-all-bare
77
70
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
78
71
  )
79
72
endif()
80
73
81
32
if (MIR_BUILD_ACCEPTANCE_TESTS)
74
if (MIR_BUILD_ACCEPTANCE_TESTS)
82
33
  add_subdirectory(acceptance-tests/)
75
  add_subdirectory(acceptance-tests/)
83
34
endif (MIR_BUILD_ACCEPTANCE_TESTS)
76
endif (MIR_BUILD_ACCEPTANCE_TESTS)
84
35
77
85
=== modified file 'tests/integration-tests/CMakeLists.txt'
86
--- tests/integration-tests/CMakeLists.txt	2014-08-29 12:51:40 +0000
87
+++ tests/integration-tests/CMakeLists.txt	2014-08-29 16:22:45 +0000
88
@@ -41,13 +41,10 @@
89
41
endif()
41
endif()
90
42
42
91
43
link_directories(${LIBRARY_OUTPUT_PATH})
43
link_directories(${LIBRARY_OUTPUT_PATH})
92
44
93
44
add_executable(
45
add_executable(
94
45
  mir_integration_tests
46
  mir_integration_tests
95
46
  ${INTEGRATION_TESTS_SRCS}
47
  ${INTEGRATION_TESTS_SRCS}
96
47
  ${MIR_SERVER_OBJECTS}
97
48
  $<TARGET_OBJECTS:mirclientobjects>
98
49
  ${MIR_PLATFORM_OBJECTS}
99
50
  ${MIR_COMMON_OBJECTS}
100
51
)
48
)
101
52
49
102
53
add_dependencies(mir_integration_tests GMock)
50
add_dependencies(mir_integration_tests GMock)
103
@@ -61,32 +58,16 @@
104
61
  mir-test-framework
58
  mir-test-framework
105
62
  mir-test-doubles
59
  mir-test-doubles
106
63
60
115
64
  mirdraw
61
  mir-all-bare
116
65
  mirtestdraw
62
109
66
  mirclientrpc
110
67
  mirclientlttngstatic
111
68
112
69
  3rd_party
113
70
114
71
  ${PROTOBUF_LIBRARIES}
117
72
  ${Boost_LIBRARIES}
63
  ${Boost_LIBRARIES}
118
73
  ${GTEST_BOTH_LIBRARIES}
64
  ${GTEST_BOTH_LIBRARIES}
119
74
  ${GMOCK_LIBRARY}
65
  ${GMOCK_LIBRARY}
120
75
  ${GMOCK_MAIN_LIBRARY}
66
  ${GMOCK_MAIN_LIBRARY}
121
76
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
67
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
135
77
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
68
  ${DRM_LDFLAGS}
136
78
  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
69
  ${GBM_LDFLAGS}
137
79
  ${MIR_PLATFORM_REFERENCES}
70
)
125
80
  ${MIR_COMMON_REFERENCES}
126
81
  ${MIR_SERVER_REFERENCES}
127
82
)
128
83
129
84
if (MIR_TEST_PLATFORM STREQUAL "android")
130
85
target_link_libraries(mir_integration_tests
131
86
  mirsharedandroid
132
87
  ${ANDROID_PROPERTIES_LDFLAGS}
133
88
)
134
89
endif()
138
90
71
139
91
CMAKE_DEPENDENT_OPTION(
72
CMAKE_DEPENDENT_OPTION(
140
92
  MIR_RUN_INTEGRATION_TESTS
73
  MIR_RUN_INTEGRATION_TESTS
141
93
74
142
=== modified file 'tests/unit-tests/CMakeLists.txt'
143
--- tests/unit-tests/CMakeLists.txt	2014-08-29 12:51:40 +0000
144
+++ tests/unit-tests/CMakeLists.txt	2014-08-29 16:22:45 +0000
145
@@ -41,10 +41,6 @@
146
41
41
147
42
add_executable(mir_unit_tests 
42
add_executable(mir_unit_tests 
148
43
  ${UNIT_TEST_SOURCES}
43
  ${UNIT_TEST_SOURCES}
149
44
  ${MIR_SERVER_OBJECTS}
150
45
  $<TARGET_OBJECTS:mirclientobjects>
151
46
  ${MIR_PLATFORM_OBJECTS}
152
47
  ${MIR_COMMON_OBJECTS}
153
48
)
44
)
154
49
45
155
50
add_dependencies(mir_unit_tests GMock)
46
add_dependencies(mir_unit_tests GMock)
156
@@ -54,39 +50,22 @@
157
54
target_link_libraries(
50
target_link_libraries(
158
55
  mir_unit_tests
51
  mir_unit_tests
159
56
52
160
57
  mirdraw
161
58
  mirtestdraw
162
59
  mirclientrpc
163
60
  mirclientlttngstatic
164
61
  demo-shell
165
62
166
63
  mir-test
53
  mir-test
167
64
  mir-test-doubles
54
  mir-test-doubles
168
65
  mir-test-doubles-platform
55
  mir-test-doubles-platform
169
66
  mir-test-framework
56
  mir-test-framework
170
67
57
172
68
  3rd_party
58
  demo-shell
173
59
  mir-all-bare
174
69
60
176
70
  ${PROTOBUF_LIBRARIES}
61
  ${Boost_LIBRARIES}
177
71
  ${GTEST_BOTH_LIBRARIES}
62
  ${GTEST_BOTH_LIBRARIES}
178
72
  ${GMOCK_LIBRARY}
63
  ${GMOCK_LIBRARY}
179
73
  ${GMOCK_MAIN_LIBRARY}
64
  ${GMOCK_MAIN_LIBRARY}
180
74
  ${Boost_LIBRARIES}
181
75
  ${UMOCKDEV_LIBRARIES}
182
76
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
65
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
196
77
  ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES}
66
  ${DRM_LDFLAGS}
197
78
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
67
  ${GBM_LDFLAGS}
198
79
  ${MIR_PLATFORM_REFERENCES}
68
)
186
80
  ${MIR_COMMON_REFERENCES}
187
81
  ${MIR_SERVER_REFERENCES}
188
82
)
189
83
190
84
if (MIR_TEST_PLATFORM STREQUAL "android")
191
85
target_link_libraries(mir_unit_tests 
192
86
  mirsharedandroid
193
87
  ${ANDROID_PROPERTIES_LDFLAGS}
194
88
)
195
89
endif()
199
90
69
200
91
# Umockdev uses glib, which uses the deprecated "register" allocation specifier
70
# Umockdev uses glib, which uses the deprecated "register" allocation specifier
201
92
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dregister=")
71
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dregister=")
Status:	Work in progress
Proposed branch:	lp:~alan-griffiths/mir/miromnibus
Merge into:	lp:mir
Prerequisite:	lp:~alan-griffiths/mir/integration-and-unit-tests-link-against-internals
Diff against target:	201 lines (+59/-52) 6 files modified debian/mir-test-tools.install (+2/-0) src/CMakeLists.txt (+1/-0) src/server/CMakeLists.txt (+2/-0) tests/CMakeLists.txt (+42/-0) tests/integration-tests/CMakeLists.txt (+6/-25) tests/unit-tests/CMakeLists.txt (+6/-27)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/miromnibus
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Robert Carr (community)			Abstain on 2014-09-02
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-08-29
Kevin DuBois (community)			Needs Fixing on 2014-08-28
Alexandros Frantzis (community)			Needs Fixing on 2014-08-28
Daniel van Vugt		2014-08-26	Needs Fixing on 2014-08-28
Review via email: mp+232264@code.launchpad.net