1
=== modified file '.bzrignore'
2
--- .bzrignore	2015-11-30 15:39:52 +0000
3
+++ .bzrignore	2016-06-03 15:39:58 +0000
4
@@ -3,23 +3,60 @@
5
3
.qmake.cache
3
.qmake.cache
6
4
.rcc
4
.rcc
7
5
qml
5
qml
8
6
include
9
7
lib
10
8
mkspecs/*
11
6
9
12
7
Makefile*
10
Makefile*
13
8
documentation/html/*
11
documentation/html/*
14
9
*.moc
12
*.moc
15
10
moc_*.cpp
13
moc_*.cpp
16
11
qrc_tst_*.cpp
14
qrc_tst_*.cpp
22
12
tests/test_tst_*.xml
15
23
13
tests/tst_*.qml.xml
16
tests/*.xml
19
14
tests/unit*/tst_*/tst_*
20
15
tests/unit/tst_*/tst_*/tst_*
21
16
tests/unit*/testparser/testparser
24
17
plugins.qmltypes
17
plugins.qmltypes
30
18
po/*.mo
18
*.mo
26
19
examples/ubuntu-ui-toolkit-gallery/po/*.mo
27
20
tests/unit/tst_i18n/tst_*/*/share/locale/en/LC_MESSAGES/*.mo
28
21
tests/unit/tst_i18n/*/share/locale/en/LC_MESSAGES/*.mo
29
22
tests/unit/tst_units/dpr*/dpr*
31
23
apicheck/apicheck
19
apicheck/apicheck
32
24
ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher
20
ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher
33
25
build_paths.inc
21
build_paths.inc
34
22
35
23
components.api.new
36
24
app-launch-profiler/app-launch-tracepoints
37
25
tests/unit/alarms/alarms
38
26
tests/unit/animator/animator
39
27
tests/unit/argument/argument
40
28
tests/unit/arguments/arguments
41
29
tests/unit/asyncloader/asyncloader
42
30
tests/unit/bottomedge/bottomedge
43
31
tests/unit/components/components
44
32
tests/unit/components_benchmark/components_benchmark
45
33
tests/unit/deprecated_theme_engine/deprecated_theme_engine
46
34
tests/unit/i18n/LocalizedApp/LocalizedApp
47
35
tests/unit/i18n/RelativeTime/RelativeTime
48
36
tests/unit/iconprovider/iconprovider
49
37
tests/unit/inversemousearea/inversemousearea
50
38
tests/unit/layouts/layouts
51
39
tests/unit/mainview/mainview
52
40
tests/unit/mousefilters/mousefilters
53
41
tests/unit/orientation/orientation
54
42
tests/unit/page/page
55
43
tests/unit/performance/performance
56
44
tests/unit/qquick_image_extension/qquick_image_extension
57
45
tests/unit/quickutils/quickutils
58
46
tests/unit/recreateview/recreateview
59
47
tests/unit/scaling_image_provider/scaling_image_provider
60
48
tests/unit/serviceproperties/serviceproperties
61
49
tests/unit/statesaver/statesaver
62
50
tests/unit/subtheming/subtheming
63
51
tests/unit/swipearea/swipearea
64
52
tests/unit/test/test
65
53
tests/unit/testparser/testparser
66
54
tests/unit/theme/theme
67
55
tests/unit/touchregistry/touchregistry
68
56
tests/unit/tree/tree
69
57
tests/unit/ubuntu_shape/ubuntu_shape
70
58
tests/unit/units/dpr1/dpr1
71
59
tests/unit/units/dpr2/dpr2
72
60
tests/unit/units/dpr3/dpr3
73
61
tests/unit/units/scale/scale
74
62
tests/unit/visual/visual
75
26
63
76
=== modified file 'tests/checkresults.sh'
77
--- tests/checkresults.sh	2016-04-13 09:51:21 +0000
78
+++ tests/checkresults.sh	2016-06-03 15:39:58 +0000
79
@@ -24,34 +24,35 @@
80
24
FATAL_WARNINGS=0
24
FATAL_WARNINGS=0
81
25
EXCEPTED=0
25
EXCEPTED=0
82
26
for _XML in $*; do
26
for _XML in $*; do
84
27
    _TESTNAME=$(basename $_XML | sed -r 's@test_(.+)\.xml@\1@' -)
27
    _TESTNAME=$(basename $_XML | sed -r 's@(.+)\.xml@\1@' -)
85
28
28
86
29
    if [ ! -f $_XML ]; then
29
    if [ ! -f $_XML ]; then
87
30
      echo "$_XML doesn't exist"
30
      echo "$_XML doesn't exist"
88
31
      exit 1
31
      exit 1
89
32
    fi
32
    fi
90
33
33
92
34
    EXCEPTIONS='tst_components_benchmark \
34
    EXCEPTIONS='components_benchmark \
93
35
                tst_tabbar.qml \
35
                tst_tabbar.qml \
94
36
                tst_datepicker12.bug1567840.SEGFAULT.qml \
36
                tst_datepicker12.bug1567840.SEGFAULT.qml \
95
37
                tst_datepicker13.bug1567840.SEGFAULT.qml \
37
                tst_datepicker13.bug1567840.SEGFAULT.qml \
98
38
                tst_swipearea \
38
                tst_textinput_touch.SEGFAULT.qml \
99
39
                tst_qquick_image_extension \
39
                swipearea \
100
40
                qquick_image_extension \
101
40
                tst_page.qml \
41
                tst_page.qml \
102
41
                tst_toolbar.qml \
42
                tst_toolbar.qml \
103
42
                tst_label13.qml \
43
                tst_label13.qml \
105
43
                tst_performance \
44
                performance \
106
44
                tst_tabs.qml \
45
                tst_tabs.qml \
107
45
                tst_focus.qml \
46
                tst_focus.qml \
108
46
                tst_pickerpanel.qml \
47
                tst_pickerpanel.qml \
109
47
                tst_picker.qml \
48
                tst_picker.qml \
110
48
                tst_picker13.qml \
49
                tst_picker13.qml \
114
49
                tst_recreateview \
50
                recreateview \
115
50
                tst_touchregistry \
51
                touchregistry \
116
51
                tst_mainview \
52
                mainview \
117
52
                tst_listitems_itemselector.qml \
53
                tst_listitems_itemselector.qml \
118
53
                tst_tabs_with_repeater.deprecated_toolbar.qml \
54
                tst_tabs_with_repeater.deprecated_toolbar.qml \
120
54
                tst_inversemousearea \
55
                inversemousearea \
121
55
                '
56
                '
122
56
57
123
57
    WARNINGS=$(grep -c -P "$WARNINGS_PATTERN" $_XML)
58
    WARNINGS=$(grep -c -P "$WARNINGS_PATTERN" $_XML)
124
58
59
125
=== modified file 'tests/tests.pro'
126
--- tests/tests.pro	2016-05-17 09:15:17 +0000
127
+++ tests/tests.pro	2016-06-03 15:39:58 +0000
128
@@ -1,5 +1,5 @@
129
1
TEMPLATE = subdirs
1
TEMPLATE = subdirs
131
2
SUBDIRS += unit unit_x11 autopilot
2
SUBDIRS += unit autopilot
132
3
3
133
4
autopilot_module.path = $$[QT_INSTALL_PREFIX]/lib/python3/dist-packages/ubuntuuitoolkit
4
autopilot_module.path = $$[QT_INSTALL_PREFIX]/lib/python3/dist-packages/ubuntuuitoolkit
134
5
autopilot_module.files = autopilot/ubuntuuitoolkit/*
5
autopilot_module.files = autopilot/ubuntuuitoolkit/*
135
6
6
136
=== renamed file 'tests/unit_x11/add_makecheck.pri' => 'tests/unit/add_makecheck_x11.pri'
137
=== renamed file 'tests/unit_x11/add_qmlmakecheck.pri' => 'tests/unit/add_qmlmakecheck_x11.pri'
138
=== renamed directory 'tests/unit/tst_alarms' => 'tests/unit/alarms'
139
=== renamed file 'tests/unit/tst_alarms/tst_alarms.pro' => 'tests/unit/alarms/alarms.pro'
140
=== renamed directory 'tests/unit_x11/tst_animator' => 'tests/unit/animator'
141
=== renamed file 'tests/unit_x11/tst_animator/tst_animator.pro' => 'tests/unit/animator/animator.pro'
142
--- tests/unit_x11/tst_animator/tst_animator.pro	2016-03-14 14:33:15 +0000
143
+++ tests/unit/animator/animator.pro	2016-06-03 15:39:58 +0000
144
@@ -1,4 +1,4 @@
146
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
147
2
QT += core-private qml-private quick-private gui-private
2
QT += core-private qml-private quick-private gui-private
148
3
3
149
4
CONFIG += c++11
4
CONFIG += c++11
150
5
5
151
=== renamed directory 'tests/unit/tst_argument' => 'tests/unit/argument'
152
=== renamed file 'tests/unit/tst_argument/tst_argument.pro' => 'tests/unit/argument/argument.pro'
153
=== renamed directory 'tests/unit/tst_arguments' => 'tests/unit/arguments'
154
=== renamed file 'tests/unit/tst_arguments/tst_arguments.pro' => 'tests/unit/arguments/arguments.pro'
155
=== renamed directory 'tests/unit_x11/tst_asyncloader' => 'tests/unit/asyncloader'
156
=== renamed file 'tests/unit_x11/tst_asyncloader/tst_asyncloader.pro' => 'tests/unit/asyncloader/asyncloader.pro'
157
--- tests/unit_x11/tst_asyncloader/tst_asyncloader.pro	2016-02-18 15:53:42 +0000
158
+++ tests/unit/asyncloader/asyncloader.pro	2016-06-03 15:39:58 +0000
159
@@ -1,4 +1,4 @@
161
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
162
2
QT += core-private qml-private quick-private gui-private UbuntuToolkit
2
QT += core-private qml-private quick-private gui-private UbuntuToolkit
163
3
3
164
4
SOURCES += \
4
SOURCES += \
165
5
5
166
=== renamed directory 'tests/unit_x11/tst_bottomedge' => 'tests/unit/bottomedge'
167
=== renamed file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.pro' => 'tests/unit/bottomedge/bottomedge.pro'
168
--- tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2016-04-01 13:16:05 +0000
169
+++ tests/unit/bottomedge/bottomedge.pro	2016-06-03 15:39:58 +0000
170
@@ -1,4 +1,4 @@
172
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
173
2
QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private UbuntuToolkit
2
QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private UbuntuToolkit
174
3
3
175
4
SOURCES += \
4
SOURCES += \
176
5
5
177
=== renamed directory 'tests/unit/tst_components' => 'tests/unit/components'
178
=== renamed file 'tests/unit/tst_components/tst_components.pro' => 'tests/unit/components/components.pro'
179
--- tests/unit/tst_components/tst_components.pro	2015-04-25 05:31:43 +0000
180
+++ tests/unit/components/components.pro	2016-06-03 15:39:58 +0000
181
@@ -2,8 +2,6 @@
182
2
2
183
3
include(../qmltest-include.pri)
3
include(../qmltest-include.pri)
184
4
4
185
5
TARGET = tst_components
186
6
187
7
SOURCES += tst_components.cpp
5
SOURCES += tst_components.cpp
188
8
6
189
9
OTHER_FILES += $$system(ls *.qml) \
7
OTHER_FILES += $$system(ls *.qml) \
190
10
8
191
=== modified file 'tests/unit/components/tst_pagestack_deprecated_toolbar.qml'
192
--- tests/unit/tst_components/tst_pagestack_deprecated_toolbar.qml	2015-03-03 13:20:06 +0000
193
+++ tests/unit/components/tst_pagestack_deprecated_toolbar.qml	2016-06-03 15:39:58 +0000
194
@@ -19,7 +19,7 @@
195
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.1
196
20
20
197
21
// pagestack tests for the new header are in
21
// pagestack tests for the new header are in
199
22
// unit_x11/tst_components/tst_pagestack_new_header.qml
22
// unit/visual/tst_pagestack_new_header.qml
200
23
23
201
24
TestCase {
24
TestCase {
202
25
    name: "PageStackAPI"
25
    name: "PageStackAPI"
203
26
26
204
=== renamed directory 'tests/unit/tst_components_benchmark' => 'tests/unit/components_benchmark'
205
=== renamed file 'tests/unit/tst_components_benchmark/tst_components_benchmark.pro' => 'tests/unit/components_benchmark/components_benchmark.pro'
206
=== renamed directory 'tests/unit_x11/tst_deprecated_theme_engine' => 'tests/unit/deprecated_theme_engine'
207
=== renamed file 'tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro' => 'tests/unit/deprecated_theme_engine/deprecated_theme_engine.pro'
208
--- tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro	2016-02-25 19:50:13 +0000
209
+++ tests/unit/deprecated_theme_engine/deprecated_theme_engine.pro	2016-06-03 15:39:58 +0000
210
@@ -1,4 +1,4 @@
212
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
213
2
QT += quick-private gui-private qml-private
2
QT += quick-private gui-private qml-private
214
3
SOURCES += tst_deprecated_theme_engine.cpp
3
SOURCES += tst_deprecated_theme_engine.cpp
215
4
4
216
5
5
217
=== renamed directory 'tests/unit/tst_i18n' => 'tests/unit/i18n'
218
=== renamed directory 'tests/unit/tst_i18n/tst_i18n_LocalizedApp' => 'tests/unit/i18n/LocalizedApp'
219
=== renamed file 'tests/unit/tst_i18n/tst_i18n_LocalizedApp/tst_i18n_LocalizedApp.pro' => 'tests/unit/i18n/LocalizedApp/LocalizedApp.pro'
220
=== renamed directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime' => 'tests/unit/i18n/RelativeTime'
221
=== renamed file 'tests/unit/tst_i18n/tst_i18n_RelativeTime/tst_i18n_RelativeTime.pro' => 'tests/unit/i18n/RelativeTime/RelativeTime.pro'
222
=== renamed file 'tests/unit/tst_i18n/tst_i18n.pro' => 'tests/unit/i18n/i18n.pro'
223
--- tests/unit/tst_i18n/tst_i18n.pro	2015-08-12 10:11:06 +0000
224
+++ tests/unit/i18n/i18n.pro	2016-06-03 15:39:58 +0000
225
@@ -1,3 +1,3 @@
226
1
TEMPLATE = subdirs
1
TEMPLATE = subdirs
229
2
SUBDIRS += tst_i18n_LocalizedApp
2
SUBDIRS += LocalizedApp
230
3
SUBDIRS += tst_i18n_RelativeTime
3
SUBDIRS += RelativeTime
231
4
4
232
=== renamed directory 'tests/unit_x11/tst_iconprovider' => 'tests/unit/iconprovider'
233
=== renamed file 'tests/unit_x11/tst_iconprovider/tst_iconprovider.pro' => 'tests/unit/iconprovider/iconprovider.pro'
234
--- tests/unit_x11/tst_iconprovider/tst_iconprovider.pro	2015-02-18 11:39:07 +0000
235
+++ tests/unit/iconprovider/iconprovider.pro	2016-06-03 15:39:58 +0000
236
@@ -1,4 +1,4 @@
238
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
239
2
DEFINES += SRCDIR=\\\"$$PWD/\\\"
2
DEFINES += SRCDIR=\\\"$$PWD/\\\"
240
3
3
241
4
SOURCES += \
4
SOURCES += \
242
5
5
243
=== renamed directory 'tests/unit_x11/tst_inversemousearea' => 'tests/unit/inversemousearea'
244
=== renamed file 'tests/unit_x11/tst_inversemousearea/tst_inversemousearea.pro' => 'tests/unit/inversemousearea/inversemousearea.pro'
245
--- tests/unit_x11/tst_inversemousearea/tst_inversemousearea.pro	2014-04-15 21:37:57 +0000
246
+++ tests/unit/inversemousearea/inversemousearea.pro	2016-06-03 15:39:58 +0000
247
@@ -1,4 +1,4 @@
249
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
250
2
QT += quick-private gui-private
2
QT += quick-private gui-private
251
3
SOURCES += tst_inversemouseareatest.cpp
3
SOURCES += tst_inversemouseareatest.cpp
252
4
DEFINES += SRCDIR=\\\"$$PWD/\\\"
4
DEFINES += SRCDIR=\\\"$$PWD/\\\"
253
5
5
254
=== renamed file 'tests/unit_x11/layout_dependency.pri' => 'tests/unit/layout_dependency.pri'
255
=== renamed directory 'tests/unit_x11/tst_layouts' => 'tests/unit/layouts'
256
=== renamed file 'tests/unit_x11/tst_layouts/tst_layouts.pro' => 'tests/unit/layouts/layouts.pro'
257
--- tests/unit_x11/tst_layouts/tst_layouts.pro	2014-05-16 08:33:43 +0000
258
+++ tests/unit/layouts/layouts.pro	2016-06-03 15:39:58 +0000
259
@@ -1,4 +1,4 @@
261
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
262
2
include(../../unit/qtprivate_dependency.pri)
2
include(../../unit/qtprivate_dependency.pri)
263
3
3
264
4
QT += gui
4
QT += gui
265
5
5
266
=== renamed directory 'tests/unit/tst_mainview' => 'tests/unit/mainview'
267
=== renamed file 'tests/unit/tst_mainview/tst_mainview.pro' => 'tests/unit/mainview/mainview.pro'
268
=== renamed directory 'tests/unit_x11/tst_mousefilters' => 'tests/unit/mousefilters'
269
=== renamed file 'tests/unit_x11/tst_mousefilters/tst_mousefilters.pro' => 'tests/unit/mousefilters/mousefilters.pro'
270
--- tests/unit_x11/tst_mousefilters/tst_mousefilters.pro	2015-12-03 15:43:23 +0000
271
+++ tests/unit/mousefilters/mousefilters.pro	2016-06-03 15:39:58 +0000
272
@@ -1,4 +1,4 @@
274
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
275
2
QT += quick-private
2
QT += quick-private
276
3
SOURCES += tst_mousefilterstest.cpp
3
SOURCES += tst_mousefilterstest.cpp
277
4
DEFINES += SRCDIR=\\\"$$PWD/\\\"
4
DEFINES += SRCDIR=\\\"$$PWD/\\\"
278
5
5
279
=== renamed directory 'tests/unit_x11/tst_orientation' => 'tests/unit/orientation'
280
=== renamed file 'tests/unit_x11/tst_orientation/tst_orientation.pro' => 'tests/unit/orientation/orientation.pro'
281
--- tests/unit_x11/tst_orientation/tst_orientation.pro	2013-10-16 15:51:22 +0000
282
+++ tests/unit/orientation/orientation.pro	2016-06-03 15:39:58 +0000
283
@@ -1,4 +1,4 @@
285
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
286
2
DEFINES += SRCDIR=\\\"$$PWD/\\\"
2
DEFINES += SRCDIR=\\\"$$PWD/\\\"
287
3
3
288
4
SOURCES += \
4
SOURCES += \
289
5
5
290
=== renamed directory 'tests/unit_x11/tst_page' => 'tests/unit/page'
291
=== renamed file 'tests/unit_x11/tst_page/tst_page.pro' => 'tests/unit/page/page.pro'
292
--- tests/unit_x11/tst_page/tst_page.pro	2013-11-08 20:19:58 +0000
293
+++ tests/unit/page/page.pro	2016-06-03 15:39:58 +0000
294
@@ -1,4 +1,4 @@
296
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
297
2
2
298
3
QT += gui
3
QT += gui
299
4
SOURCES += tst_page.cpp
4
SOURCES += tst_page.cpp
300
5
5
301
=== renamed directory 'tests/unit/tst_performance' => 'tests/unit/performance'
302
=== renamed file 'tests/unit/tst_performance/tst_performance.pro' => 'tests/unit/performance/performance.pro'
303
=== renamed directory 'tests/unit/tst_qmltemplate' => 'tests/unit/qmltemplate'
304
=== renamed file 'tests/unit/tst_qmltemplate/tst_qmltemplate.pro' => 'tests/unit/qmltemplate/qmltemplate.pro'
305
--- tests/unit/tst_qmltemplate/tst_qmltemplate.pro	2012-12-10 12:15:49 +0000
306
+++ tests/unit/qmltemplate/qmltemplate.pro	2016-06-03 15:39:58 +0000
307
@@ -2,8 +2,6 @@
308
2
2
309
3
include(../qmltest-include.pri)
3
include(../qmltest-include.pri)
310
4
4
311
5
TARGET = tst_qmltemplate
312
6
313
7
SOURCES += tst_qmltemplate.cpp
5
SOURCES += tst_qmltemplate.cpp
314
8
6
315
9
OTHER_FILES += $$system(ls *.qml)
7
OTHER_FILES += $$system(ls *.qml)
316
10
8
317
=== renamed file 'tests/unit_x11/qmltest-include.pri' => 'tests/unit/qmltest-include-x11.pri'
318
--- tests/unit_x11/qmltest-include.pri	2013-10-30 13:57:33 +0000
319
+++ tests/unit/qmltest-include-x11.pri	2016-06-03 15:39:58 +0000
320
@@ -1,5 +1,5 @@
323
1
include( ../unit/plugin_dependency.pri )
1
include( plugin_dependency.pri )
324
2
include( add_qmlmakecheck.pri)
2
include( add_qmlmakecheck_x11.pri)
325
3
3
326
4
TEMPLATE = app
4
TEMPLATE = app
327
5
QT += qml quick qmltest
5
QT += qml quick qmltest
328
6
6
329
=== renamed directory 'tests/unit/tst_qquick_image_extension' => 'tests/unit/qquick_image_extension'
330
=== renamed file 'tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.pro' => 'tests/unit/qquick_image_extension/qquick_image_extension.pro'
331
=== renamed directory 'tests/unit/tst_quickutils' => 'tests/unit/quickutils'
332
=== renamed file 'tests/unit/tst_quickutils/tst_quickutils.pro' => 'tests/unit/quickutils/quickutils.pro'
333
=== renamed directory 'tests/unit_x11/tst_recreateview' => 'tests/unit/recreateview'
334
=== renamed file 'tests/unit_x11/tst_recreateview/tst_recreateview.pro' => 'tests/unit/recreateview/recreateview.pro'
335
--- tests/unit_x11/tst_recreateview/tst_recreateview.pro	2013-09-11 06:30:02 +0000
336
+++ tests/unit/recreateview/recreateview.pro	2016-06-03 15:39:58 +0000
337
@@ -1,4 +1,4 @@
339
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
340
2
SOURCES += tst_recreateview.cpp
2
SOURCES += tst_recreateview.cpp
341
3
DEFINES += SRCDIR=\\\"$$PWD/\\\"
3
DEFINES += SRCDIR=\\\"$$PWD/\\\"
342
4
OTHER_FILES += \
4
OTHER_FILES += \
343
5
5
344
=== modified file 'tests/unit/runtest.sh'
345
--- tests/unit/runtest.sh	2016-04-13 09:51:21 +0000
346
+++ tests/unit/runtest.sh	2016-06-03 15:39:58 +0000
347
@@ -43,23 +43,23 @@
348
43
  echo "  $0 TEST_EXECUTABLE [QML_FILE] [QT_QPA_PLATFORM]"
43
  echo "  $0 TEST_EXECUTABLE [QML_FILE] [QT_QPA_PLATFORM]"
349
44
  echo ''
44
  echo ''
350
45
  echo 'Examples:'
45
  echo 'Examples:'
362
46
  echo "  $0 $(relpath ${BUILD_DIR}/tests/unit/tst_components/tst_components) tst_label13.qml minimal"
46
  echo "  $0 $(relpath ${BUILD_DIR}/tests/unit/components/components) tst_label13.qml minimal"
363
47
  echo ''
47
  echo ''
364
48
  echo "  cd $(relpath ${BUILD_DIR}/tests/unit/tst_mainview)"
48
  echo "  cd $(relpath ${BUILD_DIR}/tests/unit/mainview)"
365
49
  echo "  ../$(basename $0) tst_mainview minimal"
49
  echo "  ../$(basename $0) mainview minimal"
366
50
  echo "  cd ../../.."
50
  echo "  cd ../../.."
367
51
  echo ''
51
  echo ''
368
52
  echo "  cd $(relpath ${BUILD_DIR}/tests/unit_x11/tst_components)"
52
  echo "  cd $(relpath ${BUILD_DIR}/tests/unit/visual)"
369
53
  echo "  ../../xvfb.sh ../../unit/$(basename $0) tst_components tst_listitem13.qml"
53
  echo "  ../../xvfb.sh ../../unit/$(basename $0) visual tst_listitem13.qml"
370
54
  echo "  cd ../../.."
54
  echo "  cd ../../.."
371
55
  echo ''
55
  echo ''
372
56
  echo "  $(relpath ${BUILD_DIR}/tests/xvfb.sh) $0 $(relpath ${BUILD_DIR}/tests/unit_x11/tst_bottomedge/tst_bottomedge)"
56
  echo "  $(relpath ${BUILD_DIR}/tests/xvfb.sh) $0 $(relpath ${BUILD_DIR}/tests/unit/bottomedge/bottomedge)"
373
57
  exit 1
57
  exit 1
374
58
fi
58
fi
375
59
59
376
60
_TARGET=$(basename $_TARGETPATH)
60
_TARGET=$(basename $_TARGETPATH)
377
61
_TESTFILE=$(basename $_TESTFILEPATH)
61
_TESTFILE=$(basename $_TESTFILEPATH)
379
62
_XML="${BUILD_DIR}/tests/test_$_TARGET_$_TESTFILE.xml"
62
_XML="${BUILD_DIR}/tests/$_TARGET_$_TESTFILE.xml"
380
63
63
381
64
_ARGS="-p -o -p $_XML,xunitxml -p -o -p -,txt"
64
_ARGS="-p -o -p $_XML,xunitxml -p -o -p -,txt"
382
65
65
383
66
66
384
=== renamed directory 'tests/unit/tst_scaling_image_provider' => 'tests/unit/scaling_image_provider'
385
=== renamed file 'tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.pro' => 'tests/unit/scaling_image_provider/scaling_image_provider.pro'
386
=== renamed directory 'tests/unit_x11/tst_serviceproperties' => 'tests/unit/serviceproperties'
387
=== renamed file 'tests/unit_x11/tst_serviceproperties/tst_serviceproperties.pro' => 'tests/unit/serviceproperties/serviceproperties.pro'
388
--- tests/unit_x11/tst_serviceproperties/tst_serviceproperties.pro	2014-11-27 13:01:56 +0000
389
+++ tests/unit/serviceproperties/serviceproperties.pro	2016-06-03 15:39:58 +0000
390
@@ -1,4 +1,4 @@
392
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
393
2
SOURCES += \
2
SOURCES += \
394
3
    tst_serviceproperties.cpp
3
    tst_serviceproperties.cpp
395
4
4
396
5
5
397
=== renamed directory 'tests/unit_x11/tst_statesaver' => 'tests/unit/statesaver'
398
=== renamed file 'tests/unit_x11/tst_statesaver/tst_statesaver.pro' => 'tests/unit/statesaver/statesaver.pro'
399
--- tests/unit_x11/tst_statesaver/tst_statesaver.pro	2014-07-28 14:46:19 +0000
400
+++ tests/unit/statesaver/statesaver.pro	2016-06-03 15:39:58 +0000
401
@@ -1,4 +1,4 @@
403
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
404
2
DEFINES += SRCDIR=\\\"$$PWD/\\\"
2
DEFINES += SRCDIR=\\\"$$PWD/\\\"
405
3
3
406
4
SOURCES += \
4
SOURCES += \
407
5
5
408
=== renamed directory 'tests/unit_x11/tst_subtheming' => 'tests/unit/subtheming'
409
=== renamed file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro' => 'tests/unit/subtheming/subtheming.pro'
410
--- tests/unit_x11/tst_subtheming/tst_subtheming.pro	2016-03-14 17:08:59 +0000
411
+++ tests/unit/subtheming/subtheming.pro	2016-06-03 15:39:58 +0000
412
@@ -1,4 +1,4 @@
414
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
415
2
QT += core-private qml-private quick-private gui-private
2
QT += core-private qml-private quick-private gui-private
416
3
SOURCES += tst_subtheming.cpp
3
SOURCES += tst_subtheming.cpp
417
4
4
418
5
5
419
=== renamed directory 'tests/unit_x11/tst_swipearea' => 'tests/unit/swipearea'
420
=== renamed file 'tests/unit_x11/tst_swipearea/tst_swipearea.pro' => 'tests/unit/swipearea/swipearea.pro'
421
--- tests/unit_x11/tst_swipearea/tst_swipearea.pro	2015-12-17 15:23:26 +0000
422
+++ tests/unit/swipearea/swipearea.pro	2016-06-03 15:39:58 +0000
423
@@ -1,4 +1,4 @@
425
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
426
2
QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private
2
QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private
427
3
SOURCES += \
3
SOURCES += \
428
4
    GestureTest.cpp \
4
    GestureTest.cpp \
429
5
5
430
=== renamed directory 'tests/unit/tst_template' => 'tests/unit/template'
431
=== renamed file 'tests/unit/tst_template/tst_template.pro' => 'tests/unit/template/template.pro'
432
=== renamed directory 'tests/unit_x11/tst_test' => 'tests/unit/test'
433
=== renamed file 'tests/unit_x11/test-include.pri' => 'tests/unit/test-include-x11.pri'
434
--- tests/unit_x11/test-include.pri	2015-10-21 08:33:21 +0000
435
+++ tests/unit/test-include-x11.pri	2016-06-03 15:39:58 +0000
436
@@ -1,6 +1,6 @@
437
1
include( ../unit/plugin_dependency.pri )
1
include( ../unit/plugin_dependency.pri )
438
2
include( layout_dependency.pri )
2
include( layout_dependency.pri )
440
3
include( add_makecheck.pri )
3
include( add_makecheck_x11.pri )
441
4
4
442
5
TEMPLATE = app
5
TEMPLATE = app
443
6
QT += testlib qml quick
6
QT += testlib qml quick
444
7
7
445
=== renamed file 'tests/unit_x11/tst_test/tst_test.pro' => 'tests/unit/test/test.pro'
446
--- tests/unit_x11/tst_test/tst_test.pro	2013-07-24 12:34:45 +0000
447
+++ tests/unit/test/test.pro	2016-06-03 15:39:58 +0000
448
@@ -1,8 +1,6 @@
449
1
TESTS += $$system(ls tst_*.qml)
1
TESTS += $$system(ls tst_*.qml)
450
2
2
454
3
include(../qmltest-include.pri)
3
include(../qmltest-include-x11.pri)
452
4
453
5
TARGET = tst_test
455
6
4
456
7
SOURCES += tst_test.cpp
5
SOURCES += tst_test.cpp
457
8
6
458
9
7
459
=== modified file 'tests/unit/testparser/testparser.pro'
460
--- tests/unit/testparser/testparser.pro	2012-11-28 20:31:53 +0000
461
+++ tests/unit/testparser/testparser.pro	2016-06-03 15:39:58 +0000
462
@@ -2,7 +2,6 @@
463
2
2
464
3
QT       -= gui
3
QT       -= gui
465
4
4
466
5
TARGET = testparser
467
6
CONFIG   += console
5
CONFIG   += console
468
7
CONFIG   -= app_bundle
6
CONFIG   -= app_bundle
469
8
7
470
9
8
471
=== renamed directory 'tests/unit/tst_theme' => 'tests/unit/theme'
472
=== renamed file 'tests/unit/tst_theme/tst_theme.pro' => 'tests/unit/theme/theme.pro'
473
--- tests/unit/tst_theme/tst_theme.pro	2013-08-28 09:49:02 +0000
474
+++ tests/unit/theme/theme.pro	2016-06-03 15:39:58 +0000
475
@@ -2,8 +2,6 @@
476
2
2
477
3
include(../qmltest-include.pri)
3
include(../qmltest-include.pri)
478
4
4
479
5
TARGET = tst_theme
480
6
481
7
SOURCES += tst_theme.cpp
5
SOURCES += tst_theme.cpp
482
8
6
483
9
OTHER_FILES += $$system(ls *.qml)
7
OTHER_FILES += $$system(ls *.qml)
484
10
8
485
=== renamed directory 'tests/unit_x11/tst_touchregistry' => 'tests/unit/touchregistry'
486
=== renamed file 'tests/unit_x11/tst_touchregistry/tst_touchregistry.pro' => 'tests/unit/touchregistry/touchregistry.pro'
487
--- tests/unit_x11/tst_touchregistry/tst_touchregistry.pro	2015-11-09 15:46:45 +0000
488
+++ tests/unit/touchregistry/touchregistry.pro	2016-06-03 15:39:58 +0000
489
@@ -1,4 +1,4 @@
491
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
492
2
2
493
3
QT += core-private qml-private quick-private gui-private UbuntuGestures
3
QT += core-private qml-private quick-private gui-private UbuntuGestures
494
4
4
495
5
5
496
=== renamed directory 'tests/unit/tst_tree' => 'tests/unit/tree'
497
=== renamed file 'tests/unit/tst_tree/tst_tree.pro' => 'tests/unit/tree/tree.pro'
498
=== renamed directory 'tests/unit_x11/tst_ubuntu_shape' => 'tests/unit/ubuntu_shape'
499
=== renamed file 'tests/unit_x11/tst_ubuntu_shape/tst_ubuntu_shape.pro' => 'tests/unit/ubuntu_shape/ubuntu_shape.pro'
500
--- tests/unit_x11/tst_ubuntu_shape/tst_ubuntu_shape.pro	2013-04-24 12:44:23 +0000
501
+++ tests/unit/ubuntu_shape/ubuntu_shape.pro	2016-06-03 15:39:58 +0000
502
@@ -1,4 +1,4 @@
504
1
include(../test-include.pri)
1
include(../test-include-x11.pri)
505
2
SOURCES += tst_ubuntu_shape.cpp
2
SOURCES += tst_ubuntu_shape.cpp
506
3
OTHER_FILES += no_distortion.qml \
3
OTHER_FILES += no_distortion.qml \
507
4
               no_distortion_source.png \
4
               no_distortion_source.png \
508
5
5
509
=== modified file 'tests/unit/unit.pro'
510
--- tests/unit/unit.pro	2016-02-25 11:56:23 +0000
511
+++ tests/unit/unit.pro	2016-06-03 15:39:58 +0000
512
@@ -10,21 +10,40 @@
513
10
# https://bugs.launchpad.net/qemu-linaro/+bug/1084148
10
# https://bugs.launchpad.net/qemu-linaro/+bug/1084148
514
11
#######################################
11
#######################################
515
12
#!contains(QMAKE_HOST.arch,armv7l) {
12
#!contains(QMAKE_HOST.arch,armv7l) {
518
13
    SUBDIRS += tst_components \
13
    SUBDIRS += components \
519
14
        tst_components_benchmark
14
        components_benchmark
520
15
#}
15
#}
521
16
16
522
17
SUBDIRS += \
17
SUBDIRS += \
523
18
    visual \
524
19
    ubuntu_shape \
525
20
    page \
526
21
    test \
527
22
    iconprovider \
528
23
    inversemousearea \
529
24
    recreateview \
530
25
    statesaver \
531
26
    deprecated_theme_engine \
532
27
    orientation \
533
28
    layouts \
534
29
    mousefilters \
535
30
    animator \
536
31
    serviceproperties \
537
32
    subtheming \
538
33
    swipearea \
539
34
    touchregistry \
540
35
    bottomedge \
541
36
    asyncloader \
542
18
    custom_qpa \
37
    custom_qpa \
555
19
    tst_units \
38
    units \
556
20
    tst_scaling_image_provider \
39
    scaling_image_provider \
557
21
    tst_qquick_image_extension \
40
    qquick_image_extension \
558
22
    tst_performance \
41
    performance \
559
23
    tst_mainview \
42
    mainview \
560
24
    tst_i18n \
43
    i18n \
561
25
    tst_arguments \
44
    arguments \
562
26
    tst_argument \
45
    argument \
563
27
    tst_alarms \
46
    alarms \
564
28
    tst_theme \
47
    theme \
565
29
    tst_quickutils \
48
    quickutils \
566
30
    tst_tree
49
    tree
567
31
50
568
=== renamed directory 'tests/unit/tst_units' => 'tests/unit/units'
569
=== renamed file 'tests/unit/tst_units/tst_units.pro' => 'tests/unit/units/units.pro'
570
=== renamed directory 'tests/unit_x11/tst_components' => 'tests/unit/visual'
571
=== renamed file 'tests/unit_x11/tst_components/tst_textinput_touch.qml' => 'tests/unit/visual/tst_textinput_touch.SEGFAULT.qml'
572
=== renamed file 'tests/unit_x11/tst_components/tst_components.cpp' => 'tests/unit/visual/tst_visual.cpp'
573
=== renamed file 'tests/unit_x11/tst_components/tst_components.pro' => 'tests/unit/visual/visual.pro'
574
--- tests/unit_x11/tst_components/tst_components.pro	2016-05-13 08:39:18 +0000
575
+++ tests/unit/visual/visual.pro	2016-06-03 15:39:58 +0000
576
@@ -1,12 +1,10 @@
577
1
TESTS += $$system(ls tst_*.qml)
1
TESTS += $$system(ls tst_*.qml)
578
2
2
582
3
include(../qmltest-include.pri)
3
include(../qmltest-include-x11.pri)
580
4
581
5
TARGET = tst_components
583
6
4
584
7
CONFIG += c++11
5
CONFIG += c++11
585
8
6
587
9
SOURCES += tst_components.cpp tabsmodel.cpp
7
SOURCES += tst_visual.cpp tabsmodel.cpp
588
10
HEADERS += tabsmodel.h
8
HEADERS += tabsmodel.h
589
11
9
590
12
OTHER_FILES += $$system(ls *.qml)
10
OTHER_FILES += $$system(ls *.qml)
591
13
11
592
=== removed directory 'tests/unit_x11'
593
=== removed file 'tests/unit_x11/unit_x11.pro'
594
--- tests/unit_x11/unit_x11.pro	2016-02-18 15:42:06 +0000
595
+++ tests/unit_x11/unit_x11.pro	1970-01-01 00:00:00 +0000
596
@@ -1,21 +0,0 @@
597
1
TEMPLATE = subdirs
598
2
599
3
SUBDIRS += tst_components \
600
4
    tst_ubuntu_shape \
601
5
    tst_page \
602
6
    tst_test \
603
7
    tst_iconprovider \
604
8
    tst_inversemousearea \
605
9
    tst_recreateview \
606
10
    tst_statesaver \
607
11
    tst_deprecated_theme_engine \
608
12
    tst_orientation \
609
13
    tst_layouts \
610
14
    tst_mousefilters \
611
15
    tst_animator \
612
16
    tst_serviceproperties \
613
17
    tst_subtheming \
614
18
    tst_swipearea \
615
19
    tst_touchregistry \
616
20
    tst_bottomedge \
617
21
    tst_asyncloader
618
22
0
619
=== modified file 'ubuntu-sdk.pro'
620
--- ubuntu-sdk.pro	2016-04-22 15:50:19 +0000
621
+++ ubuntu-sdk.pro	2016-06-03 15:39:58 +0000
622
@@ -27,7 +27,7 @@
623
27
QMAKE_EXTRA_TARGETS += license
27
QMAKE_EXTRA_TARGETS += license
624
28
28
625
29
check.target = check
29
check.target = check
627
30
check.commands = $$PWD/tests/checkresults.sh $$OUT_PWD/tests/test_*.xml || exit 1;
30
check.commands = $$PWD/tests/checkresults.sh $$OUT_PWD/tests/*.xml || exit 1;
628
31
check.commands += pep8 $$PWD || exit 1;
31
check.commands += pep8 $$PWD || exit 1;
629
32
32
630
33
#helper files
33
#helper files
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-06-03
Tim Peeters		2016-05-30	Approve on 2016-06-03
Review via email: mp+296050@code.launchpad.net