git.iko.soy/unity8
on xenial help sign in
use long options, add auto-servernum, only add xvfbtest to qmluitests
a68674aMichael Zanetti
cmake/modules/QmlTest.cmake+5−5
compare with xenial
unifiedsplit
@@ -89,20 +89,20 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
89 -o -,txt
89 -o -,txt
90 )
90 )
91 set(qmltest_xvfb_command
91 set(qmltest_xvfb_command
92− env ${qmltest_ENVIRONMENT}
92+ env ${qmltest_ENVIRONMENT} LD_PRELOAD=/usr/lib/x86_64-linux-gnu/mesa/libGL.so.1
93− xvfb-run -l -s "-screen 0 1024x768x24"
93+ xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
94 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
94 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
95 ${qmltestrunner_imports}
95 ${qmltestrunner_imports}
96 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
96 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
97 -o -,txt
97 -o -,txt
98 )
98 )
99
99
100− add_qmltest_target(${qmltest_TARGET} "${qmltest_command}")
100+ add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE)
101− add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}")
101+ add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}" ${qmltest_NO_TARGETS})
102 add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
102 add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
103endmacro(add_qml_test)
103endmacro(add_qml_test)
104
104
105−macro(add_qmltest_target qmltest_TARGET qmltest_command)
105+macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS)
106 add_custom_target(${qmltest_TARGET} ${qmltest_command})
106 add_custom_target(${qmltest_TARGET} ${qmltest_command})
107
107
108 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
108 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")