git.iko.soy/unity8
on xenial help sign in
make it a bit more generic
4c6c8edMichael Zanetti
cmake/modules/QmlTest.cmake+5−5
compare with xenial
unifiedsplit
@@ -119,21 +119,21 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
119 -o ${CMAKE_BINARY_DIR}/${CLASSNAME}Test.xml,xunitxml
119 -o ${CMAKE_BINARY_DIR}/${CLASSNAME}Test.xml,xunitxml
120 -o -,txt)
120 -o -,txt)
121
121
122− add_custom_target(test${CLASS_NAME} ${testCommand})
122+ add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
123 add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
123 add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
124
124
125+ exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
125 set(xvfbtestCommand
126 set(xvfbtestCommand
126− LD_PRELOAD=/usr/lib/x86_64-linux-gnu/mesa/libGL.so.1
127+ LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1
127 LD_LIBRARY_PATH=${LD_PATH}
128 LD_LIBRARY_PATH=${LD_PATH}
128 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
129 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
129 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
130 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
130 -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
131 -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
131 -o -,txt)
132 -o -,txt)
132
133
133− add_custom_target(xvfbtest${CLASS_NAME} ${xvfbtestCommand})
134+ add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
134− add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
135−
136 add_dependencies(qmluitests xvfbtest${CLASS_NAME})
135 add_dependencies(qmluitests xvfbtest${CLASS_NAME})
136+
137 add_manual_qml_test(. ${CLASS_NAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
137 add_manual_qml_test(. ${CLASS_NAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
138endmacro(add_binary_qml_test)
138endmacro(add_binary_qml_test)
139
139