on xenial help sign in
Use dbus-test-runner instead of dbus-launch

Since we actually depend on it in the control file

commitb2674d2a09d2059a18e63bf62a895ab81786fd98 authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 28 Apr 2015, 18:48 (11 years ago) parent8c98a7a
1 file changed+8−8
cmake/modules/QmlTest.cmake+8−8
cmake/modules/QmlTest.cmake+8−8
@@ -155,10 +155,10 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
155155 set(testCommand
156156 ${ENVVAR}
157157 LD_LIBRARY_PATH=${LD_PATH}
158− dbus-launch
159− ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
160− -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
161− -o -,txt)
158+ dbus-test-runner
159+ -t ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
160+ -p -o -p ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
161+ -p -o -p -,txt)
162162
163163 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
164164 add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
@@ -173,10 +173,10 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
173173 ${ENVVAR}
174174 LD_LIBRARY_PATH=${LD_PATH}
175175 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
176− dbus-launch
177− ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
178− -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
179− -o -,txt)
176+ dbus-test-runner
177+ -t ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
178+ -p -o -p ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
179+ -p -o -p -,txt)
180180
181181 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
182182 add_dependencies(qmluitests xvfbtest${CLASS_NAME})