Bug fix TIVI-976 ,TIVI-974 and addition of the window animation interface.submit/2.0alpha-wayland/20130527.091242accepted/2.0alpha-wayland/20130603.172729

Change-Id: I4d6c36d96707c3a737ce59f115fdd7c0c54a12a6
Signed-off-by: Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp>

21 files changed, 109 insertions, 243 deletions

diff --git a/packaging/ico-uxf-weston-plugin.changes b/packaging/ico-uxf-weston-plugin.changes
index d834295..7b92590 100644
--- a/packaging/ico-uxf-weston-plugin.changes
+++ b/packaging/ico-uxf-weston-plugin.changes
@@ -1,3 +1,12 @@
+* Fri May 24 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/2.0alpha-wayland/20130520.093312@6f0a9e8
+- 0.5.03 release
+- Fix for TIVI-976 - Sometimes weston failed to be startup with 10% possibility.
+  When there is operation of surface(resize, change of the position, etc) just after surface creation from HomeScreen,
+  Weston falls in segmentation fault.
+- Fix for TIVI-974 - [WLD]Failed to execute Ico-uxf-weston-plugin test script with error "No testlog directory".
+  Create testlog directory in an examination script
+- Work around - Addition of the window animation interface.
+
 * Wed May 22 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/2.0alpha-wayland/20130520.093312@8ed2bc5
 - 0.5.02 release
 - Fix for TIVI-803 - Enable new UI in wayland build
diff --git a/packaging/ico-uxf-weston-plugin.spec b/packaging/ico-uxf-weston-plugin.spec
index 12850b5..7bbda2a 100644
--- a/packaging/ico-uxf-weston-plugin.spec
+++ b/packaging/ico-uxf-weston-plugin.spec
@@ -1,6 +1,6 @@
 Name:       ico-uxf-weston-plugin
 Summary:    Weston Plugins for IVI
-Version:    0.5.02
+Version:    0.5.03
 Release:    1.1
 Group:      System/GUI/Libraries
 License:    MIT
diff --git a/protocol/ico_window_mgr.xml b/protocol/ico_window_mgr.xml
index fc565b6..b36b98f 100644
--- a/protocol/ico_window_mgr.xml
+++ b/protocol/ico_window_mgr.xml
@@ -33,9 +33,9 @@
       <arg name="raise" type="int"/>
     </request>
 
-    <request name="set_transition">
+    <request name="set_animation">
       <arg name="surfaceid" type="uint"/>
-      <arg name="transition" type="int"/>
+      <arg name="animation" type="string"/>
     </request>
 
     <request name="set_active">
diff --git a/src/config-parser.c b/src/config-parser.c
index d291ac6..0397a38 100644
--- a/src/config-parser.c
+++ b/src/config-parser.c
@@ -32,11 +32,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#if 1   /* Build in old Weston(1.0.6)   */
-#include "config-parser.h"
-#else   /* Build on new Weston          */
 #include <weston/config-parser.h>
-#endif
 
 static int
 handle_key(const struct config_key *key, const char *value)
@@ -107,9 +103,10 @@ parse_config_file(int fd,
 
     if (fd == -1)
         return -1;
+
     fp = fdopen(dup(fd), "r");
     if (fp == NULL) {
-        perror("couldn't open config flle");
+            perror("couldn't open config file");
         return -1;
     }
 
@@ -165,43 +162,6 @@ parse_config_file(int fd,
     return 0;
 }
 
-#if 0
-char *
-config_file_path(const char *name)
-{
-    const char dotconf[] = "/.config/";
-    const char *config_dir;
-    const char *home_dir;
-    char *path;
-    size_t size;
-
-    config_dir = getenv("XDG_CONFIG_HOME");
-    if (!config_dir) {
-        home_dir = getenv("HOME");
-        if (!home_dir) {
-            fprintf(stderr, "HOME is not set, using cwd.\n");
-            return strdup(name);
-        }
-
-        size = strlen(home_dir) + sizeof dotconf + strlen(name);
-        path = malloc(size);
-        if (!path)
-            return NULL;
-
-        snprintf(path, size, "%s%s%s", home_dir, dotconf, name);
-        return path;
-    }
-
-    size = strlen(config_dir) + 1 + strlen(name) + 1;
-    path = malloc(size);
-    if (!path)
-        return NULL;
-
-    snprintf(path, size, "%s/%s", config_dir, name);
-    return path;
-}
-#endif
-
 int
 open_config_file(const char *name)
 {
@@ -230,8 +190,6 @@ open_config_file(const char *name)
         fd = open(path, O_RDONLY | O_CLOEXEC);
         if (fd >= 0)
             return fd;
-        if (fd >= 0)
-            return fd;
     }
 
     /* For each $XDG_CONFIG_DIRS: weston/<config_file> */
@@ -241,7 +199,7 @@ open_config_file(const char *name)
     for (p = config_dirs; *p != '\0'; p = next) {
         next = strchrnul(p, ':');
         snprintf(path, sizeof path,
-                 "%.*s/weston/%s", (int)(next - p), p, name);
+             "%.*s/weston/%s", (int)(next - p), p, name);
         fd = open(path, O_RDONLY | O_CLOEXEC);
         if (fd >= 0)
             return fd;
@@ -256,11 +214,10 @@ open_config_file(const char *name)
 
     if (fd >= 0)
         fprintf(stderr,
-                "using config in current working directory: %s\n",
-                 path);
+            "using config in current working directory: %s\n",
+            path);
     else
         fprintf(stderr, "config file \"%s\" not found.\n", name);
 
     return fd;
 }
-
diff --git a/src/config-parser.h b/src/config-parser.h
deleted file mode 100644
index 456b9a7..0000000
--- a/src/config-parser.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright © 2008 Kristian Høgsberg
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef CONFIGPARSER_H
-#define CONFIGPARSER_H
-
-enum config_key_type {
-    CONFIG_KEY_INTEGER,     /* typeof data = int */
-    CONFIG_KEY_UNSIGNED_INTEGER,    /* typeof data = unsigned int */
-    CONFIG_KEY_STRING,      /* typeof data = char* */
-    CONFIG_KEY_BOOLEAN      /* typeof data = int */
-};
-
-struct config_key {
-    const char *name;
-    enum config_key_type type;
-    void *data;
-};
-
-struct config_section {
-    const char *name;
-    const struct config_key *keys;
-    int num_keys;
-    void (*done)(void *data);
-};
-
-int
-parse_config_file(int fd,
-          const struct config_section *sections, int num_sections,
-          void *data);
-
-int
-open_config_file(const char *name);
-
-enum weston_option_type {
-    WESTON_OPTION_INTEGER,
-    WESTON_OPTION_UNSIGNED_INTEGER,
-    WESTON_OPTION_STRING,
-    WESTON_OPTION_BOOLEAN
-};
-
-struct weston_option {
-    enum weston_option_type type;
-    const char *name;
-    int short_name;
-    void *data;
-};
-
-int
-parse_options(const struct weston_option *options,
-          int count, int argc, char *argv[]);
-
-#endif /* CONFIGPARSER_H */
-
diff --git a/src/ico_ivi_shell.c b/src/ico_ivi_shell.c
index 735a53b..1621d3a 100644
--- a/src/ico_ivi_shell.c
+++ b/src/ico_ivi_shell.c
@@ -47,14 +47,6 @@
 #include "ico_ivi_shell.h"
 #include "ico_ivi_shell-server-protocol.h"
 
-/* Animation to apply at the time of indication start of the screen */
-enum animation_type {
-    ANIMATION_NONE,                 /* No animation                         */
-    ANIMATION_ZOOM,                 /* Zoom In                              */
-    ANIMATION_FADE,                 /* Fade In                              */
-    ANIMATION_SLIDE                 /* Slide In                             */
-};
-
 /* Layer management                 */
 struct  ivi_layer_list  {
     int     layer;                  /* Layer.ID                             */
@@ -70,7 +62,8 @@ struct ivi_shell {
     struct wl_listener destroy_listener;
     struct weston_layer surface;            /* Surface list                 */
     struct ivi_layer_list ivi_layer;        /* Layer list                   */
-    enum animation_type win_animation_type; /* Default animetion            */
+    char win_animation[ICO_WINDOW_ANIMATION_LEN];
+                                            /* Default animation name       */
     int win_visible_on_create;              /* Visible on create surface    */
     struct shell_surface *active_pointer_shsurf;
                                             /* Pointer active shell surface */
@@ -149,34 +142,6 @@ static void (*shell_hook_select)(struct weston_surface *surface) = NULL;
 
 /*--------------------------------------------------------------------------*/
 /**
- * @brief   get_animation_type: animetion type convert name to enumeration value.
- *
- * @param[in]   animation   animation name
- * @return      animetion enumeration value
- * @retval      ANIMATION_NONE  no animetion
- * @retval      ANIMATION_ZOOM  zoom animetion
- * @retval      ANIMATION_FADE  fade animetion
- * @retval      ANIMATION_SLIDE slide animetion
- */
-/*--------------------------------------------------------------------------*/
-static enum animation_type
-get_animation_type(char *animation)
-{
-    if (!animation)
-        return ANIMATION_NONE;
-
-    if (!strcmp("zoom", animation))
-        return ANIMATION_ZOOM;
-    else if (!strcmp("fade", animation))
-        return ANIMATION_FADE;
-    else if (!strcmp("slide", animation))
-        return ANIMATION_SLIDE;
-    else
-        return ANIMATION_NONE;
-}
-
-/*--------------------------------------------------------------------------*/
-/**
  * @brief   shell_configuration: initiale configuration ico_ivi_shell
  *
  * @param[in]   shell   ico_ivi_shell static table area
@@ -202,10 +167,10 @@ shell_configuration(struct ivi_shell *shell)
     parse_config_file(config_fd, cs, ARRAY_LENGTH(cs), shell);
     close(config_fd);
 
-    shell->win_animation_type = get_animation_type(win_animation);
+    strncpy(shell->win_animation, win_animation, sizeof(shell->win_animation)-1);
 
-    uifw_info("shell_configuration: Anima=%d Visible=%d Debug=%d",
-              shell->win_animation_type, shell->win_visible_on_create,
+    uifw_info("shell_configuration: Anima=%s Visible=%d Debug=%d",
+              shell->win_animation, shell->win_visible_on_create,
               ico_ivi_debuglevel());
 }
 
@@ -715,6 +680,9 @@ create_shell_surface(void *shell, struct weston_surface *surface,
     shsurf->surface = surface;
     shsurf->visible = shsurf->shell->win_visible_on_create;
 
+    /* set default color and shader */
+    weston_surface_set_color(surface, 0.0, 0.0, 0.0, 1);
+
     wl_signal_init(&shsurf->resource.destroy_signal);
     shsurf->surface_destroy_listener.notify = shell_handle_surface_destroy;
     wl_signal_add(&surface->surface.resource.destroy_signal,
@@ -911,22 +879,6 @@ map(struct ivi_shell *shell, struct weston_surface *surface,
         ivi_shell_restack_ivi_layer(shell, shsurf);
     }
 
-    if (surface_type == SHELL_SURFACE_TOPLEVEL) {
-        switch (shell->win_animation_type) {
-        case ANIMATION_FADE:
-            weston_fade_run(surface, NULL, NULL);
-            break;
-        case ANIMATION_ZOOM:
-            weston_zoom_run(surface, 0.8, 1.0, NULL, NULL);
-            break;
-        case ANIMATION_SLIDE:
-            weston_slide_run(surface, (float)surface->geometry.height, 0.0, NULL, NULL);
-            break;
-        default:
-            break;
-        }
-    }
-
     if (shell_hook_map) {
         /* Surface map hook routine         */
         uifw_trace("map: call ivi_shell_hook_map(%08x, x/y=%d/%d, w/h=%d/%d)",
@@ -1400,6 +1352,20 @@ ivi_shell_set_active(struct shell_surface *shsurf, const int target)
 
 /*--------------------------------------------------------------------------*/
 /**
+ * @brief   ivi_shell_default_animation: window default animation
+ *
+ * @param       none
+ * @return      default animation name
+ */
+/*--------------------------------------------------------------------------*/
+WL_EXPORT const char *
+ivi_shell_default_animation(void)
+{
+    return default_shell->win_animation;
+}
+
+/*--------------------------------------------------------------------------*/
+/**
  * @brief   click_to_activate_binding: clieck and select surface
  *
  * @param[in]   seat        clicked target seat
diff --git a/src/ico_ivi_shell.h b/src/ico_ivi_shell.h
index eaad346..15e6772 100644
--- a/src/ico_ivi_shell.h
+++ b/src/ico_ivi_shell.h
@@ -32,10 +32,12 @@
 
 struct shell_surface;
 
+/* max length                           */
+#define ICO_WINDOW_ANIMATION_LEN    20          /* length of window animation name  */
 /* option flag                          */
-#define ICO_OPTION_FLAG_UNVISIBLE   0x00000001      /* unvisible control    */
+#define ICO_OPTION_FLAG_UNVISIBLE   0x00000001  /* unvisible control    */
 
-/* Prototype for set function           */
+/* Prototype for get/set function       */
 void ivi_shell_set_layer(struct shell_surface *shsurf, const int layer);
 bool ivi_shell_is_visible(struct shell_surface *shsurf);
 void ivi_shell_set_visible(struct shell_surface *shsurf, const int visible);
@@ -50,6 +52,7 @@ void ivi_shell_set_layer_visible(const int layer, const int visible);
 void ivi_shell_surface_configure(struct shell_surface *shsurf, const int x,
                                  const int y, const int width, const int height);
 void ivi_shell_set_active(struct shell_surface *shsurf, const int target);
+const char *ivi_shell_default_animation(void);
 
 /* Prototypr for hook routine           */
 void ivi_shell_hook_bind(void (*hook_bind)(struct wl_client *client));
diff --git a/src/ico_window_mgr.c b/src/ico_window_mgr.c
index 3c2d14e..ac8ce1e 100644
--- a/src/ico_window_mgr.c
+++ b/src/ico_window_mgr.c
@@ -81,7 +81,8 @@ struct uifw_win_surface {
     int     y;                              /* Y-axis                               */
     int     width;                          /* Width                                */
     int     height;                         /* Height                               */
-    int     transition;                     /* Transition                           */
+    char    animation[ICO_WINDOW_ANIMATION_LEN];
+                                            /* Animation name                       */
     struct wl_list link;                    /*                                      */
     struct uifw_win_surface *next_idhash;   /* UIFW SurfaceId hash list             */
     struct uifw_win_surface *next_wshash;   /* Weston SurfaceId hash list           */
@@ -160,9 +161,9 @@ static void uifw_set_positionsize(struct wl_client *client,
                                             /* show/hide and raise/lower surface    */
 static void uifw_set_visible(struct wl_client *client, struct wl_resource *resource,
                              uint32_t surfaceid, int32_t visible, int32_t raise);
-                                            /* set surface transition               */
-static void uifw_set_transition(struct wl_client *client, struct wl_resource *resource,
-                                uint32_t surfaceid, int32_t transition);
+                                            /* set surface animation                */
+static void uifw_set_animation(struct wl_client *client, struct wl_resource *resource,
+                               uint32_t surfaceid, const char *animation);
                                             /* set active surface (form HomeScreen) */
 static void uifw_set_active(struct wl_client *client, struct wl_resource *resource,
                             uint32_t surfaceid, uint32_t target);
@@ -207,7 +208,7 @@ static const struct ico_window_mgr_interface ico_window_mgr_implementation = {
     uifw_set_window_layer,
     uifw_set_positionsize,
     uifw_set_visible,
-    uifw_set_transition,
+    uifw_set_animation,
     uifw_set_active,
     uifw_set_layer_visible
 };
@@ -562,6 +563,8 @@ client_register_surface(struct wl_client *client, struct wl_resource *resource,
     us->id = generate_id();
     us->surface = surface;
     us->shsurf = shsurf;
+    strncpy(us->animation, ivi_shell_default_animation(), sizeof(us->animation)-1);
+
     if (_ico_win_mgr->num_manager <= 0) {
         uifw_trace("client_register_surface: No Manager, Force visible");
         ivi_shell_set_visible(shsurf, 1);   /* NOT exist HomeScreen     */
@@ -1029,6 +1032,21 @@ uifw_set_visible(struct wl_client *client, struct wl_resource *resource,
             uifw_trace("uifw_set_visible: Leave(No Change)");
             return;
         }
+#if 0   /* the animation function does not yet support it   */
+        if (strcasecmp(usurf->animation, "fade") == 0)  {
+            uifw_trace("uifw_set_visible: start animation fade(%08x)", (int)usurf->surface);
+            weston_fade_run(usurf->surface, NULL, NULL);
+        }
+        else if (strcasecmp(usurf->animation, "zoom") == 0) {
+            uifw_trace("uifw_set_visible: start animation zoom(%08x)", (int)usurf->surface);
+            weston_zoom_run(usurf->surface, 0.8, 1.0, NULL, NULL);
+        }
+        else if (strcasecmp(usurf->animation, "slide") == 0)    {
+            uifw_trace("uifw_set_visible: start animation slide(%08x)", (int)usurf->surface);
+            weston_slide_run(usurf->surface, (float)usurf->surface->geometry.height,
+                             0.0, NULL, NULL);
+        }
+#endif  /* the animation function does not yet support it   */
     }
     else if (visible == 0)  {
 
@@ -1068,30 +1086,31 @@ uifw_set_visible(struct wl_client *client, struct wl_resource *resource,
 
 /*--------------------------------------------------------------------------*/
 /**
- * @brief   uifw_set_transition: set transition of surface visible/unvisible
+ * @brief   uifw_set_animation: set animation of surface visible/unvisible
  *
  * @param[in]   client      Weyland client
  * @param[in]   resource    resource of request
  * @param[in]   surfaceid   UIFW surface id
- * @param[in]   transition  transiton id
+ * @param[in]   animation   animation name
  * @return      none
  */
 /*--------------------------------------------------------------------------*/
 static void
-uifw_set_transition(struct wl_client *client, struct wl_resource *resource,
-                    uint32_t surfaceid, int32_t transition)
+uifw_set_animation(struct wl_client *client, struct wl_resource *resource,
+                   uint32_t surfaceid, const char *animation)
 {
     struct uifw_win_surface* usurf = find_uifw_win_surface_by_id(surfaceid);
 
-    uifw_trace("uifw_set_transition: Enter(surf=%08x, transition=%d)",
-                surfaceid, transition);
+    uifw_trace("uifw_set_transition: Enter(surf=%08x, animation=%s)",
+               surfaceid, animation);
 
     if (usurf) {
-        usurf->transition = transition;
-        uifw_trace("uifw_set_transition: Leave(OK)");
+        memset(usurf->animation, 0, sizeof(usurf->animation));
+        strncpy(usurf->animation, animation, sizeof(usurf->animation)-1);
+        uifw_trace("uifw_set_animation: Leave(OK)");
     }
     else    {
-        uifw_trace("uifw_set_transition: Leave(Surface(%08x) Not exist)", surfaceid);
+        uifw_trace("uifw_set_animation: Leave(Surface(%08x) Not exist)", surfaceid);
     }
 }
 
diff --git a/tests/test-homescreen.c b/tests/test-homescreen.c
index 1c984a9..c76564a 100644
--- a/tests/test-homescreen.c
+++ b/tests/test-homescreen.c
@@ -1020,28 +1020,26 @@ raise_surface(struct display *display, char *buf, const int raise)
 }
 
 static void
-transition_surface(struct display *display, char *buf)
+animation_surface(struct display *display, char *buf)
 {
     char    *args[10];
     int     narg;
     int     surfaceid;
-    int     transition;
 
     narg = pars_command(buf, args, 10);
     if (narg >= 2)  {
         surfaceid = search_surface(display, args[0]);
-        transition = strtol(args[1], (char **)0, 0);
-        if ((surfaceid >= 0) && (transition >=0))   {
-            print_log("HOMESCREEN: transition(%s,%08x,%d)", args[0], surfaceid, transition);
-            ico_window_mgr_set_transition(display->ico_window_mgr, surfaceid, transition);
+        if (surfaceid >= 0) {
+            print_log("HOMESCREEN: animation(%s,%08x,%d)", args[0], surfaceid, args[1]);
+            ico_window_mgr_set_animation(display->ico_window_mgr, surfaceid, args[1]);
         }
         else    {
-            print_log("HOMESCREEN: Unknown surface(%s) at transition command", args[0]);
+            print_log("HOMESCREEN: Unknown surface(%s) at animation command", args[0]);
         }
     }
     else    {
-        print_log("HOMESCREEN: transition command"
-                  "[transition appid transition] has no argument");
+        print_log("HOMESCREEN: animation command"
+                  "[animation appid animation] has no argument");
     }
 }
 
@@ -1410,9 +1408,9 @@ int main(int argc, char *argv[])
             /* Raise/Lower surface window   */
             raise_surface(display, &buf[5], 0);
         }
-        else if (strncasecmp(buf, "transition", 10) == 0) {
-            /* Set transition surface window*/
-            transition_surface(display, &buf[10]);
+        else if (strncasecmp(buf, "animation", 9) == 0) {
+            /* Set animation surface window*/
+            animation_surface(display, &buf[9]);
         }
         else if (strncasecmp(buf, "input_add", 9) == 0) {
             /* Set input switch to application */
diff --git a/tests/weston-plugin-test b/tests/weston-plugin-test
index b474bd5..4fc0818 100755
--- a/tests/weston-plugin-test
+++ b/tests/weston-plugin-test
@@ -5,7 +5,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel)
 ../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log &
diff --git a/tests/weston-plugin-test.homescreen b/tests/weston-plugin-test.homescreen
index d7fc29b..a44b1d8 100755
--- a/tests/weston-plugin-test.homescreen
+++ b/tests/weston-plugin-test.homescreen
@@ -6,7 +6,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Weston/Wayland Envionment
 export XDG_RUNTIME_DIR=/tmp/run-root
diff --git a/tests/weston-plugin-test.input b/tests/weston-plugin-test.input
index 0990ea9..ce9e8a7 100755
--- a/tests/weston-plugin-test.input
+++ b/tests/weston-plugin-test.input
@@ -5,7 +5,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel)
 ../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log &
diff --git a/tests/weston-plugin-test.notouch b/tests/weston-plugin-test.notouch
index b6a6fae..e4803f8 100755
--- a/tests/weston-plugin-test.notouch
+++ b/tests/weston-plugin-test.notouch
@@ -5,7 +5,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel)
 #../tests/test-send_event -mq=5551 &
diff --git a/tests/weston-plugin-test.resize b/tests/weston-plugin-test.resize
index 4999038..95f48a5 100755
--- a/tests/weston-plugin-test.resize
+++ b/tests/weston-plugin-test.resize
@@ -5,7 +5,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel)
 ../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log &
diff --git a/tests/weston-plugin-test.resize_flower b/tests/weston-plugin-test.resize_flower
index 12d4411..47ecdfc 100755
--- a/tests/weston-plugin-test.resize_flower
+++ b/tests/weston-plugin-test.resize_flower
@@ -5,7 +5,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel)
 ../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log &
diff --git a/tests/weston-plugin-test.resize_native b/tests/weston-plugin-test.resize_native
index fb26de0..e2afd5a 100755
--- a/tests/weston-plugin-test.resize_native
+++ b/tests/weston-plugin-test.resize_native
@@ -5,7 +5,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel)
 ../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log &
diff --git a/tests/weston-plugin-test.resize_smoke b/tests/weston-plugin-test.resize_smoke
index f725aae..8f417ca 100755
--- a/tests/weston-plugin-test.resize_smoke
+++ b/tests/weston-plugin-test.resize_smoke
@@ -5,7 +5,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel)
 ../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log &
diff --git a/tests/weston-plugin-test.resize_smoke2 b/tests/weston-plugin-test.resize_smoke2
index a012e10..17b861f 100755
--- a/tests/weston-plugin-test.resize_smoke2
+++ b/tests/weston-plugin-test.resize_smoke2
@@ -5,7 +5,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel)
 ../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log &
diff --git a/tests/weston-plugin-test_gdb b/tests/weston-plugin-test_gdb
index 2e0a697..7fcaee5 100755
--- a/tests/weston-plugin-test_gdb
+++ b/tests/weston-plugin-test_gdb
@@ -5,7 +5,8 @@
 #	  Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel)
 ../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log &
diff --git a/tests/weston_ivi_plugin.ini b/tests/weston_ivi_plugin.ini
index 89798d3..69145ac 100644
--- a/tests/weston_ivi_plugin.ini
+++ b/tests/weston_ivi_plugin.ini
@@ -2,8 +2,8 @@
 modules=ico_ivi_common.so,ico_ivi_shell.so,ico_window_mgr.so,ico_input_mgr.so
 
 [shell]
-animation=none
-#animation=zoom
+#animation=none
+animation=fade
 # 0=hide on surface create(for with HomeScreen)/1=show on surface create(for Debug)
 visible_on_create=0
 
diff --git a/weston.ini.ico b/weston.ini.ico
deleted file mode 100644
index 3ed96fa..0000000
--- a/weston.ini.ico
+++ /dev/null
@@ -1,23 +0,0 @@
-[core]
-modules=ico_plugin_loader.so
-
-[output]
-name=HDMI3
-#mode=1680x945
-mode=173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync
-#transform=90
-
-#[output]
-#name=LVDS1
-#mode=1680x1050
-#transform=90
-
-[output]
-name=VGA1
-#mode=173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync
-#transform=90
-
-#[output]
-#name=X1
-#mode=1024x768
-#transform=flipped-270