From: Konrad Lipinski <konrad.l@samsung.com>
Date: Thu, 15 Sep 2016 12:31:54 +0000 (+0200)
Subject: kdbus-test: fix activator for non-TIZEN
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2da2faa18157e62be0b94a0f5330a45e8661c3de;p=platform%2Fkernel%2Flinux-exynos.git

kdbus-test: fix activator for non-TIZEN
---

diff --git a/tools/testing/selftests/kdbus/test-activator.c b/tools/testing/selftests/kdbus/test-activator.c
index b11fddea6f6a..2f519103879b 100644
--- a/tools/testing/selftests/kdbus/test-activator.c
+++ b/tools/testing/selftests/kdbus/test-activator.c
@@ -46,7 +46,7 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
 {
 	struct kdbus_msg *msg = NULL;
 	uint64_t cookie = 0xdeadbeef;
-	uint64_t flags = KDBUS_NAME_REPLACE_EXISTING;
+	uint64_t flags;
 	struct kdbus_conn *activator;
 	struct kdbus_conn *service;
 	struct kdbus_conn *client;
@@ -113,9 +113,11 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
 	/* Policies are still checked, access denied */
 
 	RUN_UNPRIVILEGED_CONN(unpriv, env->buspath, ({
+		flags = KDBUS_NAME_REPLACE_EXISTING;
 		ASSERT_RETURN(-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 */
@@ -185,7 +187,8 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
 	ASSERT_ZERO(kdbus_msg_recv_poll(service, 100, NULL, NULL));
 
 	RUN_UNPRIVILEGED_CONN(unpriv, env->buspath, ({
-		ASSERT_RETURN(-EPERM,==,kdbus_name_acquire(unpriv, "foo.priv.activator", &flags));
+		flags = KDBUS_NAME_REPLACE_EXISTING;
+		ASSERT_EXIT(-EPERM,==,kdbus_name_acquire(unpriv, "foo.priv.activator", &flags));
 	}));
 
 	kdbus_conn_free(service);