git.iko.soy/unity8
on xenial help sign in
Merge qmltest-refactor
commit95d8c631ac463f9af700c331999fbea784c05bcd authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 1 May 2015, 13:56 (11 years ago) parent4b228dd6b01538
2 files changed+13−13
compare with xenial
unifiedsplit
cmake/modules/QmlTest.cmake+5−5 tests/qmltests/CMakeLists.txt+8−8
cmake/modules/QmlTest.cmake+5−5
@@ -53,7 +53,6 @@ endfunction()
5353# see below for available arguments.
5454
5555function(add_qml_test PATH COMPONENT_NAME)
56− import_executables(qmltestrunner)
5756 cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
5857 mangle_arguments()
5958
@@ -62,16 +61,17 @@ function(add_qml_test PATH COMPONENT_NAME)
6261endfunction()
6362
6463
65−# add_manual_qml_test(path component_name
64+# add_qml_unittest(path component_name
6665# [...]
6766# )
6867#
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
7069# that the test file is named ${path}/tst_${component_name}.qml.
7170#
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+
7373function(add_qml_unittest PATH COMPONENT_NAME)
74− import_executables(qmlscene)
74+ import_executables(qmltestrunner)
7575
7676 add_executable_test(${COMPONENT_NAME} qmltestrunner
7777 ${ARGN}
tests/qmltests/CMakeLists.txt+8−8
@@ -1,11 +1,11 @@
11
22add_subdirectory(Components)
33
4−add_unity8_qmltest(. Shell)
5−add_unity8_qmltest(. ShellWithPin)
4+add_unity8_qmltest(. Shell LIGHTDM)
5+add_unity8_qmltest(. ShellWithPin LIGHTDM)
66add_unity8_qmltest(Components Background)
77add_unity8_qmltest(Components Carousel)
8−add_unity8_qmltest(Components Dialogs)
8+add_unity8_qmltest(Components Dialogs LIGHTDM)
99add_unity8_qmltest(Components DraggingArea)
1010add_unity8_qmltest(Components LazyImage)
1111add_unity8_qmltest(Components Lockscreen)
@@ -44,10 +44,10 @@ add_unity8_qmltest(Dash/ScopeSettings ScopeSettingNumber)
4444add_unity8_qmltest(Dash/ScopeSettings ScopeSettingString)
4545add_unity8_qmltest(Dash/ScopeSettings ScopeSettingsWidgetFactory)
4646add_unity8_qmltest(Greeter Clock)
47−add_unity8_qmltest(Greeter Greeter)
48−add_unity8_qmltest(Greeter Infographics)
49−add_unity8_qmltest(Greeter NarrowView)
50−add_unity8_qmltest(Greeter WideView)
47+add_unity8_qmltest(Greeter Greeter LIGHTDM)
48+add_unity8_qmltest(Greeter Infographics LIGHTDM)
49+add_unity8_qmltest(Greeter NarrowView LIGHTDM)
50+add_unity8_qmltest(Greeter WideView LIGHTDM)
5151add_unity8_qmltest(Launcher Launcher)
5252add_unity8_qmltest(Notifications Notifications)
5353add_unity8_qmltest(Notifications VisualSnapDecisionsQueue)
@@ -73,6 +73,6 @@ add_unity8_qmltest(Stages SessionContainer)
7373add_unity8_qmltest(Stages TabletStage)
7474add_unity8_qmltest(Stages WindowMoveResizeArea)
7575add_unity8_qmltest(Stages Splash)
76−add_unity8_qmltest(Tutorial Tutorial)
76+add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
7777add_unity8_qmltest(Wizard Wizard)
7878add_unity8_qmlunittest(utils/Unity/Test UnityTest)