From 996a83efedf9a5097f97a33eb6bf7b8d4664e953 Mon Sep 17 00:00:00 2001 From: Gilbok Lee Date: Wed, 4 Dec 2019 18:27:01 +0900 Subject: [PATCH] Add coverage exception macros [Version] 0.1.32 [Issue Type] Line coverage Change-Id: I816ff28dbc7827b1e7e7f4d439a29b4e5e264406 --- include/mediademuxer_util.h | 33 ++++++++++++++---------------- packaging/capi-mediademuxer.spec | 8 ++++---- src/mediademuxer.c | 4 ++-- src/mediademuxer_port.c | 2 +- src/port_custom/mediademuxer_port_custom.c | 2 ++ src/port_ffmpeg/mediademuxer_port_ffmpeg.c | 2 ++ src/port_gst/mediademuxer_port_gst.c | 5 +++-- 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/include/mediademuxer_util.h b/include/mediademuxer_util.h index 93c7a58..72cdd25 100644 --- a/include/mediademuxer_util.h +++ b/include/mediademuxer_util.h @@ -30,27 +30,24 @@ #include #include +#include +#include + #ifdef __cplusplus extern "C" { #endif -/* #define PRINT_ON_CONSOLE */ -#ifdef PRINT_ON_CONSOLE -#include -#include -#define PRINT_F g_print -#define MD_FENTER(); PRINT_F("function:[%s] ENTER\n", __func__); -#define MD_FLEAVE(); PRINT_F("function [%s] LEAVE\n", __func__); -#define MD_C PRINT_F -#define MD_E PRINT_F -#define MD_W PRINT_F -#define MD_I PRINT_F -#define MD_L PRINT_F -#define MD_V PRINT_F -#define MD_F PRINT_F +#ifdef TIZEN_EXCLUDE_COVERAGE +#define MD_FENTER() +#define MD_FLEAVE() +#define MD_C(fmt, arg...) +#define MD_E(fmt, arg...) +#define MD_W(fmt, arg...) +#define MD_I(fmt, arg...) +#define MD_L(fmt, arg...) +#define MD_V(fmt, arg...) +#define MD_F(fmt, arg...) #else -#include -#include #define MD_FENTER(); LOGI("function:[%s] ENTER\n", __func__); #define MD_FLEAVE(); LOGI("function [%s] LEAVE\n", __func__); #define MD_C LOGE /* MMF_DEBUG_LEVEL_0 */ @@ -69,8 +66,8 @@ extern "C" { x = NULL; #if 1 -#define MEDIADEMUXER_FENTER(); MD_FENTER(); -#define MEDIADEMUXER_FLEAVE(); MD_FLEAVE(); +#define MEDIADEMUXER_FENTER() MD_FENTER() +#define MEDIADEMUXER_FLEAVE() MD_FLEAVE() #else #define MEDIADEMUXER_FENTER(); #define MEDIADEMUXER_FLEAVE(); diff --git a/packaging/capi-mediademuxer.spec b/packaging/capi-mediademuxer.spec index 9d70954..27be563 100644 --- a/packaging/capi-mediademuxer.spec +++ b/packaging/capi-mediademuxer.spec @@ -1,6 +1,6 @@ Name: capi-mediademuxer Summary: A Media Demuxer library in Tizen Native API -Version: 0.1.31 +Version: 0.1.32 Release: 1 Group: Multimedia/API License: Apache-2.0 @@ -54,9 +54,9 @@ export CFLAGS="$CFLAGS -DENABLE_FFMPEG_CODEC" export CFLAGS="$CFLAGS -DSYSCONFDIR=\\\"%{_sysconfdir}\\\" -DTIZEN_FEATURE_GST_UPSTREAM" %if 0%{?gcov:1} -export CFLAGS+=" -fprofile-arcs -ftest-coverage" -export CXXFLAGS+=" -fprofile-arcs -ftest-coverage" -export FFLAGS+=" -fprofile-arcs -ftest-coverage" +export CFLAGS+=" -DTIZEN_EXCLUDE_COVERAGE -fprofile-arcs -ftest-coverage" +export CXXFLAGS+=" -DTIZEN_EXCLUDE_COVERAGE -fprofile-arcs -ftest-coverage" +export FFLAGS+=" -DTIZEN_EXCLUDE_COVERAGE -fprofile-arcs -ftest-coverage" export LDFLAGS+=" -lgcov" %endif diff --git a/src/mediademuxer.c b/src/mediademuxer.c index 35cbc15..03ed360 100644 --- a/src/mediademuxer.c +++ b/src/mediademuxer.c @@ -434,7 +434,7 @@ int mediademuxer_unset_error_cb(mediademuxer_h demuxer) MD_I("mediademuxer_unset_error_cb\n"); return MEDIADEMUXER_ERROR_NONE; } - +//LCOV_EXCL_START static gboolean _mediademuxer_error_cb(mediademuxer_error_e error, void *user_data) { if (user_data == NULL) { @@ -450,7 +450,7 @@ static gboolean _mediademuxer_error_cb(mediademuxer_error_e error, void *user_da MD_I("_mediademuxer_error_cb: ERROR %d to report. But call back is not set\n", error); return 0; } - +//LCOV_EXCL_STOP int mediademuxer_set_eos_cb(mediademuxer_h demuxer, mediademuxer_eos_cb callback, void *user_data) { diff --git a/src/mediademuxer_port.c b/src/mediademuxer_port.c index 0d5dd63..7381ce8 100644 --- a/src/mediademuxer_port.c +++ b/src/mediademuxer_port.c @@ -113,7 +113,7 @@ int __md_util_exist_file_path(const char *file_path) char buf[MAX_ERR_LEN]; int ret_err = 0; ret_err = strerror_r(errno, buf, MAX_ERR_LEN); - if (0 == ret_err) + if (ret_err == 0) MD_E("failed to open file by %s (%d)\n", buf, errno); else MD_E("File not found, strerror_r() failed with errno (%d)\n", errno); diff --git a/src/port_custom/mediademuxer_port_custom.c b/src/port_custom/mediademuxer_port_custom.c index 78a6a7b..ebe5f5b 100644 --- a/src/port_custom/mediademuxer_port_custom.c +++ b/src/port_custom/mediademuxer_port_custom.c @@ -25,6 +25,7 @@ #include #include +//LCOV_EXCL_START static int custom_demuxer_init(MMHandleType *pHandle); static int custom_demuxer_prepare(MMHandleType pHandle, char *uri); static int custom_demuxer_get_data_count(MMHandleType pHandle, int *count); @@ -105,3 +106,4 @@ static int custom_demuxer_get_data(MMHandleType pHandle, char *buffer) MEDIADEMUXER_FLEAVE(); return 0; } +//LCOV_EXCL_STOP \ No newline at end of file diff --git a/src/port_ffmpeg/mediademuxer_port_ffmpeg.c b/src/port_ffmpeg/mediademuxer_port_ffmpeg.c index 4405359..7b2e0bc 100644 --- a/src/port_ffmpeg/mediademuxer_port_ffmpeg.c +++ b/src/port_ffmpeg/mediademuxer_port_ffmpeg.c @@ -25,6 +25,7 @@ #include #include +//LCOV_EXCL_START static int ffmpeg_demuxer_init(MMHandleType *pHandle); static int ffmpeg_demuxer_prepare(MMHandleType pHandle, char *uri); static int ffmpeg_demuxer_get_data_count(MMHandleType pHandle, int *count); @@ -110,3 +111,4 @@ static int ffmpeg_demuxer_get_data(MMHandleType pHandle, char *buffer) MEDIADEMUXER_FLEAVE(); return ret; } +//LCOV_EXCL_STOP \ No newline at end of file diff --git a/src/port_gst/mediademuxer_port_gst.c b/src/port_gst/mediademuxer_port_gst.c index 7812329..764e6b7 100644 --- a/src/port_gst/mediademuxer_port_gst.c +++ b/src/port_gst/mediademuxer_port_gst.c @@ -29,6 +29,7 @@ #include #include +//LCOV_EXCL_START static int gst_demuxer_init(MMHandleType *pHandle); static int gst_demuxer_prepare(MMHandleType pHandle, char *uri); static int gst_demuxer_get_data_count(MMHandleType pHandle, int *count); @@ -356,8 +357,7 @@ static void __gst_no_more_pad(GstElement *element, gpointer data) head = head->next; } gst_handle->is_prepared = true; - MD_I("core->is_prepared: "); - gst_handle->is_prepared ? MD_I("true\n") : MD_I("false\n"); + MD_I("core->is_prepared: true"); MEDIADEMUXER_FLEAVE(); } @@ -1971,3 +1971,4 @@ static int __gst_eos_callback(int track_num, void* user_data) MD_E("EOS received, but callback is not set!!!"); return MD_ERROR_NONE; } +//LCOV_EXCL_STOP \ No newline at end of file -- 2.7.4