git.iko.soy/unity8
on xenial help sign in
Just always link to mock liblightdm, especially now that our mock AS module needs it
41d3bd5Michael Terry
tests/CMakeLists.txt+8−13
compare with xenial
unifiedsplit
@@ -37,27 +37,22 @@ set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")
37
37
38macro(unity8_parse_arguments)
38macro(unity8_parse_arguments)
39 cmake_parse_arguments(U8TEST
39 cmake_parse_arguments(U8TEST
40− "${QMLTEST_OPTIONS};LIGHTDM"
40+ "${QMLTEST_OPTIONS}"
41 "${QMLTEST_SINGLE}"
41 "${QMLTEST_SINGLE}"
42 "${QMLTEST_MULTI}"
42 "${QMLTEST_MULTI}"
43 ${ARGN}
43 ${ARGN}
44 )
44 )
45
45
46 set(ld_paths)
46 set(ld_paths)
47− if(U8TEST_LIGHTDM)
48− list(APPEND ld_paths
47+ list(APPEND ld_paths
49− ${UNITY_MOCKPATH}/libusermetrics
48+ ${UNITY_MOCKPATH}/libusermetrics
50− ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
49+ ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
51− )
50+ )
52− endif()
51+
53−
54− if(ld_paths)
55− string(REPLACE ";" ":" ld_library_path "${ld_paths}")
52+ string(REPLACE ";" ":" ld_library_path "${ld_paths}")
56− set(ld_library_path LD_LIBRARY_PATH=${ld_library_path})
53+ set(ld_library_path LD_LIBRARY_PATH=${ld_library_path})
57− endif()
58
54
59 set(U8TEST_ARGN "${ARGN}")
55 set(U8TEST_ARGN "${ARGN}")
60− list(REMOVE_ITEM U8TEST_ARGN LIGHTDM)
61
56
62 set(environment
57 set(environment
63 UNITY_TESTING=1
58 UNITY_TESTING=1
tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt−3
@@ -26,7 +26,6 @@ add_unity8_uitest(GreeterDBus dbus-test-runner
26 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
26 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
27 DEPENDS MockLightDM
27 DEPENDS MockLightDM
28 IMPORT_PATHS ${UNITY_MOCKPATH}
28 IMPORT_PATHS ${UNITY_MOCKPATH}
29− LIGHTDM
30 )
29 )
31
30
32add_executable(GreeterPamTestExec
31add_executable(GreeterPamTestExec
@@ -63,7 +62,6 @@ target_include_directories(GreeterSessionsModelTestExec PUBLIC
63add_unity8_uitest(GreeterSessions GreeterSessionsModelTestExec
62add_unity8_uitest(GreeterSessions GreeterSessionsModelTestExec
64 ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
63 ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
65 DEPENDS MockLightDM
64 DEPENDS MockLightDM
66− LIGHTDM
67 )
65 )
68
66
69# UsersModelTest
67# UsersModelTest
@@ -87,7 +85,6 @@ target_include_directories(GreeterUsersModelTestExec PUBLIC
87add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
85add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
88 ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
86 ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
89 DEPENDS MockLightDM
87 DEPENDS MockLightDM
90− LIGHTDM
91 )
88 )
92
89
93add_executable(GreeterIntegratedTestExec
90add_executable(GreeterIntegratedTestExec
tests/qmltests/CMakeLists.txt+10−10
@@ -1,14 +1,14 @@
1
1
2add_subdirectory(Components)
2add_subdirectory(Components)
3
3
4−add_unity8_qmltest(. OrientedShell LIGHTDM)
4+add_unity8_qmltest(. OrientedShell)
5add_unity8_qmltest(. DisabledScreenNotice)
5add_unity8_qmltest(. DisabledScreenNotice)
6−add_unity8_qmltest(. Shell LIGHTDM)
6+add_unity8_qmltest(. Shell)
7−add_unity8_qmltest(. ShellWithPin LIGHTDM)
7+add_unity8_qmltest(. ShellWithPin)
8add_unity8_qmltest(. DeviceConfiguration)
8add_unity8_qmltest(. DeviceConfiguration)
9add_unity8_qmltest(Components Background)
9add_unity8_qmltest(Components Background)
10add_unity8_qmltest(Components Carousel)
10add_unity8_qmltest(Components Carousel)
11−add_unity8_qmltest(Components Dialogs LIGHTDM)
11+add_unity8_qmltest(Components Dialogs)
12add_unity8_qmltest(Components DraggingArea)
12add_unity8_qmltest(Components DraggingArea)
13add_unity8_qmltest(Components LazyImage)
13add_unity8_qmltest(Components LazyImage)
14add_unity8_qmltest(Components Lockscreen)
14add_unity8_qmltest(Components Lockscreen)
@@ -25,7 +25,7 @@ add_unity8_qmltest(Components WallpaperResolver)
25add_unity8_qmltest(Components ZoomableImage)
25add_unity8_qmltest(Components ZoomableImage)
26add_unity8_qmltest(Dash Dash)
26add_unity8_qmltest(Dash Dash)
27add_unity8_qmltest(Dash DashContent)
27add_unity8_qmltest(Dash DashContent)
28−add_unity8_qmltest(Dash DashShell LIGHTDM)
28+add_unity8_qmltest(Dash DashShell)
29add_unity8_qmltest(Dash Card)
29add_unity8_qmltest(Dash Card)
30add_unity8_qmltest(Dash CardCarousel)
30add_unity8_qmltest(Dash CardCarousel)
31add_unity8_qmlbenchmark(Dash CardBenchmark 1000)
31add_unity8_qmlbenchmark(Dash CardBenchmark 1000)
@@ -66,10 +66,10 @@ add_unity8_qmltest(Dash/ScopeSettings ScopeSettingNumber)
66add_unity8_qmltest(Dash/ScopeSettings ScopeSettingString)
66add_unity8_qmltest(Dash/ScopeSettings ScopeSettingString)
67add_unity8_qmltest(Dash/ScopeSettings ScopeSettingsWidgetFactory)
67add_unity8_qmltest(Dash/ScopeSettings ScopeSettingsWidgetFactory)
68add_unity8_qmltest(Greeter Clock)
68add_unity8_qmltest(Greeter Clock)
69−add_unity8_qmltest(Greeter Greeter LIGHTDM)
69+add_unity8_qmltest(Greeter Greeter)
70−add_unity8_qmltest(Greeter Infographics LIGHTDM)
70+add_unity8_qmltest(Greeter Infographics)
71−add_unity8_qmltest(Greeter NarrowView LIGHTDM)
71+add_unity8_qmltest(Greeter NarrowView)
72−add_unity8_qmltest(Greeter WideView LIGHTDM)
72+add_unity8_qmltest(Greeter WideView)
73add_unity8_qmltest(Launcher Launcher)
73add_unity8_qmltest(Launcher Launcher)
74add_unity8_qmltest(Notifications Notifications)
74add_unity8_qmltest(Notifications Notifications)
75add_unity8_qmltest(Notifications VisualSnapDecisionsQueue)
75add_unity8_qmltest(Notifications VisualSnapDecisionsQueue)
@@ -94,6 +94,6 @@ add_unity8_qmltest(Stages SurfaceContainer)
94add_unity8_qmltest(Stages TabletStage)
94add_unity8_qmltest(Stages TabletStage)
95add_unity8_qmltest(Stages WindowResizeArea)
95add_unity8_qmltest(Stages WindowResizeArea)
96add_unity8_qmltest(Stages Splash)
96add_unity8_qmltest(Stages Splash)
97−add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
97+add_unity8_qmltest(Tutorial Tutorial)
98add_unity8_qmltest(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")
98add_unity8_qmltest(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")
99add_unity8_qmltest(utils/Unity/Test UnityTest)
99add_unity8_qmltest(utils/Unity/Test UnityTest)