git.iko.soy/unity8
on xenial help sign in
Merge from -refactor
9f9d0f1Michael Terry
tests/qmltests/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -89,5 +89,5 @@ add_qml_test(Stages SurfaceContainer ENVIRONMENT)
89add_qml_test(Stages SessionContainer ENVIRONMENT)
89add_qml_test(Stages SessionContainer ENVIRONMENT)
90add_qml_test(Stages WindowMoveResizeArea)
90add_qml_test(Stages WindowMoveResizeArea)
91add_qml_test(Stages Splash)
91add_qml_test(Stages Splash)
92−add_qml_test(Tutorial Tutorial ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
92+add_qml_test(Tutorial Tutorial)
93add_qml_test(Wizard Wizard)
93add_qml_test(Wizard Wizard)
tests/qmltests/Tutorial/tst_Tutorial.qml+8
@@ -45,6 +45,13 @@ Item {
45 }
45 }
46 }
46 }
47
47
48+ Component.onCompleted: {
49+ // must set the mock mode before loading the Shell
50+ LightDM.Greeter.mockMode = "single-pin";
51+ LightDM.Users.mockMode = "single-pin";
52+ shellLoader.active = true;
53+ }
54+
48 Row {
55 Row {
49 spacing: 0
56 spacing: 0
50 anchors.fill: parent
57 anchors.fill: parent
@@ -52,6 +59,7 @@ Item {
52 Loader {
59 Loader {
53 id: shellLoader
60 id: shellLoader
54
61
62+ active: false
55 width: units.gu(40)
63 width: units.gu(40)
56 height: units.gu(71)
64 height: units.gu(71)
57
65