@@ -155,10 +155,11 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
155 set(testCommand
155 set(testCommand
156 ${ENVVAR}
156 ${ENVVAR}
157 LD_LIBRARY_PATH=${LD_PATH}
157 LD_LIBRARY_PATH=${LD_PATH}
158− dbus-launch
158+ dbus-test-runner
159− ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
160+ -t ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
160− -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
161+ -p -o -p ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
161− -o -,txt)
162+ -p -o -p -,txt)
163 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
164 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
164 add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
165 add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
@@ -173,10 +174,11 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
173 ${ENVVAR}
174 ${ENVVAR}
174 LD_LIBRARY_PATH=${LD_PATH}
175 LD_LIBRARY_PATH=${LD_PATH}
175 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
176 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
176− dbus-launch
177+ dbus-test-runner
177− ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
179+ -t ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
178− -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
180+ -p -o -p ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
179− -o -,txt)
181+ -p -o -p -,txt)
181 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
183 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
182 add_dependencies(qmluitests xvfbtest${CLASS_NAME})
184 add_dependencies(qmluitests xvfbtest${CLASS_NAME})