mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Reshuffle IVI layout tests

Browse Source 
Rename the IVI tests to be more consistent with the others, and invert
the naming of plugin/client to make it slightly more clear what's going
to happen. Handle the renaming by using wet_get_binary_path to rewrite
the local binaries.

As a side-effect, weston.ini ivi-shell-user-interface no longer needs to
be given as an absolute path.

Signed-off-by: Daniel Stone <daniels@collabora.com>

v2:

Call ivi-layout.ivi as ivi-layout-test-client.ivi to keep the same name
in both the file and the lookup, so that the module map does not need to
change the name.

Update code comments to reflect the new names.

Rename ivi_layout-test-plugin.c to ivi-layout-test-plugin.c.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Daniel Stone
2016-11-28 15:54:06 +00:00
committed by Pekka Paalanen
parent f5c96467e3
commit 78a42116ae
7 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivi-shell/hmi-controller.c
+11 -1
View File
@@ -676,6 +676,7 @@ hmi_server_setting_create(struct weston_compositor *ec)
struct hmi_server_setting *setting = MEM_ALLOC(sizeof(*setting));
struct weston_config *config = wet_get_config(ec);
struct weston_config_section *shell_section = NULL;
char *ivi_ui_config;
shell_section = weston_config_get_section(config, "ivi-shell",
NULL, NULL);
@@ -704,7 +705,16 @@ hmi_server_setting_create(struct weston_compositor *ec)
weston_config_section_get_string(shell_section,
"ivi-shell-user-interface",
&setting->ivi_homescreen, NULL);
&ivi_ui_config, NULL);
if (ivi_ui_config && ivi_ui_config[0] != '/') {
setting->ivi_homescreen = wet_get_binary_path(ivi_ui_config);
if (setting->ivi_homescreen)
free(ivi_ui_config);
else
setting->ivi_homescreen = ivi_ui_config;
} else {
setting->ivi_homescreen = ivi_ui_config;
}
return setting;
}
ivi-shell/weston.ini.in
+4 -4
View File
@@ -1,9 +1,9 @@
[core]
shell=@plugin_prefix@ivi-shell.so
modules=@plugin_prefix@hmi-controller.so
shell=ivi-shell.so
modules=hmi-controller.so
[ivi-shell]
ivi-shell-user-interface=@abs_top_builddir@/weston-ivi-shell-user-interface
ivi-shell-user-interface=weston-ivi-shell-user-interface
#developermode=true
@@ -38,7 +38,7 @@ workspace-background-color=0x99000000
workspace-background-id=2001
[input-method]
path=@libexecdir@/weston-keyboard
path=weston-keyboard
[ivi-launcher]
workspace-id=0