git.iko.soy/unity8
on xenial help sign in
Merge qmltest-refactor
95d8c63Michał Sawicz
cmake/modules/QmlTest.cmake+5−5
compare with xenial
unifiedsplit
@@ -53,7 +53,6 @@ endfunction()
53# see below for available arguments.
53# see below for available arguments.
54
54
55function(add_qml_test PATH COMPONENT_NAME)
55function(add_qml_test PATH COMPONENT_NAME)
56− import_executables(qmltestrunner)
57 cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
56 cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
58 mangle_arguments()
57 mangle_arguments()
59
58
@@ -62,16 +61,17 @@ function(add_qml_test PATH COMPONENT_NAME)
62endfunction()
61endfunction()
63
62
64
63
65−# add_manual_qml_test(path component_name
64+# add_qml_unittest(path component_name
66# [...]
65# [...]
67# )
66# )
68#
67#
69−# Add manual test targets for ${component_name} under ${path}. It's assumed
68+# Add test targets for ${component_name} under ${path}. It's assumed
70# that the test file is named ${path}/tst_${component_name}.qml.
69# that the test file is named ${path}/tst_${component_name}.qml.
71#
70#
72−# This function wraps add_manual_test, see below for available arguments.
71+# This function wraps add_executable_test, see below for available arguments.
72+
73function(add_qml_unittest PATH COMPONENT_NAME)
73function(add_qml_unittest PATH COMPONENT_NAME)
74− import_executables(qmlscene)
74+ import_executables(qmltestrunner)
75
75
76 add_executable_test(${COMPONENT_NAME} qmltestrunner
76 add_executable_test(${COMPONENT_NAME} qmltestrunner
77 ${ARGN}
77 ${ARGN}
tests/qmltests/CMakeLists.txt+8−8
@@ -1,11 +1,11 @@
1
1
2add_subdirectory(Components)
2add_subdirectory(Components)
3
3
4−add_unity8_qmltest(. Shell)
4+add_unity8_qmltest(. Shell LIGHTDM)
5−add_unity8_qmltest(. ShellWithPin)
5+add_unity8_qmltest(. ShellWithPin LIGHTDM)
6add_unity8_qmltest(Components Background)
6add_unity8_qmltest(Components Background)
7add_unity8_qmltest(Components Carousel)
7add_unity8_qmltest(Components Carousel)
8−add_unity8_qmltest(Components Dialogs)
8+add_unity8_qmltest(Components Dialogs LIGHTDM)
9add_unity8_qmltest(Components DraggingArea)
9add_unity8_qmltest(Components DraggingArea)
10add_unity8_qmltest(Components LazyImage)
10add_unity8_qmltest(Components LazyImage)
11add_unity8_qmltest(Components Lockscreen)
11add_unity8_qmltest(Components Lockscreen)
@@ -44,10 +44,10 @@ add_unity8_qmltest(Dash/ScopeSettings ScopeSettingNumber)
44add_unity8_qmltest(Dash/ScopeSettings ScopeSettingString)
44add_unity8_qmltest(Dash/ScopeSettings ScopeSettingString)
45add_unity8_qmltest(Dash/ScopeSettings ScopeSettingsWidgetFactory)
45add_unity8_qmltest(Dash/ScopeSettings ScopeSettingsWidgetFactory)
46add_unity8_qmltest(Greeter Clock)
46add_unity8_qmltest(Greeter Clock)
47−add_unity8_qmltest(Greeter Greeter)
47+add_unity8_qmltest(Greeter Greeter LIGHTDM)
48−add_unity8_qmltest(Greeter Infographics)
48+add_unity8_qmltest(Greeter Infographics LIGHTDM)
49−add_unity8_qmltest(Greeter NarrowView)
49+add_unity8_qmltest(Greeter NarrowView LIGHTDM)
50−add_unity8_qmltest(Greeter WideView)
50+add_unity8_qmltest(Greeter WideView LIGHTDM)
51add_unity8_qmltest(Launcher Launcher)
51add_unity8_qmltest(Launcher Launcher)
52add_unity8_qmltest(Notifications Notifications)
52add_unity8_qmltest(Notifications Notifications)
53add_unity8_qmltest(Notifications VisualSnapDecisionsQueue)
53add_unity8_qmltest(Notifications VisualSnapDecisionsQueue)
@@ -73,6 +73,6 @@ add_unity8_qmltest(Stages SessionContainer)
73add_unity8_qmltest(Stages TabletStage)
73add_unity8_qmltest(Stages TabletStage)
74add_unity8_qmltest(Stages WindowMoveResizeArea)
74add_unity8_qmltest(Stages WindowMoveResizeArea)
75add_unity8_qmltest(Stages Splash)
75add_unity8_qmltest(Stages Splash)
76−add_unity8_qmltest(Tutorial Tutorial)
76+add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
77add_unity8_qmltest(Wizard Wizard)
77add_unity8_qmltest(Wizard Wizard)
78add_unity8_qmlunittest(utils/Unity/Test UnityTest)
78add_unity8_qmlunittest(utils/Unity/Test UnityTest)