git.iko.soy/unity8
on xenial help sign in
Fix another test
commitfb2063f2158a72b2977fcc8147981e80a6798ec9 authorMichael Terry <michael.terry@canonical.com> dateThu 5 Feb 2015, 16:13 (12 years ago) parent953f6299f9d0f1
2 files changed+2−4
compare with xenial
unifiedsplit
tests/plugins/LightDM/CMakeLists.txt+1−3 tests/qmltests/CMakeLists.txt+1−1
tests/plugins/LightDM/CMakeLists.txt+1−3
@@ -16,10 +16,8 @@ include_directories(
1616 ${CMAKE_SOURCE_DIR}/plugins/LightDM
1717 ${CMAKE_SOURCE_DIR}/plugins/Utils
1818 ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
19− ${LIBLIGHTDM_INCLUDE_DIRS}
2019 )
2120
22−add_dependencies(GreeterDBusTestExec MockLightDM)
2321target_link_libraries(GreeterDBusTestExec
2422 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
2523 -llightdm-qt5-2
@@ -34,4 +32,4 @@ add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
3432
3533add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
3634
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)
9090add_qml_test(Stages SessionContainer ENVIRONMENT)
9191add_qml_test(Stages WindowMoveResizeArea)
9292add_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)
9494add_qml_test(Wizard Wizard)