diff --git a/cov_build.sh b/cov_build.sh index a243cc70..7e5c2237 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -1,4 +1,4 @@ -#!/bin/sh + #!/bin/sh #################################################################################### # If not stated otherwise in this file or this component's LICENSE file the # following copyright and licenses apply: @@ -31,6 +31,12 @@ export CXXFLAGS="-Wno-format -Wno-unused-variable" ./configure --prefix=${RFC_INSTALL_DIR} --enable-rfctool=yes --enable-tr181set=yes cd $RFC_ROOT +git clone https://github.com/rdkcentral/rdk_logger.git -b develop +cp rdk_logger/include/rdk_logger.h /usr/local/include + + +cd $RFC_ROOT + rm -rf common_utilities git clone https://github.com/rdkcentral/common_utilities.git -b develop cd common_utilities diff --git a/rfcMgr/gtest/mocks/rdk_debug.h b/rfcMgr/gtest/mocks/rdk_debug.h index 49ab60ac..52120d17 100644 --- a/rfcMgr/gtest/mocks/rdk_debug.h +++ b/rfcMgr/gtest/mocks/rdk_debug.h @@ -25,12 +25,15 @@ #include #define LOG_RFCMGR "LOG.RDK.RFCMGR" +#if defined(RDK_LOGGER) +#include "rdk_logger.h" +#define RDK_LOG rdk_logger_msg_printf +#else #define RDK_LOG_TRACE1 1 #define RDK_LOG_DEBUG 2 #define RDK_LOG_INFO 3 #define RDK_LOG_WARN 4 #define RDK_LOG_ERROR 5 - #define rdk_logger_init(DEBUG_INI_NAME) ; // The macro to convert RDK_LOG to printf @@ -50,4 +53,5 @@ #endif +#endif diff --git a/rfcMgr/mtlsUtils.cpp b/rfcMgr/mtlsUtils.cpp index 2963c066..68cba4f4 100644 --- a/rfcMgr/mtlsUtils.cpp +++ b/rfcMgr/mtlsUtils.cpp @@ -1,3 +1,4 @@ +// /*############################################################################## # If not stated otherwise in this file or this component's LICENSE file the # following copyright and licenses apply: diff --git a/run_ut.sh b/run_ut.sh index 66da89c0..15a9a41a 100644 --- a/run_ut.sh +++ b/run_ut.sh @@ -1,3 +1,4 @@ + #!/bin/sh #################################################################################### @@ -29,6 +30,9 @@ if [ "x$1" = "x--enable-cov" ]; then ENABLE_COV=true fi +git clone https://github.com/rdkcentral/rdk_logger.git -b develop +cp rdk_logger/include/* /usr/local/include + cp ./rfcMgr/gtest/mocks/rfc.properties /etc/rfc.properties cp ./rfcMgr/gtest/mocks/rfcdefaults.ini /tmp/rfcdefaults.ini diff --git a/test/Makefile.am b/test/Makefile.am index d8a7420b..2c26df33 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -21,7 +21,7 @@ AM_CFLAGS = -D_ANSC_LINUX AM_CFLAGS += -D_ANSC_USER AM_CPPFLAGS = -Wall -g -Werror -AM_CXXFLAGS = -std=c++11 +AM_CXXFLAGS = -std=c++11 -DRDK_LOGGER ACLOCAL_AMFLAGS = -I m4 bin_PROGRAMS = rfc_gtest.bin