git.iko.soy/unity8
on xenial help sign in
Refactor QmlTest.cmake to make it much more flexible
37ca99cMichał Sawicz
CMakeLists.txt+8
compare with xenial
unifiedsplit
@@ -113,6 +113,14 @@ include_directories(
113 ${CMAKE_BINARY_DIR}/include
113 ${CMAKE_BINARY_DIR}/include
114)
114)
115
115
116+set(ARTIFACTS_DIR "" CACHE PATH "Store test artifacts in this directory.")
117+
118+# Quiet logger
119+set(QUIET_LOGGER OFF CACHE BOOL "Disable test output on stdout.")
120+if(NOT QUIET_LOGGER)
121+ set(STDOUT_LOGGER "-o" "-,txt")
122+endif()
123+
116# add subdirectories to build
124# add subdirectories to build
117add_subdirectory(include)
125add_subdirectory(include)
118add_subdirectory(libs)
126add_subdirectory(libs)
cmake/modules/QmlTest.cmake+281−193
@@ -1,218 +1,306 @@
1+# If you need to override the qmlscene or qmltestrunner executables,
2+# create the corresponding executable target.
3+
4+# These functions respect the global STDOUT_LOGGER and ARTIFACTS_DIR variables.
5+
6+execute_process(
7+ COMMAND gcc -dumpmachine
8+ OUTPUT_VARIABLE ARCH_TRIPLET
9+ OUTPUT_STRIP_TRAILING_WHITESPACE
10+)
11+
12+# You can use those with cmake_parse_arguments
13+# if you need to wrap and mangle arguments.
14+set(QMLTEST_OPTIONS ADD_TEST CACHE INTERNAL "")
15+set(QMLTEST_SINGLE ITERATIONS ARG_PREFIX CACHE INTERNAL "")
16+set(QMLTEST_MULTI ARGS ENVIRONMENT DEPENDS IMPORT_PATHS TARGETS CACHE INTERNAL "")
17+
18+# import_executables(name1 [name2 [...]])
19+#
20+# This will find the named executables and import them
21+# to an imported target of the same name.
22+
23+function(import_executables)
24+ foreach(NAME ${ARGN})
25+ if(NOT TARGET ${NAME})
26+ find_program(${NAME}_exe ${NAME})
27+
28+ if(NOT ${NAME}_exe)
29+ message(FATAL_ERROR "Could not locate ${NAME}.")
30+ endif()
31+
32+ add_executable(${NAME} IMPORTED)
33+ set_target_properties(${NAME} PROPERTIES IMPORTED_LOCATION ${${NAME}_exe})
34+ endif()
35+ endforeach()
36+endfunction()
37+
38+
1−# add_qml_test(path component_name [NO_ADD_TEST] [NO_TARGETS]
39+# add_qml_test(path component_name
2−# [TARGETS target1 [target2 [...]]]
40+# [...]
3−# [IMPORT_PATHS import_path1 [import_path2 [...]]
41+# )
4−# [PROPERTIES prop1 value1 [prop2 value2 [...]]])
5#
42#
6−# NO_ADD_TEST will prevent adding the test to the "test" target
43+# Add test targets for ${component_name} under ${path}. It's assumed
7−# NO_TARGETS will prevent adding the test to any targets
44+# that the test file is named ${path}/tst_${component_name}.qml.
8−# TARGETS lists the targets the test should be added to
9−# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments
10−# PROPERTIES will be set on the target and test target. See CMake's set_target_properties()
11#
45#
12−# Two targets will be created:
46+# This function wraps add_manual_qml_test and add_qml_unittest,
13−# - testComponentName - Runs the test with qmltestrunner
47+# see below for available arguments.
14−# - tryComponentName - Runs the test with uqmlscene, for manual interaction
48+
15−# - gdbtestComponentName - Runs the test with qmltestrunner under gdb
49+function(add_qml_test PATH COMPONENT_NAME)
50+ import_executables(qmltestrunner)
51+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
52+ mangle_arguments()
53+
54+ add_qml_unittest(${ARGV})
55+ add_manual_qml_test(${ARGV})
56+endfunction()
57+
58+
59+# add_manual_qml_test(path component_name
60+# [...]
61+# )
16#
62#
17−# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
63+# Add manual test targets for ${component_name} under ${path}. It's assumed
18−# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
64+# that the test file is named ${path}/tst_${component_name}.qml.
19−# qmltest_DEFAULT_TARGETS
65+#
20−# qmltest_DEFAULT_IMPORT_PATHS
66+# This function wraps add_manual_test, see below for available arguments.
21−# qmltest_DEFAULT_PROPERTIES
67+function(add_qml_unittest PATH COMPONENT_NAME)
22−
68+ import_executables(qmlscene)
23−find_program(qmltestrunner_exe qmltestrunner)
24−
25−if(NOT qmltestrunner_exe)
26− msg(FATAL_ERROR "Could not locate qmltestrunner.")
27−endif()
28−
29−set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
30−
31−set(test_env LC_ALL=C UNITY_TESTING=1)
32−
33−macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
34− set(options NO_ADD_TEST NO_TARGETS)
35− set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
36−
37− cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
38− cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
39−
40− set(qmlscene_TARGET try${COMPONENT_NAME})
41− set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
42−
43− set(qmlscene_imports "")
44− if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")
45− foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})
46− list(APPEND qmlscene_imports "-I")
47− list(APPEND qmlscene_imports ${IMPORT_PATH})
48− endforeach(IMPORT_PATH)
49− elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")
50− foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})
51− list(APPEND qmlscene_imports "-I")
52− list(APPEND qmlscene_imports ${IMPORT_PATH})
53− endforeach(IMPORT_PATH)
54− endif()
55
69
56− if("${qmltest_ENVIRONMENT}" STREQUAL "")
70+ add_executable_test(${COMPONENT_NAME} qmltestrunner
57− set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")
71+ ${ARGN}
58− endif()
72+ ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
73+ )
74+endfunction()
59
75
60− set(qmlscene_command
76+
61− env ${test_env} ${qmltest_ENVIRONMENT}
77+# add_manual_qml_test(path component_name
62− ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
78+# [...]
63− ${qmlscene_imports}
79+# )
80+#
81+# Add manual test targets for ${component_name} under ${path}. It's assumed
82+# that the test file is named ${path}/tst_${component_name}.qml.
83+#
84+# This function wraps add_manual_test, see below for available arguments.
85+
86+function(add_manual_qml_test PATH COMPONENT_NAME)
87+ import_executables(qmlscene)
88+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
89+
90+ add_manual_test(${COMPONENT_NAME} qmlscene
91+ ${ARGN}
92+ ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
64 )
93 )
65− add_custom_target(${qmlscene_TARGET} ${qmlscene_command})
94+endfunction()
66−
95+
96+
97+# add_executable_test(target component_name
67−endmacro(add_manual_qml_test)
98+# [...] # see doc for add_manual_qml_test for common arguments
68−
99+# [ADD_TEST] # whether to add to the "test" target
69−macro(add_qml_benchmark SUBPATH COMPONENT_NAME ITERATIONS)
100+# [ARG_PREFIX arg_prefix] # prefix logging arguments with this string
70− add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} ${ITERATIONS} ${ARGN})
101+# [ARGS] arg1 [arg2 [...]] # pass these arguments to the test executable
71−endmacro(add_qml_benchmark)
102+# [TARGETS target1 [target2 [...]]] # make the listed targets depend on this test
72−
103+# # if a corresponding xvfbtarget1, xvfbtarget2 etc. exists,
73−macro(add_qml_test SUBPATH COMPONENT_NAME)
104+# # this test running under xvfb will be added as a dependency
74− add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} 0 ${ARGN})
105+# # of those targets
75−endmacro(add_qml_test)
106+# [ITERATIONS count] # run this test as a benchmark for ${count} iterations
76−
107+# )
77−macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
108+#
78− set(options NO_ADD_TEST NO_TARGETS)
109+# Logging options in the standard form of "-o filename,format"
79− set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
110+# will be appended to the arguments list, prefixed with ARG_PREFIX.
80−
111+# XUnitXML files will be stored in current binary dir or under
81− cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
112+# ARTIFACTS_DIR, if set.
82− cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
113+#
83−
114+# Three targets will be created:
84− set(qmltest_TARGET test${COMPONENT_NAME})
115+# - test${component_name} - Runs the test
85− set(qmltest_gdb_TARGET gdbtest${COMPONENT_NAME})
116+# - xvfbtest${component_name} - Runs the test under xvfb
86− set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})
117+# - gdbtest${component_name} - Runs the test under gdb
87− set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
118+
88−
119+function(add_executable_test COMPONENT_NAME TARGET)
89− set(qmltestrunner_imports "")
120+ import_executables(gdb xvfb-run)
90− if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")
121+
91− foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})
122+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
92− list(APPEND qmltestrunner_imports "-import")
123+ mangle_arguments()
93− list(APPEND qmltestrunner_imports ${IMPORT_PATH})
124+
94− endforeach(IMPORT_PATH)
125+ if(ARTIFACTS_DIR)
95− elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")
126+ file(RELATIVE_PATH path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
96− foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})
127+ file(MAKE_DIRECTORY ${ARTIFACTS_DIR}/${path})
97− list(APPEND qmltestrunner_imports "-import")
128+ set(file_logger -o ${ARTIFACTS_DIR}/${path}/test${COMPONENT_NAME}.xml,xunitxml)
98− list(APPEND qmltestrunner_imports ${IMPORT_PATH})
129+ else()
99− endforeach(IMPORT_PATH)
130+ set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)
100 endif()
131 endif()
101
132
133+ bake_arguments("${QMLTEST_ARG_PREFIX}" args ${iterations} ${file_logger} ${STDOUT_LOGGER})
134+
135+ set(qmltest_command
136+ $<TARGET_FILE:${TARGET}>
137+ ${QMLTEST_ARGS}
138+ ${args}
139+ )
140+
141+ add_qmltest_target(test${COMPONENT_NAME} ${TARGET}
142+ COMMAND ${qmltest_command}
143+ ${depends}
144+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}
145+ ${add_test}
146+ ${targets}
147+ )
148+
149+ add_qmltest_target(xvfbtest${COMPONENT_NAME} ${TARGET}
150+ COMMAND $<TARGET_FILE:xvfb-run> --server-args "-screen 0 1024x768x24" --auto-servernum ${qmltest_command}
151+ ${depends}
152+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT} LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1
153+ TARGETS ${xvfb_targets}
154+ )
155+
156+ add_qmltest_target(gdbtest${COMPONENT_NAME} ${TARGET}
157+ COMMAND $<TARGET_FILE:gdb> -ex run -args ${qmltest_command}
158+ ${depends}
159+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}
160+ )
161+endfunction()
162+
163+
164+# add_manual_test(target component_name
165+# [DEPENDS target1 [target2 [...]]] # make this test depend on the specified targets
166+# [IMPORT_PATHS import_path1 [import_path2 [...]] # use these QML import paths
167+# # (they're searched first to last)
168+# [ENVIRONMENT var1=value1 [var2=value2 [...]]] # set these environment variables
169+# )
170+#
171+# Two targets will be created:
172+# - try${component_name} - Runs the test for manual interaction
173+# - gdbtry${component_name} - Runs the test under gdb
174+
175+function(add_manual_test COMPONENT_NAME TARGET)
176+ import_executables(gdb)
177+
178+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
179+ mangle_arguments()
180+
181+ bake_arguments("${QMLTEST_ARG_PREFIX}" args -qmljsdebugger=port:3768)
182+
183+ set(qmltry_command
184+ $<TARGET_FILE:${TARGET}>
185+ ${QMLTEST_ARGS}
186+ ${args}
187+ )
188+
189+ add_qmltest_target(try${COMPONENT_NAME} ${TARGET}
190+ COMMAND ${qmltry_command}
191+ ${depends}
192+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}
193+ )
194+
195+ add_qmltest_target(gdbtry${COMPONENT_NAME} ${TARGET}
196+ COMMAND $<TARGET_FILE:gdb> -ex run -args ${qmltry_command}
197+ ${depends}
198+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}
199+ )
200+endfunction()
201+
202+
203+################### INTERNAL ####################
204+
205+# add_qmltest_target(target_name target
206+# COMMAND test_exe [arg1 [...]] # execute this test with arguments
207+# [...] # see above for available arguments:
208+# # ADD_TEST, ENVIRONMENT, DEPENDS and TARGETS
209+# )
210+
211+function(add_qmltest_target TARGET_NAME TARGET)
212+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "COMMAND;${QMLTEST_MULTI}" ${ARGN})
213+ mangle_arguments()
214+
215+ # Additional arguments
102 string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
216 string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
103 if(cmake_generator_lower STREQUAL "unix makefiles")
217 if(cmake_generator_lower STREQUAL "unix makefiles")
104− set(function_ARGS $(FUNCTION))
218+ set(function "$(FUNCTION)")
105− else()
106− set(function_ARGS "")
107 endif()
219 endif()
108
220
109− if (${ITERATIONS} GREATER 0)
221+ add_custom_target(${TARGET_NAME}
110− set(ITERATIONS_STRING "-iterations" ${ITERATIONS})
222+ env ${QMLTEST_ENVIRONMENT}
111− else()
223+ ${QMLTEST_COMMAND} ${function}
112− set(ITERATIONS_STRING "")
224+ DEPENDS ${TARGET} ${QMLTEST_DEPENDS}
225+ )
226+
227+ if(QMLTEST_ADD_TEST)
228+ add_test(
229+ NAME ${TARGET_NAME}
230+ COMMAND ${QMLTEST_COMMAND}
231+ )
232+
233+ foreach(ENV ${QMLTEST_ENVIRONMENT})
234+ set_property(TEST ${TARGET_NAME} APPEND PROPERTY ENVIRONMENT ${ENV})
235+ endforeach()
236+
237+ set_property(TEST ${TARGET_NAME} APPEND PROPERTY DEPENDS ${TARGET})
238+ foreach(DEPEND ${DEPENDS})
239+ set_property(TEST ${TARGET_NAME} APPEND PROPERTY DEPENDS ${DEPEND})
240+ endforeach()
113 endif()
241 endif()
114
242
115− if("${qmltest_ENVIRONMENT}" STREQUAL "")
243+ foreach(UPSTREAM_TARGET ${QMLTEST_TARGETS})
116− set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")
244+ add_dependencies(${UPSTREAM_TARGET} ${TARGET_NAME})
245+ endforeach()
246+endfunction()
247+
248+
249+# mangle_arguments(${ARGN})
250+#
251+# Verify there were no unparsed arguments and
252+# mangle the known ones for further processing.
253+
254+macro(mangle_arguments)
255+ if(QMLTEST_UNPARSED_ARGUMENTS)
256+ message(FATAL_ERROR "Unexpected arguments: ${QMLTEST_UNPARSED_ARGUMENTS}")
117 endif()
257 endif()
118
258
119− set(qmltest_command
259+ if(QMLTEST_ADD_TEST)
120− env ${test_env} ${qmltest_ENVIRONMENT}
260+ set(add_test ADD_TEST)
121− ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
122− ${qmltestrunner_imports}
123− ${ITERATIONS_STRING}
124− -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
125− -o -,txt
126− ${function_ARGS}
127− )
128− find_program(DPKG dpkg-architecture)
129− if(DPKG)
130− exec_program(${DPKG} ARGS "-qDEB_BUILD_MULTIARCH" OUTPUT_VARIABLE ARCH_TRIPLET )
131− set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
132 endif()
261 endif()
133− set(qmltest_xvfb_command
134− env ${test_env} ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
135− xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
136− ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
137− ${qmltestrunner_imports}
138− -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
139− -o -,txt
140− ${function_ARGS}
141− )
142
262
143− set(qmltest_gdb_command
263+ if(QMLTEST_IMPORT_PATHS)
144− env ${test_env} ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
264+ string(REPLACE ";" ":" imports "${QMLTEST_IMPORT_PATHS}")
145− gdb -e ${qmltestrunner_exe} -ex \"run -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml ${qmltestrunner_imports} ${ITERATIONS_STRING}\"
265+ endif()
146− )
147
266
148− add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE ${qmltest_NO_ADD_TEST})
267+ if(QMLTEST_ITERATIONS)
149− add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}" ${qmltest_NO_TARGETS} TRUE)
268+ set(iterations -iterations ${QMLTEST_ITERATIONS})
150− add_qmltest_target(${qmltest_gdb_TARGET} "${qmltest_gdb_command}" TRUE TRUE)
151− add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
152−endmacro(add_qml_test_internal)
153−
154−macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
155− set(testCommand
156− ${ENVVAR}
157− LD_LIBRARY_PATH=${LD_PATH}
158− dbus-test-runner
159− -m 300
160− -t ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
161− -p -o -p ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
162− -p -o -p -,txt)
163−
164− add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
165− add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
166−
167− find_program( HAVE_GCC gcc )
168− if (NOT ${HAVE_GCC} STREQUAL "")
169− exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
170− set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
171 endif()
269 endif()
172− set(xvfbtestCommand
270+
173− ${LD_PRELOAD_PATH}
271+ if(QMLTEST_DEPENDS)
174− ${ENVVAR}
272+ set(depends DEPENDS ${QMLTEST_DEPENDS})
175− LD_LIBRARY_PATH=${LD_PATH}
176− xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
177− dbus-test-runner
178− -m 300
179− -t ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
180− -p -o -p ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
181− -p -o -p -,txt)
182−
183− add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
184− add_dependencies(qmluitests xvfbtest${CLASS_NAME})
185−endmacro(add_binary_qml_test)
186−
187−macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)
188− add_custom_target(${qmltest_TARGET} ${qmltest_command})
189−
190− if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
191− set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})
192− elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
193− set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})
194 endif()
273 endif()
195
274
196− if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
275+ if(QMLTEST_TARGETS)
197− add_test(${qmltest_TARGET} ${qmltest_command})
276+ set(targets TARGETS ${QMLTEST_TARGETS})
277+ endif()
198
278
199− if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "")
279+ set(xvfb_targets "")
200− set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})
280+ foreach(target ${QMLTEST_TARGETS})
201− elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
281+ if(TARGET xvfb${target})
202− set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})
282+ list(APPEND xvfb_targets xvfb${target})
203 endif()
283 endif()
204− endif("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
205−
206− if("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
207− if(NOT "${qmltest_TARGETS}" STREQUAL "")
208− foreach(TARGET ${qmltest_TARGETS})
209− add_dependencies(${TARGET} ${qmltest_TARGET})
210− endforeach(TARGET)
284+ endforeach()
211− elseif(NOT "${qmltest_DEFAULT_TARGETS}" STREQUAL "")
285+ set(xvfb_targets "${xvfb_targets}" PARENT_SCOPE)
212− foreach(TARGET ${qmltest_DEFAULT_TARGETS})
286+endmacro()
213− add_dependencies(${TARGET} ${qmltest_TARGET})
287+
214− endforeach(TARGET)
215− endif()
216− endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
217
288
218−endmacro(add_qmltest_target)
289+# bake_arguments(prefix output
290+# arg1 [arg2 [...]]
291+# )
292+#
293+# If set, add the argument prefix before every passed
294+# argument and store the result in ${OUTPUT} variable.
295+
296+function(bake_arguments PREFIX OUTPUT)
297+ set(args "${ARGN}")
298+ if(PREFIX)
299+ set(args "")
300+ foreach(arg ${ARGN})
301+ list(APPEND args ${PREFIX})
302+ list(APPEND args ${arg})
303+ endforeach()
304+ endif()
305+ set(${OUTPUT} "${args}" PARENT_SCOPE)
306+endfunction()
tests/CMakeLists.txt+93−8
@@ -1,16 +1,101 @@
1+include(QmlTest)
2+
1# QML tests that do not require graphical capabilities.
3# QML tests that do not require graphical capabilities.
2−add_custom_target(qmlunittests)
4+add_custom_target(unittests)
3
5
4# QML tests that require graphical capabilities.
6# QML tests that require graphical capabilities.
5−add_custom_target(qmluitests)
7+add_custom_target(uitests)
8+add_custom_target(xvfbuitests)
6
9
7−add_custom_target(qmltests)
10+add_custom_target(alltests)
8−add_dependencies(qmltests qmlunittests qmluitests)
11+add_dependencies(alltests unittests uitests)
9
12
10−add_subdirectory(libs)
13+add_custom_target(xvfballtests)
11−add_subdirectory(qmltests)
14+add_dependencies(xvfballtests unittests xvfbuitests)
15+
16+# Support libraries and plugins
12add_subdirectory(mocks)
17add_subdirectory(mocks)
13−add_subdirectory(whitespace)
14−add_subdirectory(plugins)
15add_subdirectory(utils)
18add_subdirectory(utils)
16add_subdirectory(uqmlscene)
19add_subdirectory(uqmlscene)
20+
21+# Use our custom implementation of qmlscene and import dbus-test-runner
22+add_executable(qmlscene ALIAS uqmlscene)
23+import_executables(dbus-test-runner)
24+
25+# Base/default values
26+set(base_environment
27+ UNITY_TESTING=1
28+ LANGUAGE=C
29+ LC_ALL=C.UTF-8
30+)
31+
32+set(import_paths
33+ ${CMAKE_BINARY_DIR}/tests/mocks
34+ ${CMAKE_BINARY_DIR}/tests/utils/modules
35+ ${CMAKE_BINARY_DIR}/plugins
36+)
37+
38+
39+# add a non-graphical unit test
40+# see QmlTest.cmake for additional options
41+function(add_unity8_unittest COMPONENT_NAME TARGET)
42+ cmake_parse_arguments(U8TEST "${QMLTEST_OPTIONS}" "${QMLTESTS_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
43+ add_executable_test(${COMPONENT_NAME} ${TARGET}
44+ ADD_TEST
45+ TARGETS unittests
46+ ${ARGN}
47+ ENVIRONMENT ${base_environment}
48+ QT_QPA_PLATFORM=minimal
49+ ${U8TEST_ENVIRONMENT}
50+ )
51+endfunction()
52+
53+# add a graphical unit test
54+function(add_unity8_uitest COMPONENT_NAME TARGET)
55+ cmake_parse_arguments(U8TEST "${QMLTEST_OPTIONS}" "${QMLTESTS_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
56+ add_executable_test(${COMPONENT_NAME} ${TARGET}
57+ TARGETS uitests
58+ ${ARGN}
59+ ENVIRONMENT ${base_environment}
60+ ${U8TEST_ENVIRONMENT}
61+ )
62+endfunction()
63+
64+# add a non-graphical qml unit test
65+function(add_unity8_qmlunittest PATH COMPONENT_NAME)
66+ cmake_parse_arguments(U8TEST "${QMLTEST_OPTIONS}" "${QMLTESTS_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
67+ add_qml_unittest(${PATH} ${COMPONENT_NAME}
68+ ADD_TEST
69+ IMPORT_PATHS ${import_paths}
70+ TARGET unittests
71+ ${ARGN}
72+ ENVIRONMENT ${base_environment}
73+ QT_QPA_PLATFORM=minimal
74+ ${U8TEST_ENVIRONMENT}
75+ )
76+endfunction()
77+
78+# add a graphical qml test
79+function(add_unity8_qmltest PATH COMPONENT_NAME)
80+ cmake_parse_arguments(U8TEST "${QMLTEST_OPTIONS}" "${QMLTESTS_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
81+ add_qml_test(${PATH} ${COMPONENT_NAME}
82+ IMPORT_PATHS "${import_paths}"
83+ TARGETS uitests
84+ ${ARGN}
85+ ENVIRONMENT ${base_environment}
86+ LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel
87+ ${U8TEST_ENVIRONMENT}
88+ )
89+endfunction()
90+
91+# add a graphical qml benchmark
92+function(add_unity8_qmlbenchmark PATH COMPONENT_NAME ITERATIONS)
93+ add_unity8_qmltest(${PATH} ${COMPONENT_NAME} ${ARGN} ITERATIONS ${ITERATIONS})
94+endfunction()
95+
96+
97+# Actual test definitions
98+add_subdirectory(libs)
99+add_subdirectory(plugins)
100+add_subdirectory(qmltests)
101+add_subdirectory(whitespace)
tests/qmltests/CMakeLists.txt+75−92
@@ -1,95 +1,78 @@
1−# add_qml_test macro
2−include(QmlTest)
3
1
4add_subdirectory(Components)
2add_subdirectory(Components)
5
3
6−set(qmltest_DEFAULT_IMPORT_PATHS
4+add_unity8_qmltest(. Shell)
7− ${CMAKE_BINARY_DIR}/plugins
8− ${CMAKE_BINARY_DIR}/tests/utils/modules
9− ${CMAKE_BINARY_DIR}/tests/mocks
10−)
11−
12−set(qmltest_DEFAULT_TARGETS qmlunittests)
13−set(qmltest_DEFAULT_NO_ADD_TEST FALSE)
14−set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
15−add_qml_test(utils/Unity/Test UnityTest)
16−add_qml_test(Components PhysicalKeysMapper)
17−
18−set(qmltest_DEFAULT_TARGETS qmluitests)
19−set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
20−set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
21−
22−add_qml_test(. Shell)
23−add_qml_test(. ShellWithPin)
5+add_unity8_qmltest(. ShellWithPin)
24−add_qml_test(Components Background)
6+add_unity8_qmltest(Components Background)
25−add_qml_test(Components Carousel)
7+add_unity8_qmltest(Components Carousel)
26−add_qml_test(Components Dialogs)
8+add_unity8_qmltest(Components Dialogs)
27−add_qml_test(Components DraggingArea)
9+add_unity8_qmltest(Components DraggingArea)
28−add_qml_test(Components LazyImage)
10+add_unity8_qmltest(Components LazyImage)
29−add_qml_test(Components Lockscreen)
11+add_unity8_qmltest(Components Lockscreen)
12+add_unity8_qmlunittest(Components PhysicalKeysMapper)
30−add_qml_test(Components Rating)
13+add_unity8_qmltest(Components Rating)
31−add_qml_test(Components ResponsiveGridView)
14+add_unity8_qmltest(Components ResponsiveGridView)
32−add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
15+add_unity8_qmltest(Components ResponsiveVerticalJournal)
33−add_qml_test(Components Showable)
16+add_unity8_qmltest(Components Showable)
34−add_qml_test(Components ZoomableImage)
17+add_unity8_qmltest(Components ZoomableImage)
35−add_qml_test(Dash Dash)
18+add_unity8_qmltest(Dash Dash)
36−add_qml_test(Dash DashContent)
19+add_unity8_qmltest(Dash DashContent)
37−add_qml_test(Dash Card)
20+add_unity8_qmltest(Dash Card)
38−add_qml_benchmark(Dash CardBenchmark 1000)
21+add_unity8_qmlbenchmark(Dash CardBenchmark 1000)
39−add_qml_test(Dash CardTool)
22+add_unity8_qmltest(Dash CardTool)
40−add_qml_test(Dash GenericScopeView)
23+add_unity8_qmltest(Dash GenericScopeView)
41−add_qml_test(Dash PageHeader)
24+add_unity8_qmltest(Dash PageHeader)
42−add_qml_test(Dash PreviewListView)
25+add_unity8_qmltest(Dash PreviewListView)
43−add_qml_test(Dash/Previews Preview)
26+add_unity8_qmltest(Dash/Previews Preview)
44−add_qml_test(Dash/Previews PreviewActions)
27+add_unity8_qmltest(Dash/Previews PreviewActions)
45−add_qml_test(Dash/Previews PreviewAudioPlayback)
28+add_unity8_qmltest(Dash/Previews PreviewAudioPlayback)
46−add_qml_test(Dash/Previews PreviewExpandable)
29+add_unity8_qmltest(Dash/Previews PreviewExpandable)
47−add_qml_test(Dash/Previews PreviewHeader)
30+add_unity8_qmltest(Dash/Previews PreviewHeader)
48−add_qml_test(Dash/Previews PreviewImageGallery)
31+add_unity8_qmltest(Dash/Previews PreviewImageGallery)
49−add_qml_test(Dash/Previews PreviewPayments)
32+add_unity8_qmltest(Dash/Previews PreviewPayments)
50−add_qml_test(Dash/Previews PreviewProgress)
33+add_unity8_qmltest(Dash/Previews PreviewProgress)
51−add_qml_test(Dash/Previews PreviewRatingDisplay)
34+add_unity8_qmltest(Dash/Previews PreviewRatingDisplay)
52−add_qml_test(Dash/Previews PreviewRatingInput)
35+add_unity8_qmltest(Dash/Previews PreviewRatingInput)
53−add_qml_test(Dash/Previews PreviewTable)
36+add_unity8_qmltest(Dash/Previews PreviewTable)
54−add_qml_test(Dash/Previews PreviewTextSummary)
37+add_unity8_qmltest(Dash/Previews PreviewTextSummary)
55−add_qml_test(Dash/Previews PreviewVideoPlayback)
38+add_unity8_qmltest(Dash/Previews PreviewVideoPlayback)
56−add_qml_test(Dash/Previews PreviewWidgetFactory)
39+add_unity8_qmltest(Dash/Previews PreviewWidgetFactory)
57−add_qml_test(Dash/Previews PreviewZoomableImage)
40+add_unity8_qmltest(Dash/Previews PreviewZoomableImage)
58−add_qml_test(Dash/ScopeSettings ScopeSettingBoolean)
41+add_unity8_qmltest(Dash/ScopeSettings ScopeSettingBoolean)
59−add_qml_test(Dash/ScopeSettings ScopeSettingList)
42+add_unity8_qmltest(Dash/ScopeSettings ScopeSettingList)
60−add_qml_test(Dash/ScopeSettings ScopeSettingNumber)
43+add_unity8_qmltest(Dash/ScopeSettings ScopeSettingNumber)
61−add_qml_test(Dash/ScopeSettings ScopeSettingString)
44+add_unity8_qmltest(Dash/ScopeSettings ScopeSettingString)
62−add_qml_test(Dash/ScopeSettings ScopeSettingsWidgetFactory)
45+add_unity8_qmltest(Dash/ScopeSettings ScopeSettingsWidgetFactory)
63−add_qml_test(Greeter Clock)
46+add_unity8_qmltest(Greeter Clock)
64−add_qml_test(Greeter Greeter)
47+add_unity8_qmltest(Greeter Greeter)
65−add_qml_test(Greeter Infographics)
48+add_unity8_qmltest(Greeter Infographics)
66−add_qml_test(Greeter NarrowView)
49+add_unity8_qmltest(Greeter NarrowView)
67−add_qml_test(Greeter WideView)
50+add_unity8_qmltest(Greeter WideView)
68−add_qml_test(Launcher Launcher)
51+add_unity8_qmltest(Launcher Launcher)
69−add_qml_test(Notifications Notifications)
52+add_unity8_qmltest(Notifications Notifications)
70−add_qml_test(Notifications VisualSnapDecisionsQueue)
53+add_unity8_qmltest(Notifications VisualSnapDecisionsQueue)
71−add_qml_test(Notifications OptionToggle)
54+add_unity8_qmltest(Notifications OptionToggle)
72−add_qml_test(Notifications SwipeToAct)
55+add_unity8_qmltest(Notifications SwipeToAct)
73−add_qml_test(Panel ActiveCallHint)
56+add_unity8_qmltest(Panel ActiveCallHint)
74−add_qml_test(Panel IndicatorItem)
57+add_unity8_qmltest(Panel IndicatorItem)
75−add_qml_test(Panel IndicatorItemRow)
58+add_unity8_qmltest(Panel IndicatorItemRow)
76−add_qml_test(Panel IndicatorPage)
59+add_unity8_qmltest(Panel IndicatorPage)
77−add_qml_test(Panel IndicatorsBar)
60+add_unity8_qmltest(Panel IndicatorsBar)
78−add_qml_test(Panel IndicatorsMenu)
61+add_unity8_qmltest(Panel IndicatorsMenu)
79−add_qml_test(Panel MenuContent)
62+add_unity8_qmltest(Panel MenuContent)
80−add_qml_test(Panel Panel)
63+add_unity8_qmltest(Panel Panel)
81−add_qml_test(Panel/Indicators IndicatorsLight ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
64+add_unity8_qmltest(Panel/Indicators IndicatorsLight)
82−# These MenuItemFactory tests need the test/mocks/ to come before plugins/
65+add_unity8_qmltest(Panel/Indicators MenuItemFactory)
83−add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
84−add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
66+add_unity8_qmltest(Panel/Indicators MessageMenuItemFactory)
85−add_qml_test(Stages ApplicationWindow)
67+add_unity8_qmltest(Stages ApplicationWindow)
86−add_qml_test(Stages DesktopStage)
68+add_unity8_qmltest(Stages DesktopStage)
87−add_qml_test(Stages PhoneStage ENVIRONMENT)
69+add_unity8_qmltest(Stages PhoneStage)
88−add_qml_test(Stages SpreadDelegate ENVIRONMENT)
70+add_unity8_qmltest(Stages SpreadDelegate)
89−add_qml_test(Stages SurfaceContainer ENVIRONMENT)
71+add_unity8_qmltest(Stages SurfaceContainer)
90−add_qml_test(Stages SessionContainer ENVIRONMENT)
72+add_unity8_qmltest(Stages SessionContainer)
91−add_qml_test(Stages TabletStage)
73+add_unity8_qmltest(Stages TabletStage)
92−add_qml_test(Stages WindowMoveResizeArea)
74+add_unity8_qmltest(Stages WindowMoveResizeArea)
93−add_qml_test(Stages Splash)
75+add_unity8_qmltest(Stages Splash)
94−add_qml_test(Tutorial Tutorial)
76+add_unity8_qmltest(Tutorial Tutorial)
95−add_qml_test(Wizard Wizard)
77+add_unity8_qmltest(Wizard Wizard)
78+add_unity8_qmlunittest(utils/Unity/Test UnityTest)