git.iko.soy/unity8
on xenial help sign in
Add test prefix to xml output, seems CI needs it

Approved by: Michał Sawicz

commit000d8bbd6c14802a02ca54d8bd5be202acbb295a authorAlbert Astals <albert.astals@canonical.com> dateWed 6 Aug 2014, 19:39 (12 years ago) parentc853a129fc837e
4 files changed+4−3
compare with xenial
unifiedsplit
cmake/modules/QmlTest.cmake+2−2 plugins/Dash/CardCreator.js−1 qml/Dash/DashApplication.qml+1 qml/ScopeTool.qml+1
cmake/modules/QmlTest.cmake+2−2
@@ -135,7 +135,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
135135 set(testCommand
136136 LD_LIBRARY_PATH=${LD_PATH}
137137 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
138− -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
138+ -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
139139 -o -,txt)
140140
141141 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
@@ -151,7 +151,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
151151 LD_LIBRARY_PATH=${LD_PATH}
152152 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
153153 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
154− -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
154+ -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
155155 -o -,txt)
156156
157157 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
plugins/Dash/CardCreator.js−1
@@ -608,7 +608,6 @@ function cardString(template, components) {
608608function createCardComponent(parent, template, components) {
609609 var imports = 'import QtQuick 2.2; \n\
610610 import Ubuntu.Components 0.1; \n\
611− import Ubuntu.Thumbnailer 0.1;\n\
612611 import Dash 0.1;\n';
613612 var card = cardString(template, components);
614613 var code = imports + 'Component {\n' + card + '}\n';
qml/Dash/DashApplication.qml+1
@@ -16,6 +16,7 @@
1616
1717import QtQuick 2.2
1818import Ubuntu.Components 1.0
19+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
1920
2021MainView {
2122 width: units.gu(40)
qml/ScopeTool.qml+1
@@ -17,6 +17,7 @@
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
1919import Ubuntu.Components.Popups 0.1
20+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
2021import Utils 0.1
2122import Unity 0.2
2223import "Components"