git.iko.soy/unity8
on xenial help sign in
Fix another test
fb2063fMichael Terry
tests/plugins/LightDM/CMakeLists.txt+1−3
compare with xenial
unifiedsplit
@@ -16,10 +16,8 @@ include_directories(
16 ${CMAKE_SOURCE_DIR}/plugins/LightDM
16 ${CMAKE_SOURCE_DIR}/plugins/LightDM
17 ${CMAKE_SOURCE_DIR}/plugins/Utils
17 ${CMAKE_SOURCE_DIR}/plugins/Utils
18 ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
18 ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
19− ${LIBLIGHTDM_INCLUDE_DIRS}
20 )
19 )
21
20
22−add_dependencies(GreeterDBusTestExec MockLightDM)
23target_link_libraries(GreeterDBusTestExec
21target_link_libraries(GreeterDBusTestExec
24 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
22 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
25 -llightdm-qt5-2
23 -llightdm-qt5-2
@@ -34,4 +32,4 @@ add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
34
32
35add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
33add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
36
34
37−add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "")
35+add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "LIBLIGHTDM_MOCK_MODE=full")
tests/qmltests/CMakeLists.txt+1−1
@@ -90,5 +90,5 @@ add_qml_test(Stages SurfaceContainer ENVIRONMENT)
90add_qml_test(Stages SessionContainer ENVIRONMENT)
90add_qml_test(Stages SessionContainer ENVIRONMENT)
91add_qml_test(Stages WindowMoveResizeArea)
91add_qml_test(Stages WindowMoveResizeArea)
92add_qml_test(Stages Splash)
92add_qml_test(Stages Splash)
93−add_qml_test(Tutorial Tutorial ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
93+add_qml_test(Tutorial Tutorial)
94add_qml_test(Wizard Wizard)
94add_qml_test(Wizard Wizard)