git.iko.soy/unity8
on xenial help sign in
Some small changes that don't fix testing still
commit09bf600e7060761cd89708ae7f64a6a1118fa59f authorJosh Arenson <joshua.arenson@canonical.com> dateThu 24 Sep 2015, 10:52 (11 years ago) parent7abb418
5 files changed+9−6
compare with xenial
unifiedsplit
qml/Greeter/TheLightDM.qml+3 tests/CMakeLists.txt+3−3 tests/mocks/LightDM/CMakeLists.txt+1−1 tests/plugins/LightDM/CMakeLists.txt+1−1 tests/qmltests/Greeter/tst_Greeter.qml+1−1
qml/Greeter/TheLightDM.qml+3
@@ -29,6 +29,9 @@ Loader {
2929 property var infographic: d.valid ? loader.item.infographic : null
3030 property var users: d.valid ? loader.item.users : null
3131 property var userRoles: d.valid ? loader.item.userRoles : null
32+
33+ // This trickery handles cases where applicationArguments aren't provided
34+ // such as during testing
3235 property var fullLightDM: {
3336 if (typeof applicationArguments !== "undefined") {
3437 if (applicationArguments.mode === "greeter") {
tests/CMakeLists.txt+3−3
@@ -41,7 +41,7 @@ macro(unity8_parse_arguments)
4141 if(U8TEST_LIGHTDM)
4242 list(APPEND ld_paths
4343 ${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
44− ${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
44+ ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
4545 )
4646 endif()
4747
@@ -123,6 +123,6 @@ endfunction()
123123
124124# Actual test definitions
125125add_subdirectory(libs)
126−#add_subdirectory(plugins)
126+add_subdirectory(plugins)
127127add_subdirectory(qmltests)
128−#add_subdirectory(whitespace)
128+add_subdirectory(whitespace)
tests/mocks/LightDM/CMakeLists.txt+1−1
@@ -30,7 +30,7 @@ add_library(MockLightDM-qml MODULE
3030 ${QMLPLUGIN_SRC}
3131 )
3232
33−# We want to link to liblightdm-qt5-2, but we don't want to depend on it being
33+# We want to link to liblightdm-qt5-3, but we don't want to depend on it being
3434# installed on the system. So we make sure we link to our full fake version
3535# At run time, we can point to whichever version we happen to be using via
3636# LD_LIBRARY_PATH.
tests/plugins/LightDM/CMakeLists.txt+1−1
@@ -55,7 +55,7 @@ add_dependencies(GreeterUsersModelTestExec MockLightDM)
5555qt5_use_modules(GreeterUsersModelTestExec Core Test)
5656target_link_libraries(GreeterUsersModelTestExec
5757 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
58− -llightdm-qt5-2
58+ -llightdm-qt5-3
5959 )
6060target_include_directories(GreeterUsersModelTestExec PUBLIC
6161 ${CMAKE_SOURCE_DIR}/plugins/LightDM
tests/qmltests/Greeter/tst_Greeter.qml+1−1
@@ -21,7 +21,7 @@ import "../../../qml/Greeter"
2121import Ubuntu.Components 0.1
2222import AccountsService 0.1
2323import GSettings 1.0
24−import LightDM 0.1 // This is the mock
24+import LightDM 0.1 as LightDM // This is the mock
2525import Unity.Test 0.1 as UT
2626
2727Item {