kdbus-test: fix activator for TIZEN

diff --git a/tools/testing/selftests/kdbus/test-activator.c b/tools/testing/selftests/kdbus/test-activator.c
index 2f519103879be1c554df7867dbb75ef964d34c6d..f2a401c4ac24f74c9a5b12d5f80b8b975d45236f 100644 (file)
--- a/tools/testing/selftests/kdbus/test-activator.c
+++ b/tools/testing/selftests/kdbus/test-activator.c
@@ -90,7 +90,7 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
                ret = kdbus_msg_send(unpriv, "foo.priv.activator",
                                     0xdeadbeef, 0, 0, 0,
                                     KDBUS_DST_ID_NAME);
-               ASSERT_EXIT(ret,==,-EPERM);
+               ASSERT_EXIT(ret,==,ONTIZEN(0,-EPERM));
        }));
 
        /*
@@ -98,7 +98,7 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
         * service will not be started automatically
         */
 
-       ASSERT_RETURN(-ETIMEDOUT,==,kdbus_starter_poll(activator));
+       ASSERT_RETURN(ONTIZEN(0,-ETIMEDOUT),==,kdbus_starter_poll(activator));
 
        /*
         * Now try to emulate the starter/service logic and
@@ -114,23 +114,34 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
 
        RUN_UNPRIVILEGED_CONN(unpriv, env->buspath, ({
                flags = KDBUS_NAME_REPLACE_EXISTING;
-               ASSERT_RETURN(-EPERM,==,kdbus_name_acquire(unpriv, "foo.priv.activator", &flags));
+               ASSERT_RETURN(ONTIZEN(0,-EPERM),==,kdbus_name_acquire(unpriv, "foo.priv.activator", &flags));
        }));
 
        flags = KDBUS_NAME_REPLACE_EXISTING;
        ASSERT_ZERO(kdbus_name_acquire(service, "foo.priv.activator", &flags));
 
-       /* We read our previous starter message */
+#ifdef TIZEN
+       ASSERT_ZERO(kdbus_msg_recv_poll(service, 100, &msg, NULL));
+       ASSERT_RETURN(msg->cookie,==,cookie-1);
+       kdbus_msg_free(msg);
+#endif
 
-       ASSERT_ZERO(kdbus_msg_recv_poll(service, 100, NULL, NULL));
+       ASSERT_ZERO(kdbus_msg_recv_poll(service, 100, &msg, NULL));
+       ASSERT_RETURN(msg->cookie,==,cookie);
+       kdbus_msg_free(msg);
 
        /* Try to talk, we still fail */
 
        cookie++;
        RUN_UNPRIVILEGED_CONN(unpriv, env->buspath, ({
                /* Try to talk to the name */
-               ASSERT_EXIT(-EPERM,==,kdbus_msg_send(unpriv, "foo.priv.activator", cookie, 0, 0, 0, KDBUS_DST_ID_NAME));
+               ASSERT_EXIT(ONTIZEN(0,-EPERM),==,kdbus_msg_send(unpriv, "foo.priv.activator", cookie, 0, 0, 0, KDBUS_DST_ID_NAME));
        }));
+#ifdef TIZEN
+       ASSERT_ZERO(kdbus_msg_recv_poll(service, 100, &msg, NULL));
+       ASSERT_RETURN(msg->cookie,==,cookie);
+       kdbus_msg_free(msg);
+#endif
 
        /* Still nothing to read */
 
@@ -151,10 +162,14 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
        cookie++;
        RUN_UNPRIVILEGED_CONN(unpriv, env->buspath, ({
                /* Try to talk to the name */
-               ASSERT_EXIT(-EPERM,==,kdbus_msg_send(unpriv, "foo.priv.activator", cookie, 0, 0, 0, KDBUS_DST_ID_NAME));
+               ASSERT_EXIT(ONTIZEN(0,-EPERM),==,kdbus_msg_send(unpriv, "foo.priv.activator", cookie, 0, 0, 0, KDBUS_DST_ID_NAME));
        }));
 
-       ASSERT_RETURN(-ETIMEDOUT,==,kdbus_msg_recv_poll(service, 100, NULL, NULL));
+       ASSERT_RETURN(ONTIZEN(0,-ETIMEDOUT),==,kdbus_msg_recv_poll(service, 100, &msg, NULL));
+#ifdef TIZEN
+       ASSERT_RETURN(msg->cookie,==,cookie);
+       kdbus_msg_free(msg);
+#endif
 
        /* Same user is able to TALK */
        cookie++;
@@ -188,7 +203,7 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
 
        RUN_UNPRIVILEGED_CONN(unpriv, env->buspath, ({
                flags = KDBUS_NAME_REPLACE_EXISTING;
-               ASSERT_EXIT(-EPERM,==,kdbus_name_acquire(unpriv, "foo.priv.activator", &flags));
+               ASSERT_EXIT(ONTIZEN(-EEXIST,-EPERM),==,kdbus_name_acquire(unpriv, "foo.priv.activator", &flags));
        }));
 
        kdbus_conn_free(service);