git.iko.soy/unity8
on xenial help sign in
Just always link to mock liblightdm, especially now that our mock AS module needs it
commit41d3bd5127cfcf009c8cfc8924d36fad7a509e24 authorMichael Terry <michael.terry@canonical.com> dateMon 22 Aug 2016, 11:39 (10 years ago) parent775438f
3 files changed+18−26
compare with xenial
unifiedsplit
tests/CMakeLists.txt+8−13 tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt−3 tests/qmltests/CMakeLists.txt+10−10
tests/CMakeLists.txt+8−13
@@ -37,27 +37,22 @@ set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")
3737
3838macro(unity8_parse_arguments)
3939 cmake_parse_arguments(U8TEST
40− "${QMLTEST_OPTIONS};LIGHTDM"
40+ "${QMLTEST_OPTIONS}"
4141 "${QMLTEST_SINGLE}"
4242 "${QMLTEST_MULTI}"
4343 ${ARGN}
4444 )
4545
4646 set(ld_paths)
47− if(U8TEST_LIGHTDM)
48− list(APPEND ld_paths
49− ${UNITY_MOCKPATH}/libusermetrics
50− ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
51− )
52− endif()
53−
54− if(ld_paths)
55− string(REPLACE ";" ":" ld_library_path "${ld_paths}")
56− set(ld_library_path LD_LIBRARY_PATH=${ld_library_path})
57− endif()
47+ list(APPEND ld_paths
48+ ${UNITY_MOCKPATH}/libusermetrics
49+ ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
50+ )
51+
52+ string(REPLACE ";" ":" ld_library_path "${ld_paths}")
53+ set(ld_library_path LD_LIBRARY_PATH=${ld_library_path})
5854
5955 set(U8TEST_ARGN "${ARGN}")
60− list(REMOVE_ITEM U8TEST_ARGN LIGHTDM)
6156
6257 set(environment
6358 UNITY_TESTING=1
tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt−3
@@ -26,7 +26,6 @@ add_unity8_uitest(GreeterDBus dbus-test-runner
2626 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
2727 DEPENDS MockLightDM
2828 IMPORT_PATHS ${UNITY_MOCKPATH}
29− LIGHTDM
3029 )
3130
3231add_executable(GreeterPamTestExec
@@ -63,7 +62,6 @@ target_include_directories(GreeterSessionsModelTestExec PUBLIC
6362add_unity8_uitest(GreeterSessions GreeterSessionsModelTestExec
6463 ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
6564 DEPENDS MockLightDM
66− LIGHTDM
6765 )
6866
6967# UsersModelTest
@@ -87,7 +85,6 @@ target_include_directories(GreeterUsersModelTestExec PUBLIC
8785add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
8886 ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
8987 DEPENDS MockLightDM
90− LIGHTDM
9188 )
9289
9390add_executable(GreeterIntegratedTestExec
tests/qmltests/CMakeLists.txt+10−10
@@ -1,14 +1,14 @@
11
22add_subdirectory(Components)
33
4−add_unity8_qmltest(. OrientedShell LIGHTDM)
4+add_unity8_qmltest(. OrientedShell)
55add_unity8_qmltest(. DisabledScreenNotice)
6−add_unity8_qmltest(. Shell LIGHTDM)
7−add_unity8_qmltest(. ShellWithPin LIGHTDM)
6+add_unity8_qmltest(. Shell)
7+add_unity8_qmltest(. ShellWithPin)
88add_unity8_qmltest(. DeviceConfiguration)
99add_unity8_qmltest(Components Background)
1010add_unity8_qmltest(Components Carousel)
11−add_unity8_qmltest(Components Dialogs LIGHTDM)
11+add_unity8_qmltest(Components Dialogs)
1212add_unity8_qmltest(Components DraggingArea)
1313add_unity8_qmltest(Components LazyImage)
1414add_unity8_qmltest(Components Lockscreen)
@@ -25,7 +25,7 @@ add_unity8_qmltest(Components WallpaperResolver)
2525add_unity8_qmltest(Components ZoomableImage)
2626add_unity8_qmltest(Dash Dash)
2727add_unity8_qmltest(Dash DashContent)
28−add_unity8_qmltest(Dash DashShell LIGHTDM)
28+add_unity8_qmltest(Dash DashShell)
2929add_unity8_qmltest(Dash Card)
3030add_unity8_qmltest(Dash CardCarousel)
3131add_unity8_qmlbenchmark(Dash CardBenchmark 1000)
@@ -66,10 +66,10 @@ add_unity8_qmltest(Dash/ScopeSettings ScopeSettingNumber)
6666add_unity8_qmltest(Dash/ScopeSettings ScopeSettingString)
6767add_unity8_qmltest(Dash/ScopeSettings ScopeSettingsWidgetFactory)
6868add_unity8_qmltest(Greeter Clock)
69−add_unity8_qmltest(Greeter Greeter LIGHTDM)
70−add_unity8_qmltest(Greeter Infographics LIGHTDM)
71−add_unity8_qmltest(Greeter NarrowView LIGHTDM)
72−add_unity8_qmltest(Greeter WideView LIGHTDM)
69+add_unity8_qmltest(Greeter Greeter)
70+add_unity8_qmltest(Greeter Infographics)
71+add_unity8_qmltest(Greeter NarrowView)
72+add_unity8_qmltest(Greeter WideView)
7373add_unity8_qmltest(Launcher Launcher)
7474add_unity8_qmltest(Notifications Notifications)
7575add_unity8_qmltest(Notifications VisualSnapDecisionsQueue)
@@ -94,6 +94,6 @@ add_unity8_qmltest(Stages SurfaceContainer)
9494add_unity8_qmltest(Stages TabletStage)
9595add_unity8_qmltest(Stages WindowResizeArea)
9696add_unity8_qmltest(Stages Splash)
97−add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
97+add_unity8_qmltest(Tutorial Tutorial)
9898add_unity8_qmltest(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")
9999add_unity8_qmltest(utils/Unity/Test UnityTest)