diff options
author | Igor Matheus Andrade Torrente <igormtorrente@gmail.com> | 2020-09-07 11:19:01 -0300 |
---|---|---|
committer | Igor Matheus Andrade Torrente <igormtorrente@gmail.com> | 2020-09-30 09:41:34 -0300 |
commit | d8e09afc9f1e33ff3022e97f05d3a1d3102ef170 (patch) | |
tree | d713e5efe4447ea89cb8253fbd7802d59115d1d2 /ivi-shell | |
parent | 495a8921902e87468d510228e5046dea7a907370 (diff) | |
download | weston-d8e09afc9f1e33ff3022e97f05d3a1d3102ef170.tar.gz |
tests: Convert ivi-shell-app-test.c to use `weston_ini_setup`
Convert ivi-shell-app-test.c to use `weston_ini_setup`. It also removes
the pre-made weston.ini and all the related code in the meson files.
Signed-off-by: Igor Matheus Andrade Torrente <igormtorrente@gmail.com>
Diffstat (limited to 'ivi-shell')
-rw-r--r-- | ivi-shell/meson.build | 5 | ||||
-rw-r--r-- | ivi-shell/weston.ini.in | 98 |
2 files changed, 0 insertions, 103 deletions
diff --git a/ivi-shell/meson.build b/ivi-shell/meson.build index 03fc7175..72a30cb9 100644 --- a/ivi-shell/meson.build +++ b/ivi-shell/meson.build @@ -53,9 +53,4 @@ if get_option('shell-ivi') ivi_test_config.set('libexecdir', dir_libexec) ivi_test_config.set('plugin_prefix', meson.current_build_dir()) ivi_test_config.set('westondatadir', join_paths(dir_data, 'weston')) - ivi_test_ini = configure_file( - input: '../ivi-shell/weston.ini.in', - output: 'weston-ivi-test.ini', - configuration: ivi_test_config - ) endif diff --git a/ivi-shell/weston.ini.in b/ivi-shell/weston.ini.in deleted file mode 100644 index 3bdfbebb..00000000 --- a/ivi-shell/weston.ini.in +++ /dev/null @@ -1,98 +0,0 @@ -[core] -shell=ivi-shell.so -modules=hmi-controller.so - -[ivi-shell] -ivi-shell-user-interface=weston-ivi-shell-user-interface - -#developermode=true - -cursor-theme=default -cursor-size=32 - -base-layer-id=1000 -base-layer-id-offset=10000 - -workspace-background-layer-id=2000 -workspace-layer-id=3000 -application-layer-id=4000 - -transition-duration=300 - -background-image=@westondatadir@/background.png -background-id=1001 -panel-image=@westondatadir@/panel.png -panel-id=1002 -surface-id-offset=10 -tiling-image=@westondatadir@/tiling.png -tiling-id=1003 -sidebyside-image=@westondatadir@/sidebyside.png -sidebyside-id=1004 -fullscreen-image=@westondatadir@/fullscreen.png -fullscreen-id=1005 -random-image=@westondatadir@/random.png -random-id=1006 -home-image=@westondatadir@/home.png -home-id=1007 -workspace-background-color=0x99000000 -workspace-background-id=2001 - -[ivi-launcher] -workspace-id=0 -icon-id=4001 -icon=@westondatadir@/icon_ivi_flower.png -path=@bindir@/weston-flower - -[ivi-launcher] -workspace-id=0 -icon-id=4002 -icon=@westondatadir@/icon_ivi_clickdot.png -path=@bindir@/weston-clickdot - -[ivi-launcher] -workspace-id=1 -icon-id=4003 -icon=@westondatadir@/icon_ivi_simple-egl.png -path=@bindir@/weston-simple-egl - -[ivi-launcher] -workspace-id=1 -icon-id=4004 -icon=@westondatadir@/icon_ivi_simple-shm.png -path=@bindir@/weston-simple-shm - -[ivi-launcher] -workspace-id=2 -icon-id=4005 -icon=@westondatadir@/icon_ivi_smoke.png -path=@bindir@/weston-smoke - -[ivi-launcher] -workspace-id=3 -icon-id=4006 -icon=@westondatadir@/icon_ivi_flower.png -path=@bindir@/weston-flower - -[ivi-launcher] -workspace-id=3 -icon-id=4007 -icon=@westondatadir@/icon_ivi_clickdot.png -path=@bindir@/weston-clickdot - -[ivi-launcher] -workspace-id=3 -icon-id=4008 -icon=@westondatadir@/icon_ivi_simple-egl.png -path=@bindir@/weston-simple-egl - -[ivi-launcher] -workspace-id=3 -icon-id=4009 -icon=@westondatadir@/icon_ivi_simple-shm.png -path=@bindir@/weston-simple-shm - -[ivi-launcher] -workspace-id=3 -icon-id=4010 -icon=@westondatadir@/icon_ivi_smoke.png -path=@bindir@/weston-smoke |