Merge lp:~saviq/unity/phablet.flatten-qmltests into lp:unity/phablet
- phablet.flatten-qmltests
- Merge into phablet
Status: | Merged |
---|---|
Approved by: | Michael Zanetti |
Approved revision: | no longer in the source branch. |
Merged at revision: | 603 |
Proposed branch: | lp:~saviq/unity/phablet.flatten-qmltests |
Merge into: | lp:unity/phablet |
Diff against target: |
478 lines (+139/-150) 26 files modified
CMakeLists.txt (+0/-1) cmake/modules/QmlTest.cmake (+76/-0) debian/rules (+0/-2) tests/CMakeLists.txt (+8/-0) tests/plugins/CMakeLists.txt (+1/-0) tests/plugins/Utils/CMakeLists.txt (+1/-1) tests/qmltests/CMakeLists.txt (+47/-82) tests/qmltests/Greeter/tst_Clock.qml (+1/-1) tests/qmltests/Panel/tst_IndicatorItem.qml (+1/-1) tests/qmltests/README (+1/-1) tests/qmltests/SideStage/tst_SideStage.qml (+1/-1) tests/qmltests/plugins/CMakeLists.txt (+2/-1) tests/qmluitests/CMakeLists.txt (+0/-11) tests/qmluitests/Components/CMakeLists.txt (+0/-10) tests/qmluitests/Dash/CMakeLists.txt (+0/-2) tests/qmluitests/Greeter/CMakeLists.txt (+0/-1) tests/qmluitests/Hud/CMakeLists.txt (+0/-3) tests/qmluitests/Hud/qml/CMakeLists.txt (+0/-1) tests/qmluitests/Launcher/CMakeLists.txt (+0/-1) tests/qmluitests/Panel/CMakeLists.txt (+0/-7) tests/qmluitests/Panel/qml/CMakeLists.txt (+0/-2) tests/unittests/CMakeLists.txt (+0/-11) tests/unittests/Components/CMakeLists.txt (+0/-7) tests/unittests/Greeter/CMakeLists.txt (+0/-1) tests/unittests/Panel/CMakeLists.txt (+0/-1) tests/unittests/SideStage/CMakeLists.txt (+0/-1) |
To merge this branch: | bzr merge lp:~saviq/unity/phablet.flatten-qmltests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Michael Zanetti (community) | Approve | ||
Unity Team | Pending | ||
Review via email: mp+159160@code.launchpad.net |
Commit message
flatten qmluitests and unittests into qmltests to reduce the test management burden
Description of the change
PS Jenkins bot (ps-jenkins) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:606
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Michi Henning (michihenning) wrote : | # |
if("${
Calling make directly like this prevents building with other build tools, such as ninja. I think the correct way to do this is to a custom target with a DEPENDS. Jussi?
Michał Sawicz (saviq) wrote : | # |
W dniu 17.04.2013 00:09, Michi Henning pisze:
> if("${qmltest_
> add_test(
>
> Calling make directly like this prevents building with other build tools, such as ninja. I think the correct way to do this is to a custom target with a DEPENDS. Jussi?
Hmm indeed, we should just as well put the same command in there.
We also have
> enable_testing()
> add_custom_
in our root level CMakeLists.txt, to support the Debian "check" target.
We could indeed go with a dependency, but how do we pass the CTEST...
there? Or is it actually needed?
--
Michał Sawicz <email address hidden>
Canonical Services Ltd.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:607
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Michał Sawicz (saviq) wrote : | # |
fixed on both accounts, although `${builder} check` will not spit out test errors by default now, I didn't find a way to set up ENVIRONMENT for all the tests.
Michael Zanetti (mzanetti) wrote : | # |
> > add_custom_
> in our root level CMakeLists.txt, to support the Debian "check" target.
> We could indeed go with a dependency, but how do we pass the CTEST...
> there? Or is it actually needed?
I'd like to keep the CTEST_OUTPUT_
I think you can set it via:
target_
(not sure on the syntax but you get the idea... export it to the environment)
Michael Zanetti (mzanetti) wrote : | # |
My understanding is that this is to simplify creating new tests etc. The tests/qmltests/
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:608
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Michał Sawicz (saviq) wrote : | # |
Unfortunately properties of targets don't propagate to their DEPENDS, so setting them on check does not actually help.
I've split the macro to a module now.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:609
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Michael Zanetti (mzanetti) wrote : | # |
still good. love the Makefile!
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Michael Zanetti (mzanetti) wrote : | # |
too bad... rest is still ok
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:611
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) : | # |
Preview Diff
1 | === modified file 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2013-04-15 01:30:58 +0000 |
3 | +++ CMakeLists.txt 2013-04-17 12:05:31 +0000 |
4 | @@ -109,7 +109,6 @@ |
5 | |
6 | # Tests |
7 | enable_testing() |
8 | -add_custom_target(check make test CTEST_OUTPUT_ON_FAILURE=1) |
9 | |
10 | # Autopilot tests |
11 | include(autopilot) |
12 | |
13 | === added file 'cmake/modules/QmlTest.cmake' |
14 | --- cmake/modules/QmlTest.cmake 1970-01-01 00:00:00 +0000 |
15 | +++ cmake/modules/QmlTest.cmake 2013-04-17 12:05:31 +0000 |
16 | @@ -0,0 +1,76 @@ |
17 | +# add_qml_test(path component_name [NO_ADD_TEST] [NO_TARGETS] |
18 | +# [TARGETS target1 [target2 [...]]] |
19 | +# [IMPORT_PATHS import_path1 [import_path2 [...]] |
20 | +# [PROPERTIES prop1 value1 [prop2 value2 [...]]]) |
21 | +# |
22 | +# NO_ADD_TEST will prevent adding the test to the "test" target |
23 | +# NO_TARGETS will prevent adding the test to any targets |
24 | +# TARGETS lists the targets the test should be added to |
25 | +# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments |
26 | +# PROPERTIES will be set on the target and test target. See CMake's set_target_properties() |
27 | +# |
28 | +# To change/set a default value for the whole test suite, prior to calling add_qml_test, set: |
29 | +# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE) |
30 | +# qmltest_DEFAULT_TARGETS |
31 | +# qmltest_DEFAULT_PROPERTIES |
32 | + |
33 | +find_program(qmltestrunner_exe qmltestrunner) |
34 | + |
35 | +if(NOT qmltestrunner_exe) |
36 | + msg(FATAL_ERROR "Could not locate qmltestrunner.") |
37 | +endif() |
38 | + |
39 | +macro(add_qml_test SUBPATH COMPONENT_NAME) |
40 | + set(options NO_ADD_TEST NO_TARGETS) |
41 | + set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES) |
42 | + |
43 | + cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN}) |
44 | + |
45 | + set(qmltest_TARGET test${COMPONENT_NAME}) |
46 | + set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME}) |
47 | + |
48 | + set(qmltestrunner_imports "") |
49 | + if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "") |
50 | + foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS}) |
51 | + list(APPEND qmltestrunner_imports "-import") |
52 | + list(APPEND qmltestrunner_imports ${IMPORT_PATH}) |
53 | + endforeach(IMPORT_PATH) |
54 | + endif() |
55 | + |
56 | + set(qmltest_command |
57 | + ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml |
58 | + ${qmltestrunner_imports} |
59 | + -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml |
60 | + -o -,txt |
61 | + ) |
62 | + |
63 | + add_custom_target(${qmltest_TARGET} ${qmltest_command}) |
64 | + |
65 | + if(NOT "${qmltest_PROPERTIES}" STREQUAL "") |
66 | + set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES}) |
67 | + elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "") |
68 | + set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES}) |
69 | + endif() |
70 | + |
71 | + if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE") |
72 | + add_test(${qmltest_TARGET} ${qmltest_command}) |
73 | + |
74 | + if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "") |
75 | + set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES}) |
76 | + elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "") |
77 | + set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES}) |
78 | + endif() |
79 | + endif("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE") |
80 | + |
81 | + if("${qmltest_NO_TARGETS}" STREQUAL "FALSE") |
82 | + if(NOT "${qmltest_TARGETS}" STREQUAL "") |
83 | + foreach(TARGET ${qmltest_TARGETS}) |
84 | + add_dependencies(${TARGET} ${qmltest_TARGET}) |
85 | + endforeach(TARGET) |
86 | + elseif(NOT "${qmltest_DEFAULT_TARGETS}" STREQUAL "") |
87 | + foreach(TARGET ${qmltest_DEFAULT_TARGETS}) |
88 | + add_dependencies(${TARGET} ${qmltest_TARGET}) |
89 | + endforeach(TARGET) |
90 | + endif() |
91 | + endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE") |
92 | +endmacro(add_qml_test) |
93 | |
94 | === modified file 'debian/rules' |
95 | --- debian/rules 2013-02-07 12:18:24 +0000 |
96 | +++ debian/rules 2013-04-17 12:05:31 +0000 |
97 | @@ -10,5 +10,3 @@ |
98 | |
99 | override_dh_install: |
100 | dh_install --fail-missing |
101 | - |
102 | - |
103 | |
104 | === added file 'tests/CMakeLists.txt' |
105 | --- tests/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
106 | +++ tests/CMakeLists.txt 2013-04-17 12:05:31 +0000 |
107 | @@ -0,0 +1,8 @@ |
108 | +add_custom_target(alltests) |
109 | +add_dependencies(alltests check) |
110 | + |
111 | +add_subdirectory(gtest) |
112 | +add_subdirectory(qmltests) |
113 | +add_subdirectory(whitespace) |
114 | +add_subdirectory(cleanincludes) |
115 | +add_subdirectory(plugins) |
116 | |
117 | === added directory 'tests/plugins' |
118 | === added file 'tests/plugins/CMakeLists.txt' |
119 | --- tests/plugins/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
120 | +++ tests/plugins/CMakeLists.txt 2013-04-17 12:05:31 +0000 |
121 | @@ -0,0 +1,1 @@ |
122 | +add_subdirectory(Utils) |
123 | |
124 | === renamed directory 'tests/unittests/plugins/Utils' => 'tests/plugins/Utils' |
125 | === modified file 'tests/plugins/Utils/CMakeLists.txt' |
126 | --- tests/unittests/plugins/Utils/CMakeLists.txt 2013-04-12 07:49:37 +0000 |
127 | +++ tests/plugins/Utils/CMakeLists.txt 2013-04-17 12:05:31 +0000 |
128 | @@ -1,6 +1,6 @@ |
129 | include_directories( |
130 | ${UtilsQmlPlugin_SOURCE_DIR} |
131 | - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../plugins/Utils |
132 | + ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Utils |
133 | ${CMAKE_CURRENT_BINARY_DIR} |
134 | ) |
135 | |
136 | |
137 | === renamed directory 'tests/qmluitests' => 'tests/qmltests' |
138 | === renamed file 'tests/CMakeLists.txt' => 'tests/qmltests/CMakeLists.txt' |
139 | --- tests/CMakeLists.txt 2013-04-12 13:21:01 +0000 |
140 | +++ tests/qmltests/CMakeLists.txt 2013-04-17 12:05:31 +0000 |
141 | @@ -1,83 +1,48 @@ |
142 | -# add_qml_test(component_name [NO_ADD_TEST] [NO_TARGETS] |
143 | -# [TARGETS target1 [target2 [...]]] |
144 | -# [IMPORT_PATHS import_path1 [import_path2 [...]] |
145 | -# [PROPERTIES prop1 value1 [prop2 value2 [...]]]) |
146 | -# |
147 | -# NO_ADD_TEST will prevent adding the test to the "make test" target |
148 | -# NO_TARGETS will prevent adding the test to any targets |
149 | -# TARGETS lists the targets the test should be added to |
150 | -# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments |
151 | -# PROPERTIES will be set on the target and test target. See CMake's set_target_properties() |
152 | -# |
153 | -# To change/set a default value for the whole test suite, prior to calling add_qml_test, set: |
154 | -# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE) |
155 | -# qmltest_DEFAULT_TARGETS |
156 | -# qmltest_DEFAULT_PROPERTIES |
157 | - |
158 | -find_program(qmltestrunner_exe qmltestrunner) |
159 | - |
160 | -if(NOT qmltestrunner_exe) |
161 | - msg(FATAL_ERROR "Could not locate qmltestrunner.") |
162 | -endif() |
163 | - |
164 | -macro(add_qml_test COMPONENT_NAME) |
165 | - set(options NO_ADD_TEST NO_TARGETS) |
166 | - set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES) |
167 | - |
168 | - cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN}) |
169 | - |
170 | - set(qmltest_TARGET test${COMPONENT_NAME}) |
171 | - set(qmltest_FILE tst_${COMPONENT_NAME}) |
172 | - |
173 | - set(qmltestrunner_imports "") |
174 | - if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "") |
175 | - foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS}) |
176 | - list(APPEND qmltestrunner_imports "-import") |
177 | - list(APPEND qmltestrunner_imports ${IMPORT_PATH}) |
178 | - endforeach(IMPORT_PATH) |
179 | - endif() |
180 | - |
181 | - add_custom_target(${qmltest_TARGET} |
182 | - ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml |
183 | - ${qmltestrunner_imports} |
184 | - -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml |
185 | - -o -,txt) |
186 | - |
187 | - if(NOT "${qmltest_PROPERTIES}" STREQUAL "") |
188 | - set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES}) |
189 | - elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "") |
190 | - set_target_properties(${qmltest_TARGET} ${qmltest_DEFAULT_PROPERTIES}) |
191 | - endif() |
192 | - |
193 | - if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE") |
194 | - add_test(${qmltest_TARGET} make ${qmltest_TARGET}) |
195 | - |
196 | - if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "") |
197 | - set_tests_properties(${qmltest_TARGET} ${qmltest_PROPERTIES}) |
198 | - elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "") |
199 | - set_tests_properties(${qmltest_TARGET} ${qmltest_DEFAULT_PROPERTIES}) |
200 | - endif() |
201 | - endif("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE") |
202 | - |
203 | - if("${qmltest_NO_TARGETS}" STREQUAL "FALSE") |
204 | - if(NOT "${qmltest_TARGETS}" STREQUAL "") |
205 | - foreach(TARGET ${qmltest_TARGETS}) |
206 | - add_dependencies(${TARGET} ${qmltest_TARGET}) |
207 | - endforeach(TARGET) |
208 | - elseif(NOT "${qmltest_DEFAULT_TARGETS}" STREQUAL "") |
209 | - foreach(TARGET ${qmltest_DEFAULT_TARGETS}) |
210 | - add_dependencies(${TARGET} ${qmltest_TARGET}) |
211 | - endforeach(TARGET) |
212 | - endif() |
213 | - endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE") |
214 | -endmacro(add_qml_test) |
215 | - |
216 | -add_custom_target(alltests) |
217 | +# add_qml_test macro |
218 | +include(QmlTest) |
219 | + |
220 | add_custom_target(qmltests) |
221 | -add_dependencies(alltests check qmltests) |
222 | - |
223 | -add_subdirectory(gtest) |
224 | -add_subdirectory(unittests) |
225 | -add_subdirectory(qmluitests) |
226 | -add_subdirectory(whitespace) |
227 | -add_subdirectory(cleanincludes) |
228 | +add_custom_target(qmlunittests) |
229 | +add_custom_target(qmluitests) |
230 | + |
231 | +add_dependencies(alltests qmltests) |
232 | + |
233 | +add_subdirectory(plugins) |
234 | + |
235 | +set(qmltest_DEFAULT_TARGETS qmlunittests qmltests) |
236 | +set(qmltest_DEFAULT_NO_ADD_TEST FALSE) |
237 | +set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal") |
238 | +add_qml_test(Components AnimationControllerWithSignals) |
239 | +add_qml_test(Components Carousel) |
240 | +add_qml_test(Components CrossFadeImage) |
241 | +add_qml_test(Components MathLocal) |
242 | +add_qml_test(Components OpenEffect) |
243 | +add_qml_test(Components RatingStars) |
244 | +add_qml_test(Components TimeLocal) |
245 | +add_qml_test(Greeter Clock) |
246 | +add_qml_test(Panel IndicatorItem) |
247 | + |
248 | +set(qmltest_DEFAULT_TARGETS qmluitests qmltests) |
249 | +set(qmltest_DEFAULT_NO_ADD_TEST TRUE) |
250 | +set(qmltest_DEFAULT_PROPERTIES "") |
251 | +add_qml_test(Components DraggingArea) |
252 | +add_qml_test(Components FilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins) |
253 | +add_qml_test(Components ListViewWithPageHeader) |
254 | +add_qml_test(Components ResponsiveFlowView) |
255 | +add_qml_test(Components ResponsiveGridView) |
256 | +add_qml_test(Components Revealer) |
257 | +add_qml_test(Components Showable) |
258 | +add_qml_test(Components Stage) |
259 | +add_qml_test(Components Tile) |
260 | +add_qml_test(Components PageHeader) |
261 | +add_qml_test(Dash DashPreview) |
262 | +add_qml_test(Dash PeoplePreview) |
263 | +add_qml_test(Greeter Greeter) |
264 | +add_qml_test(Hud Hud IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins) |
265 | +add_qml_test(Launcher Launcher) |
266 | +add_qml_test(Panel IndicatorRow IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins) |
267 | +add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins) |
268 | +add_qml_test(Panel Panel IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins) |
269 | +add_qml_test(Panel SearchIndicator) |
270 | +add_qml_test(Panel Overview) |
271 | +add_qml_test(SideStage SideStage) |
272 | |
273 | === renamed file 'tests/unittests/Components/tst_AnimationControllerWithSignals.qml' => 'tests/qmltests/Components/tst_AnimationControllerWithSignals.qml' |
274 | === renamed file 'tests/unittests/Components/tst_Carousel.qml' => 'tests/qmltests/Components/tst_Carousel.qml' |
275 | === renamed file 'tests/unittests/Components/tst_CrossFadeImage.qml' => 'tests/qmltests/Components/tst_CrossFadeImage.qml' |
276 | === renamed file 'tests/unittests/Components/tst_MathLocal.qml' => 'tests/qmltests/Components/tst_MathLocal.qml' |
277 | === renamed file 'tests/unittests/Components/tst_OpenEffect.qml' => 'tests/qmltests/Components/tst_OpenEffect.qml' |
278 | === renamed file 'tests/unittests/Components/tst_RatingStars.qml' => 'tests/qmltests/Components/tst_RatingStars.qml' |
279 | === renamed file 'tests/unittests/Components/tst_TimeLocal.qml' => 'tests/qmltests/Components/tst_TimeLocal.qml' |
280 | === renamed file 'tests/unittests/Greeter/tst_Clock.qml' => 'tests/qmltests/Greeter/tst_Clock.qml' |
281 | --- tests/unittests/Greeter/tst_Clock.qml 2013-04-10 11:09:44 +0000 |
282 | +++ tests/qmltests/Greeter/tst_Clock.qml 2013-04-17 12:05:31 +0000 |
283 | @@ -16,7 +16,7 @@ |
284 | |
285 | import QtQuick 2.0 |
286 | import QtTest 1.0 |
287 | -import "../../qmluitests" |
288 | +import ".." |
289 | import "../../../Greeter" |
290 | import Ubuntu.Components 0.1 |
291 | |
292 | |
293 | === renamed file 'tests/unittests/Panel/tst_IndicatorItem.qml' => 'tests/qmltests/Panel/tst_IndicatorItem.qml' |
294 | --- tests/unittests/Panel/tst_IndicatorItem.qml 2013-04-09 17:31:41 +0000 |
295 | +++ tests/qmltests/Panel/tst_IndicatorItem.qml 2013-04-17 12:05:31 +0000 |
296 | @@ -16,7 +16,7 @@ |
297 | |
298 | import QtQuick 2.0 |
299 | import QtTest 1.0 |
300 | -import "../../qmluitests" |
301 | +import ".." |
302 | import "../../../Panel" |
303 | import Ubuntu.Components 0.1 |
304 | |
305 | |
306 | === renamed file 'tests/README' => 'tests/qmltests/README' |
307 | --- tests/README 2013-04-09 15:43:55 +0000 |
308 | +++ tests/qmltests/README 2013-04-17 12:05:31 +0000 |
309 | @@ -4,7 +4,7 @@ |
310 | General guidelines |
311 | ================== |
312 | |
313 | -Tests under qmluitests dir should be designed in a way that they can be run either |
314 | +Tests under qmluitests target should be designed in a way that they can be run either |
315 | automatically (with qmltestrunner) or manually (with qmlscene). So make sure you |
316 | add UI controls for manual interaction and labels for monitoring output when needed. |
317 | |
318 | |
319 | === renamed directory 'tests/unittests/SideStage' => 'tests/qmltests/SideStage' |
320 | === modified file 'tests/qmltests/SideStage/tst_SideStage.qml' |
321 | --- tests/unittests/SideStage/tst_SideStage.qml 2013-04-10 23:56:47 +0000 |
322 | +++ tests/qmltests/SideStage/tst_SideStage.qml 2013-04-17 12:05:31 +0000 |
323 | @@ -16,7 +16,7 @@ |
324 | |
325 | import QtQuick 2.0 |
326 | import QtTest 1.0 |
327 | -import "../../qmluitests/" |
328 | +import ".." |
329 | import "../../../SideStage" |
330 | import Ubuntu.Components 0.1 |
331 | |
332 | |
333 | === renamed directory 'tests/unittests/plugins' => 'tests/qmltests/plugins' |
334 | === modified file 'tests/qmltests/plugins/CMakeLists.txt' |
335 | --- tests/unittests/plugins/CMakeLists.txt 2013-04-11 13:23:00 +0000 |
336 | +++ tests/qmltests/plugins/CMakeLists.txt 2013-04-17 12:05:31 +0000 |
337 | @@ -1,1 +1,2 @@ |
338 | -add_subdirectory(Utils) |
339 | \ No newline at end of file |
340 | +add_subdirectory(HudClient) |
341 | +add_subdirectory(Ubuntu) |
342 | |
343 | === renamed directory 'tests/qmluitests/Hud/qml/HudClient' => 'tests/qmltests/plugins/HudClient' |
344 | === renamed directory 'tests/qmluitests/Panel/qml/Ubuntu' => 'tests/qmltests/plugins/Ubuntu' |
345 | === removed file 'tests/qmluitests/CMakeLists.txt' |
346 | --- tests/qmluitests/CMakeLists.txt 2013-04-12 15:01:54 +0000 |
347 | +++ tests/qmluitests/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
348 | @@ -1,11 +0,0 @@ |
349 | -add_custom_target(qmluitests) |
350 | - |
351 | -set(qmltest_DEFAULT_TARGETS qmluitests qmltests) |
352 | -set(qmltest_DEFAULT_NO_ADD_TEST TRUE) |
353 | - |
354 | -add_subdirectory(Components) |
355 | -add_subdirectory(Dash) |
356 | -add_subdirectory(Greeter) |
357 | -add_subdirectory(Hud) |
358 | -add_subdirectory(Panel) |
359 | -add_subdirectory(Launcher) |
360 | |
361 | === removed file 'tests/qmluitests/Components/CMakeLists.txt' |
362 | --- tests/qmluitests/Components/CMakeLists.txt 2013-04-12 15:09:41 +0000 |
363 | +++ tests/qmluitests/Components/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
364 | @@ -1,10 +0,0 @@ |
365 | -add_qml_test(DraggingArea) |
366 | -add_qml_test(FilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins) |
367 | -add_qml_test(ListViewWithPageHeader) |
368 | -add_qml_test(ResponsiveFlowView) |
369 | -add_qml_test(ResponsiveGridView) |
370 | -add_qml_test(Revealer) |
371 | -add_qml_test(Showable) |
372 | -add_qml_test(Stage) |
373 | -add_qml_test(Tile) |
374 | -add_qml_test(PageHeader) |
375 | |
376 | === removed file 'tests/qmluitests/Dash/CMakeLists.txt' |
377 | --- tests/qmluitests/Dash/CMakeLists.txt 2013-04-11 15:05:45 +0000 |
378 | +++ tests/qmluitests/Dash/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
379 | @@ -1,2 +0,0 @@ |
380 | -add_qml_test(DashPreview) |
381 | -add_qml_test(PeoplePreview) |
382 | |
383 | === removed file 'tests/qmluitests/Greeter/CMakeLists.txt' |
384 | --- tests/qmluitests/Greeter/CMakeLists.txt 2013-04-10 09:33:47 +0000 |
385 | +++ tests/qmluitests/Greeter/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
386 | @@ -1,1 +0,0 @@ |
387 | -add_qml_test(Greeter) |
388 | |
389 | === removed file 'tests/qmluitests/Hud/CMakeLists.txt' |
390 | --- tests/qmluitests/Hud/CMakeLists.txt 2013-04-12 12:49:20 +0000 |
391 | +++ tests/qmluitests/Hud/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
392 | @@ -1,3 +0,0 @@ |
393 | -add_subdirectory(qml) |
394 | - |
395 | -add_qml_test(Hud IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml) |
396 | |
397 | === removed directory 'tests/qmluitests/Hud/qml' |
398 | === removed file 'tests/qmluitests/Hud/qml/CMakeLists.txt' |
399 | --- tests/qmluitests/Hud/qml/CMakeLists.txt 2013-04-12 08:37:35 +0000 |
400 | +++ tests/qmluitests/Hud/qml/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
401 | @@ -1,1 +0,0 @@ |
402 | -add_subdirectory(HudClient) |
403 | |
404 | === removed file 'tests/qmluitests/Launcher/CMakeLists.txt' |
405 | --- tests/qmluitests/Launcher/CMakeLists.txt 2013-04-08 17:08:40 +0000 |
406 | +++ tests/qmluitests/Launcher/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
407 | @@ -1,1 +0,0 @@ |
408 | -add_qml_test(Launcher) |
409 | |
410 | === removed file 'tests/qmluitests/Panel/CMakeLists.txt' |
411 | --- tests/qmluitests/Panel/CMakeLists.txt 2013-04-12 15:20:47 +0000 |
412 | +++ tests/qmluitests/Panel/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
413 | @@ -1,7 +0,0 @@ |
414 | -add_subdirectory(qml) |
415 | - |
416 | -add_qml_test(IndicatorRow IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml) |
417 | -add_qml_test(Indicators IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml) |
418 | -add_qml_test(Panel IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml) |
419 | -add_qml_test(SearchIndicator) |
420 | -add_qml_test(Overview) |
421 | |
422 | === removed directory 'tests/qmluitests/Panel/qml' |
423 | === removed file 'tests/qmluitests/Panel/qml/CMakeLists.txt' |
424 | --- tests/qmluitests/Panel/qml/CMakeLists.txt 2013-04-12 08:37:35 +0000 |
425 | +++ tests/qmluitests/Panel/qml/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
426 | @@ -1,2 +0,0 @@ |
427 | -add_subdirectory(Ubuntu) |
428 | - |
429 | |
430 | === removed directory 'tests/unittests' |
431 | === removed file 'tests/unittests/CMakeLists.txt' |
432 | --- tests/unittests/CMakeLists.txt 2013-04-12 15:27:55 +0000 |
433 | +++ tests/unittests/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
434 | @@ -1,11 +0,0 @@ |
435 | -add_custom_target(unittests) |
436 | - |
437 | -set(qmltest_DEFAULT_TARGETS unittests qmltests) |
438 | -set(qmltest_DEFAULT_PROPERTIES PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal") |
439 | - |
440 | -add_subdirectory(Components) |
441 | -add_subdirectory(Greeter) |
442 | -add_subdirectory(Panel) |
443 | -add_subdirectory(SideStage) |
444 | -add_subdirectory(plugins) |
445 | - |
446 | |
447 | === removed directory 'tests/unittests/Components' |
448 | === removed file 'tests/unittests/Components/CMakeLists.txt' |
449 | --- tests/unittests/Components/CMakeLists.txt 2013-04-11 13:45:53 +0000 |
450 | +++ tests/unittests/Components/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
451 | @@ -1,7 +0,0 @@ |
452 | -add_qml_test(AnimationControllerWithSignals) |
453 | -add_qml_test(Carousel) |
454 | -add_qml_test(CrossFadeImage) |
455 | -add_qml_test(MathLocal) |
456 | -add_qml_test(OpenEffect) |
457 | -add_qml_test(RatingStars) |
458 | -add_qml_test(TimeLocal) |
459 | |
460 | === removed directory 'tests/unittests/Greeter' |
461 | === removed file 'tests/unittests/Greeter/CMakeLists.txt' |
462 | --- tests/unittests/Greeter/CMakeLists.txt 2013-04-10 09:33:47 +0000 |
463 | +++ tests/unittests/Greeter/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
464 | @@ -1,1 +0,0 @@ |
465 | -add_qml_test(Clock) |
466 | |
467 | === removed directory 'tests/unittests/Panel' |
468 | === removed file 'tests/unittests/Panel/CMakeLists.txt' |
469 | --- tests/unittests/Panel/CMakeLists.txt 2013-04-09 17:27:03 +0000 |
470 | +++ tests/unittests/Panel/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
471 | @@ -1,1 +0,0 @@ |
472 | -add_qml_test(IndicatorItem) |
473 | |
474 | === removed file 'tests/unittests/SideStage/CMakeLists.txt' |
475 | --- tests/unittests/SideStage/CMakeLists.txt 2013-04-09 17:14:48 +0000 |
476 | +++ tests/unittests/SideStage/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
477 | @@ -1,1 +0,0 @@ |
478 | -add_qml_test(SideStage) |
FAILED: Continuous integration, rev:605 jenkins. qa.ubuntu. com/job/ unity-phablet- ci/559/ s-jenkins: 8080/job/ unity-phablet- qmluitests/ 354/console jenkins. qa.ubuntu. com/job/ unity-phablet- quantal- armhf-ci/ 560 jenkins. qa.ubuntu. com/job/ unity-phablet- quantal- armhf-ci/ 560/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-phablet- quantal- i386-ci/ 559 jenkins. qa.ubuntu. com/job/ unity-phablet- raring- armhf-ci/ 435 jenkins. qa.ubuntu. com/job/ unity-phablet- raring- armhf-ci/ 435/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-phablet- raring- i386-ci/ 439 jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner/ 1055
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-phablet- ci/559/ rebuild
http://