1
=== modified file 'tests/integration-tests/graphics/mesa/CMakeLists.txt'
2
--- tests/integration-tests/graphics/mesa/CMakeLists.txt	2015-10-08 22:12:59 +0000
3
+++ tests/integration-tests/graphics/mesa/CMakeLists.txt	2015-11-03 07:24:19 +0000
4
@@ -1,71 +1,75 @@
76
1
##############################################################################
1
if (MIR_BUILD_PLATFORM_MESA_KMS)
77
2
# mir_integration_tests_mesa-kms
2
    ##########################################################################
78
3
##############################################################################
3
    # mir_integration_tests_mesa-kms
79
4
mir_add_wrapped_executable(
4
    ##########################################################################
80
5
  mir_integration_tests_mesa-kms
5
    mir_add_wrapped_executable(
81
6
  ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_integration.cpp
6
      mir_integration_tests_mesa-kms
82
7
  ${MIR_SERVER_OBJECTS}
7
      ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_integration.cpp
83
8
  ${MIR_PLATFORM_OBJECTS}
8
      ${MIR_SERVER_OBJECTS}
84
9
  ${MIR_COMMON_OBJECTS}
9
      ${MIR_PLATFORM_OBJECTS}
85
10
  $<TARGET_OBJECTS:mirplatformgraphicsmesakmsobjects>
10
      ${MIR_COMMON_OBJECTS}
86
11
)
11
      $<TARGET_OBJECTS:mirplatformgraphicsmesakmsobjects>
87
12
12
    )
88
13
add_dependencies(mir_integration_tests_mesa-kms GMock)
13
89
14
14
    add_dependencies(mir_integration_tests_mesa-kms GMock)
90
15
target_link_libraries(
15
91
16
  mir_integration_tests_mesa-kms
16
    target_link_libraries(
92
17
17
      mir_integration_tests_mesa-kms
93
18
  mir-test-static
18
    
94
19
  mir-test-framework-static
19
      mir-test-static
95
20
  mir-test-doubles-static
20
      mir-test-framework-static
96
21
  mirclient-static
21
      mir-test-doubles-static
97
22
  mirclientrpc-static
22
      mirclient-static
98
23
  mirclientlttng-static
23
      mirclientrpc-static
99
24
  mirsharedmesaservercommon-static
24
      mirclientlttng-static
100
25
25
      mirsharedmesaservercommon-static
101
26
  ${PROTOBUF_LITE_LIBRARIES}
26
102
27
  # Mesa platform dependencies
27
      ${PROTOBUF_LITE_LIBRARIES}
103
28
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
28
      # Mesa platform dependencies
104
29
  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
29
      ${DRM_LDFLAGS} ${DRM_LIBRARIES}
105
30
)
30
      ${GBM_LDFLAGS} ${GBM_LIBRARIES}
106
31
31
    )
107
32
if (MIR_RUN_INTEGRATION_TESTS)
32
108
33
  mir_discover_tests_with_fd_leak_detection(mir_integration_tests_mesa-kms)
33
    if (MIR_RUN_INTEGRATION_TESTS)
109
34
endif (MIR_RUN_INTEGRATION_TESTS)
34
      mir_discover_tests_with_fd_leak_detection(mir_integration_tests_mesa-kms)
110
35
35
    endif (MIR_RUN_INTEGRATION_TESTS)
111
36
##############################################################################
36
endif()
112
37
# mir_integration_tests_mesa-x11
37
113
38
##############################################################################
38
if (MIR_BUILD_PLATFORM_MESA_X11)
114
39
mir_add_wrapped_executable(
39
    ##########################################################################
115
40
  mir_integration_tests_mesa-x11
40
    # mir_integration_tests_mesa-x11
116
41
  ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_integration.cpp
41
    ##########################################################################
117
42
  ${MIR_SERVER_OBJECTS}
42
    mir_add_wrapped_executable(
118
43
  ${MIR_PLATFORM_OBJECTS}
43
      mir_integration_tests_mesa-x11
119
44
  ${MIR_COMMON_OBJECTS}
44
      ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_integration.cpp
120
45
  $<TARGET_OBJECTS:mirplatformgraphicsmesax11objects>
45
      ${MIR_SERVER_OBJECTS}
121
46
  $<TARGET_OBJECTS:mirplatformservermesax11sharedresources>
46
      ${MIR_PLATFORM_OBJECTS}
122
47
)
47
      ${MIR_COMMON_OBJECTS}
123
48
48
      $<TARGET_OBJECTS:mirplatformgraphicsmesax11objects>
124
49
add_dependencies(mir_integration_tests_mesa-x11 GMock)
49
      $<TARGET_OBJECTS:mirplatformservermesax11sharedresources>
125
50
50
    )
126
51
target_link_libraries(
51
127
52
  mir_integration_tests_mesa-x11
52
    add_dependencies(mir_integration_tests_mesa-x11 GMock)
128
53
53
129
54
  mir-test-static
54
    target_link_libraries(
130
55
  mir-test-framework-static
55
      mir_integration_tests_mesa-x11
131
56
  mir-test-doubles-static
56
    
132
57
  mirclient-static
57
      mir-test-static
133
58
  mirclientrpc-static
58
      mir-test-framework-static
134
59
  mirclientlttng-static
59
      mir-test-doubles-static
135
60
  mirsharedmesaservercommon-static
60
      mirclient-static
136
61
61
      mirclientrpc-static
137
62
  ${PROTOBUF_LITE_LIBRARIES}
62
      mirclientlttng-static
138
63
  # Mesa platform dependencies
63
      mirsharedmesaservercommon-static
139
64
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
64
140
65
  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
65
      ${PROTOBUF_LITE_LIBRARIES}
141
66
  X11
66
      # Mesa platform dependencies
142
67
)
67
      ${DRM_LDFLAGS} ${DRM_LIBRARIES}
143
68
68
      ${GBM_LDFLAGS} ${GBM_LIBRARIES}
144
69
if (MIR_RUN_INTEGRATION_TESTS)
69
      X11
145
70
  mir_discover_tests_with_fd_leak_detection(mir_integration_tests_mesa-x11)
70
    )
146
71
endif (MIR_RUN_INTEGRATION_TESTS)
71
147
72
    if (MIR_RUN_INTEGRATION_TESTS)
148
73
      mir_discover_tests_with_fd_leak_detection(mir_integration_tests_mesa-x11)
149
74
    endif (MIR_RUN_INTEGRATION_TESTS)
150
75
endif()
151
72
76
152
=== modified file 'tests/unit-tests/input/CMakeLists.txt'
153
--- tests/unit-tests/input/CMakeLists.txt	2015-10-12 20:51:03 +0000
154
+++ tests/unit-tests/input/CMakeLists.txt	2015-11-03 07:24:19 +0000
155
@@ -16,7 +16,7 @@
156
16
  ${CMAKE_CURRENT_SOURCE_DIR}/test_validator.cpp
16
  ${CMAKE_CURRENT_SOURCE_DIR}/test_validator.cpp
157
17
)
17
)
158
18
18
160
19
if (MIR_TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL "mesa-x11")
19
if (MIR_BUILD_PLATFORM_MESA_X11)
161
20
list(APPEND UNIT_TEST_SOURCES
20
list(APPEND UNIT_TEST_SOURCES
162
21
    ${CMAKE_CURRENT_SOURCE_DIR}/test_x11_platform.cpp
21
    ${CMAKE_CURRENT_SOURCE_DIR}/test_x11_platform.cpp
163
22
    ${CMAKE_CURRENT_SOURCE_DIR}/test_x11_module.cpp
22
    ${CMAKE_CURRENT_SOURCE_DIR}/test_x11_module.cpp
164
23
23
165
=== modified file 'tools/setup-partial-armhf-chroot.sh'
166
--- tools/setup-partial-armhf-chroot.sh	2015-09-09 18:52:28 +0000
167
+++ tools/setup-partial-armhf-chroot.sh	2015-11-03 07:24:19 +0000
168
@@ -63,17 +63,12 @@
169
63
fi
63
fi
170
64
64
171
65
directory=${1}
65
directory=${1}
173
66
echo "creating phablet-compatible armhf partial chroot for mir compilation in directory ${directory}"
66
echo "creating phablet-compatible $arch partial chroot for mir compilation in directory ${directory}"
174
67
67
175
68
if [ ! -d ${directory} ]; then
68
if [ ! -d ${directory} ]; then
176
69
    mkdir -p ${directory} 
69
    mkdir -p ${directory} 
177
70
fi
70
fi
178
71
71
179
72
arch=armhf
180
73
if [ ! -z "$3" ]; then
181
74
    arch=$3
182
75
fi
183
76
184
77
DEBCONTROL=$(pwd)/../debian/control
72
DEBCONTROL=$(pwd)/../debian/control
185
78
73
186
79
pushd ${directory} > /dev/null
74
pushd ${directory} > /dev/null
Reviewer	Review Type	Date Requested	Status
Alexandros Frantzis (community)		2015-10-29	Approve on 2015-11-03
PS Jenkins bot (community)	continuous-integration		Approve on 2015-11-03
Andreas Pokorny (community)		2015-10-28	Approve on 2015-10-29
Review via email: mp+275950@code.launchpad.net