RDKEMW-10008: Update Makefile.am

Author: MonekaLakshmi

source/test/Makefile.am

@@ -26,7 +26,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 bin_PROGRAMS = libunpriv_gtest.bin
 
-libunpriv_gtest_bin_CPPFLAGS = -I$(PKG_CONFIG_SYSROOT_DIR)/googletest/include/gtest -I$(PKG_CONFIG_SYSROOT_DIR)/googletest/include/ -I$(PKG_CONFIG_SYSROOT_DIR)/googletest/googletest/include -I$(PKG_CONFIG_SYSROOT_DIR)/googletest/googlemock/include/ -I${top_srcdir}/source -I${top_srcdir}/source/include -I/usr/include/jsoncpp
+libunpriv_gtest_bin_CPPFLAGS = -I$(PKG_CONFIG_SYSROOT_DIR)/googletest/include/gtest -I$(PKG_CONFIG_SYSROOT_DIR)/googletest/include/ -I$(PKG_CONFIG_SYSROOT_DIR)/googletest/googletest/include -I$(PKG_CONFIG_SYSROOT_DIR)/googletest/googlemock/include/ -I${top_srcdir}/source -I${top_srcdir}/source/include
 
 libunpriv_gtest_bin_SOURCES = gtest_main.cpp  libunpriv_test.cpp ../cap.c ../utility.cpp  mocks/CapMock.cpp
 

source/test/libunpriv_test.cpp

@@ -20,7 +20,7 @@
 #include "gtest/gtest.h"
 #include "test/mocks/CapMock.h"
 #include <fstream>
-#include <json/json.h>
+#include <ijsoncpp/json/json.h>
 extern "C" {
 #include "cap.h"
 #include<string.h>

test/run_ut.sh

@@ -7,7 +7,7 @@ cd "$TOP_DIR" || exit 1
 ENABLE_COV=false
 fail=0
 
-if [ "x$1" = "x--enable-cov" ]; then
+if [ "$1" = "--enable-cov" ]; then
     echo "Enabling coverage options"
     export CXXFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
     export CFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
@@ -33,10 +33,11 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-echo "**********Generating Coverage Report**********"
-
 if [ "$ENABLE_COV" = true ]; then
-    lcov --capture --directory . --output-file coverage.info
+    echo "Generating coverage report"
+    cd source/test || exit 1
+
+    lcov --capture --directory .. --output-file coverage.info
     lcov --remove coverage.info '/usr/*' '*gmocks*' '*test*' --output-file coverage.info
     lcov --list coverage.info
 fi