From: hyunho Date: Fri, 5 Jun 2020 04:55:47 +0000 (+0900) Subject: [UTC][watchface-complication][Non-ACR][Fix a tc app's exit logic] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48cd73a25c6c987e5a500855847f943ff4ffc1ac;p=test%2Ftct%2Fnative%2Fapi.git [UTC][watchface-complication][Non-ACR][Fix a tc app's exit logic] Change-Id: I503bdf82ee50091c19d3b115ff78002ec9047e00 Signed-off-by: hyunho --- diff --git a/src/utc/watchface-complication/tct-watchface-complication-core.c b/src/utc/watchface-complication/tct-watchface-complication-core.c index 301007d72..4b02b7eab 100755 --- a/src/utc/watchface-complication/tct-watchface-complication-core.c +++ b/src/utc/watchface-complication/tct-watchface-complication-core.c @@ -159,6 +159,7 @@ int main(int argc, char *argv[]) return ret; } PRINT_TC_RESULT("%d", __result); + dlog_print(DLOG_INFO, "NativeTCT", "result [%d] ", ret); dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Application Package is Terminated", __FUNCTION__, __LINE__); return ret; diff --git a/src/utc/watchface-complication/utc-watchface-complication.h b/src/utc/watchface-complication/utc-watchface-complication.h index 24e5f0839..b91209489 100755 --- a/src/utc/watchface-complication/utc-watchface-complication.h +++ b/src/utc/watchface-complication/utc-watchface-complication.h @@ -20,6 +20,11 @@ int __result; app_control_h __test_control; char *__event_cmd; +static gboolean __tc_exit(gpointer data) { + service_app_exit(); + return G_SOURCE_REMOVE; +} + #define assert_with_exit(exp) do { \ if (!(exp)) { \ fprintf(stderr, \ @@ -29,7 +34,7 @@ char *__event_cmd; "%s\n", #exp); \ dlog_print(DLOG_INFO, "NativeTCT", "Assert fail in %s:%d\n", __FILE__, __LINE__); \ __result = 1; \ - service_app_exit(); \ + g_idle_add(__tc_exit, NULL); \ return 1; \ } \ } while (0) @@ -43,7 +48,7 @@ char *__event_cmd; "%s\n", #exp); \ dlog_print(DLOG_INFO, "NativeTCT", "Assert fail in %s:%d\n", __FILE__, __LINE__); \ __result = 1; \ - service_app_exit(); \ + g_idle_add(__tc_exit, NULL); \ return; \ } \ } while (0) @@ -59,7 +64,7 @@ char *__event_cmd; #var, #ref, #var, (int)var, #ref, (int)ref); \ dlog_print(DLOG_INFO, "NativeTCT", "Assert fail in %s:%d\n", __FILE__, __LINE__); \ __result = 1; \ - service_app_exit(); \ + g_idle_add(__tc_exit, NULL); \ return 1; \ } \ } while (0) @@ -75,7 +80,7 @@ char *__event_cmd; free(var2); \ dlog_print(DLOG_INFO, "NativeTCT", "Assert fail in %s:%d\n", __FILE__, __LINE__); \ __result = 1; \ - service_app_exit(); \ + g_idle_add(__tc_exit, NULL); \ return 1; \ } \ } while (0) @@ -91,7 +96,7 @@ char *__event_cmd; #var, #ref, #var, #ref, (int)ref); \ dlog_print(DLOG_INFO, "NativeTCT", "Assert fail in %s:%d\n", __FILE__, __LINE__); \ __result = 1; \ - service_app_exit(); \ + g_idle_add(__tc_exit, NULL); \ return 1; \ } \ } while (0) @@ -106,7 +111,7 @@ char *__event_cmd; #var, #ref, #var, #ref, (int)ref); \ dlog_print(DLOG_INFO, "NativeTCT", "Assert fail in %s:%d\n", __FILE__, __LINE__); \ __result = 1; \ - service_app_exit(); \ + g_idle_add(__tc_exit, NULL); \ return; \ } \ } while (0) @@ -135,20 +140,20 @@ char *__event_cmd; #var, #ref, #var, (int)var, #ref, (int)ref); \ dlog_print(DLOG_INFO, "NativeTCT", "Assert fail in %s:%d ", __FILE__, __LINE__); \ __result = 1; \ - service_app_exit(); \ + g_idle_add(__tc_exit, NULL); \ return; \ } \ } while (0) #define normal_exit(result) do { \ __result = result; \ - service_app_exit(); \ + g_idle_add(__tc_exit, NULL); \ return 0; \ } while (0) #define normal_exit_no_returnval(result) do { \ __result = result; \ - service_app_exit(); \ + g_idle_add(__tc_exit, NULL); \ return; \ } while (0)