git.iko.soy/unity8
on xenial help sign in
Refactor plugin test
7c93f2aJosh Arenson
tests/plugins/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -1,6 +1,6 @@
1add_subdirectory(AccountsService)
1add_subdirectory(AccountsService)
2add_subdirectory(Greeter)
2add_subdirectory(Greeter)
3−add_subdirectory(LightDM)
3+add_subdirectory(IntegratedLightDM)
4add_subdirectory(Dash)
4add_subdirectory(Dash)
5add_subdirectory(Ubuntu)
5add_subdirectory(Ubuntu)
6add_subdirectory(Unity)
6add_subdirectory(Unity)
tests/plugins/LightDM/CMakeLists.txt → tests/plugins/IntegratedLightDM/CMakeLists.txtrenamed+11−11
@@ -7,46 +7,46 @@ include_directories(
7
7
8add_executable(GreeterDBusTestExec
8add_executable(GreeterDBusTestExec
9 dbus.cpp
9 dbus.cpp
10− ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
10+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
11 )
11 )
12qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
12qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
13target_link_libraries(GreeterDBusTestExec
13target_link_libraries(GreeterDBusTestExec
14− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
14+ -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
15 -llightdm-qt5-2
15 -llightdm-qt5-2
16 )
16 )
17target_include_directories(GreeterDBusTestExec PUBLIC
17target_include_directories(GreeterDBusTestExec PUBLIC
18− ${CMAKE_SOURCE_DIR}/plugins/LightDM
18+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
19− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
19+ ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
20 )
20 )
21−add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
21+add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
22
22
23add_executable(GreeterPamTestExec
23add_executable(GreeterPamTestExec
24 pam.cpp
24 pam.cpp
25− ${CMAKE_SOURCE_DIR}/plugins/LightDM/liblightdm/GreeterPrivate.cpp
25+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp
26 )
26 )
27qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
27qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
28target_link_libraries(GreeterPamTestExec
28target_link_libraries(GreeterPamTestExec
29 integratedLightDM
29 integratedLightDM
30 )
30 )
31target_include_directories(GreeterPamTestExec PUBLIC
31target_include_directories(GreeterPamTestExec PUBLIC
32− ${CMAKE_SOURCE_DIR}/plugins/LightDM/liblightdm
32+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/liblightdm
33 )
33 )
34add_qmltest_target(testGreeterPam "${CMAKE_CURRENT_BINARY_DIR}/GreeterPamTestExec" TRUE FALSE)
34add_qmltest_target(testGreeterPam "${CMAKE_CURRENT_BINARY_DIR}/GreeterPamTestExec" TRUE FALSE)
35add_dependencies(testGreeterPam GreeterPamTestExec)
35add_dependencies(testGreeterPam GreeterPamTestExec)
36
36
37add_executable(GreeterUsersModelTestExec
37add_executable(GreeterUsersModelTestExec
38 usersmodel.cpp
38 usersmodel.cpp
39− ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
39+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
40 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
40 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
41 )
41 )
42qt5_use_modules(GreeterUsersModelTestExec Core Test)
42qt5_use_modules(GreeterUsersModelTestExec Core Test)
43target_link_libraries(GreeterUsersModelTestExec
43target_link_libraries(GreeterUsersModelTestExec
44− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
44+ -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
45 -llightdm-qt5-2
45 -llightdm-qt5-2
46 )
46 )
47target_include_directories(GreeterUsersModelTestExec PUBLIC
47target_include_directories(GreeterUsersModelTestExec PUBLIC
48− ${CMAKE_SOURCE_DIR}/plugins/LightDM
48+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
49 ${CMAKE_SOURCE_DIR}/plugins/Utils
49 ${CMAKE_SOURCE_DIR}/plugins/Utils
50− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
50+ ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
51 )
51 )
52add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "LIBLIGHTDM_MOCK_MODE=full")
52add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "LIBLIGHTDM_MOCK_MODE=full")
tests/plugins/LightDM/dbus.cpp → tests/plugins/IntegratedLightDM/dbus.cpprenamed

The content is the same.

tests/plugins/LightDM/greeter.qml → tests/plugins/IntegratedLightDM/greeter.qmlrenamed

The content is the same.

tests/plugins/LightDM/pam.cpp → tests/plugins/IntegratedLightDM/pam.cpprenamed

The content is the same.

tests/plugins/LightDM/usersmodel.cpp → tests/plugins/IntegratedLightDM/usersmodel.cpprenamed

The content is the same.