From b2fd5d7e92865d623c8a15cd0159e31bb63031ba Mon Sep 17 00:00:00 2001 From: Kamil Cudnik Date: Mon, 9 Aug 2021 17:20:55 +0200 Subject: [PATCH] Add code coverage to configure.ac and Makefile.am (#881) --- .azure-pipelines/build-template.yml | 4 +- configure.ac | 92 +++++++++++++++-------------- lgtm.yml | 1 + lib/src/Makefile.am | 12 ++-- meta/Makefile.am | 15 +++-- pyext/py2/Makefile.am | 2 +- pyext/py3/Makefile.am | 2 +- saiasiccmp/Makefile.am | 18 +++--- saidiscovery/Makefile.am | 7 ++- saidump/Makefile.am | 7 ++- saiplayer/Makefile.am | 10 ++-- saisdkdump/Makefile.am | 7 ++- syncd/Makefile.am | 31 ++++++---- tests/Makefile.am | 15 ++--- vslib/src/Makefile.am | 12 ++-- 15 files changed, 128 insertions(+), 107 deletions(-) diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index e4a179679658..2432d375e58c 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -66,7 +66,9 @@ jobs: libnl-cli-3-dev \ swig3.0 \ libpython2.7-dev \ - libzmq5 libzmq3-dev + libzmq5 \ + libzmq3-dev \ + autoconf-archive sudo apt-get install -y redis-server sudo sed -ri 's/^# unixsocket/unixsocket/' /etc/redis/redis.conf diff --git a/configure.ac b/configure.ac index 8ffd65e543da..247c928bc167 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ AC_PROG_LIBTOOL AC_HEADER_STDC AM_PATH_PYTHON AM_PATH_PYTHON3 +AX_CODE_COVERAGE +AX_ADD_AM_MACRO_STATIC([]) AM_CONDITIONAL(sonic_asic_platform_barefoot, test x$CONFIGURED_PLATFORM = xbarefoot) AM_CONDITIONAL(sonic_asic_platform_mellanox, test x$CONFIGURED_PLATFORM = xmellanox) @@ -87,56 +89,56 @@ fi AC_PATH_PROGS(SWIG, [swig3.0 swig]) -CFLAGS_COMMON="" -CFLAGS_COMMON+=" -ansi" -CFLAGS_COMMON+=" -fPIC" -CFLAGS_COMMON+=" -std=c++11" -CFLAGS_COMMON+=" -Wall" -CFLAGS_COMMON+=" -Wcast-align" -CFLAGS_COMMON+=" -Wcast-qual" -CFLAGS_COMMON+=" -Wconversion" -CFLAGS_COMMON+=" -Wdisabled-optimization" -CFLAGS_COMMON+=" -Werror" -CFLAGS_COMMON+=" -Wextra" -CFLAGS_COMMON+=" -Wfloat-equal" -CFLAGS_COMMON+=" -Wformat=2" -CFLAGS_COMMON+=" -Wformat-nonliteral" -CFLAGS_COMMON+=" -Wformat-security" -CFLAGS_COMMON+=" -Wformat-y2k" -CFLAGS_COMMON+=" -Wimport" -CFLAGS_COMMON+=" -Winit-self" -CFLAGS_COMMON+=" -Wno-inline" -CFLAGS_COMMON+=" -Winvalid-pch" -CFLAGS_COMMON+=" -Wmissing-field-initializers" -CFLAGS_COMMON+=" -Wmissing-format-attribute" -CFLAGS_COMMON+=" -Wmissing-include-dirs" -CFLAGS_COMMON+=" -Wmissing-noreturn" -CFLAGS_COMMON+=" -Wno-aggregate-return" -CFLAGS_COMMON+=" -Wno-padded" -CFLAGS_COMMON+=" -Wno-switch-enum" -CFLAGS_COMMON+=" -Wno-unused-parameter" -CFLAGS_COMMON+=" -Wpacked" -CFLAGS_COMMON+=" -Wpointer-arith" -CFLAGS_COMMON+=" -Wredundant-decls" -CFLAGS_COMMON+=" -Wshadow" -CFLAGS_COMMON+=" -Wstack-protector" -CFLAGS_COMMON+=" -Wstrict-aliasing=3" -CFLAGS_COMMON+=" -Wswitch" -CFLAGS_COMMON+=" -Wswitch-default" -CFLAGS_COMMON+=" -Wunreachable-code" -CFLAGS_COMMON+=" -Wunused" -CFLAGS_COMMON+=" -Wvariadic-macros" -CFLAGS_COMMON+=" -Wwrite-strings" -CFLAGS_COMMON+=" -Wno-switch-default" -CFLAGS_COMMON+=" -Wconversion" -CFLAGS_COMMON+=" -Wno-psabi" +CXXFLAGS_COMMON="" +CXXFLAGS_COMMON+=" -ansi" +CXXFLAGS_COMMON+=" -fPIC" +CXXFLAGS_COMMON+=" -std=c++11" +CXXFLAGS_COMMON+=" -Wall" +CXXFLAGS_COMMON+=" -Wcast-align" +CXXFLAGS_COMMON+=" -Wcast-qual" +CXXFLAGS_COMMON+=" -Wconversion" +CXXFLAGS_COMMON+=" -Wdisabled-optimization" +CXXFLAGS_COMMON+=" -Werror" +CXXFLAGS_COMMON+=" -Wextra" +CXXFLAGS_COMMON+=" -Wfloat-equal" +CXXFLAGS_COMMON+=" -Wformat=2" +CXXFLAGS_COMMON+=" -Wformat-nonliteral" +CXXFLAGS_COMMON+=" -Wformat-security" +CXXFLAGS_COMMON+=" -Wformat-y2k" +CXXFLAGS_COMMON+=" -Wimport" +CXXFLAGS_COMMON+=" -Winit-self" +CXXFLAGS_COMMON+=" -Wno-inline" +CXXFLAGS_COMMON+=" -Winvalid-pch" +CXXFLAGS_COMMON+=" -Wmissing-field-initializers" +CXXFLAGS_COMMON+=" -Wmissing-format-attribute" +CXXFLAGS_COMMON+=" -Wmissing-include-dirs" +CXXFLAGS_COMMON+=" -Wmissing-noreturn" +CXXFLAGS_COMMON+=" -Wno-aggregate-return" +CXXFLAGS_COMMON+=" -Wno-padded" +CXXFLAGS_COMMON+=" -Wno-switch-enum" +CXXFLAGS_COMMON+=" -Wno-unused-parameter" +CXXFLAGS_COMMON+=" -Wpacked" +CXXFLAGS_COMMON+=" -Wpointer-arith" +CXXFLAGS_COMMON+=" -Wredundant-decls" +CXXFLAGS_COMMON+=" -Wshadow" +CXXFLAGS_COMMON+=" -Wstack-protector" +CXXFLAGS_COMMON+=" -Wstrict-aliasing=3" +CXXFLAGS_COMMON+=" -Wswitch" +CXXFLAGS_COMMON+=" -Wswitch-default" +CXXFLAGS_COMMON+=" -Wunreachable-code" +CXXFLAGS_COMMON+=" -Wunused" +CXXFLAGS_COMMON+=" -Wvariadic-macros" +CXXFLAGS_COMMON+=" -Wwrite-strings" +CXXFLAGS_COMMON+=" -Wno-switch-default" +CXXFLAGS_COMMON+=" -Wconversion" +CXXFLAGS_COMMON+=" -Wno-psabi" SAVED_FLAGS="$CXXFLAGS" CXXFLAGS="-Wcast-align=strict" AC_MSG_CHECKING([whether CXX supports -Wcast-align=strict]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes])] - [AC_SUBST([CFLAGS_COMMON], ["${CFLAGS_COMMON} -Wcast-align=strict"])], + [AC_SUBST([CXXFLAGS_COMMON], ["${CXXFLAGS_COMMON} -Wcast-align=strict"])], [AC_MSG_RESULT([no])]) CXXFLAGS="$SAVED_FLAGS" @@ -151,7 +153,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([no])]) CXXFLAGS="$SAVED_FLAGS" -AC_SUBST(CFLAGS_COMMON) +AC_SUBST(CXXFLAGS_COMMON) AC_OUTPUT(Makefile meta/Makefile diff --git a/lgtm.yml b/lgtm.yml index b57e2c8c6498..9d689053d03b 100644 --- a/lgtm.yml +++ b/lgtm.yml @@ -16,6 +16,7 @@ extraction: - dh-exec - libzmq3-dev - libzmq5 + - autoconf-archive after_prepare: - ls -l - git clone https://github.com/Azure/sonic-swss-common; pushd sonic-swss-common; ./autogen.sh; fakeroot dpkg-buildpackage -us -uc -b; popd diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am index a936e0b59eb5..f16ab1b24dd0 100644 --- a/lib/src/Makefile.am +++ b/lib/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental +AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental if DEBUG DBGFLAGS = -ggdb -D_DEBUG_ @@ -92,16 +92,18 @@ libsairedis_la_SOURCES = \ sai_redis_vlan.cpp \ sai_redis_wred.cpp -libSaiRedis_a_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -std=c++14 +libSaiRedis_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libSaiRedis_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -std=c++14 $(CODE_COVERAGE_CXXFLAGS) -libsairedis_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -std=c++14 -libsairedis_la_LIBADD = -lhiredis -lswsscommon libSaiRedis.a +libsairedis_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libsairedis_la_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -std=c++14 $(CODE_COVERAGE_CXXFLAGS) +libsairedis_la_LIBADD = -lhiredis -lswsscommon libSaiRedis.a $(CODE_COVERAGE_LIBS) bin_PROGRAMS = tests tests_SOURCES = tests.cpp -tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) tests_LDADD = -lhiredis -lswsscommon -lpthread $(top_srcdir)/meta/libsaimetadata.la $(top_srcdir)/meta/libsaimeta.la libsairedis.la -lzmq TESTS = tests diff --git a/meta/Makefile.am b/meta/Makefile.am index ba1fb39747e2..91079cb62d58 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -1,5 +1,6 @@ # since we have SAI sumbodule we will use submodule headers -AM_CPPFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/lib/inc +AM_CFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental +AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/lib/inc if DEBUG DBGFLAGS = -ggdb -D_DEBUG_ @@ -51,7 +52,7 @@ WARN = \ # we are not adding CPPFLAGS since they are added # automatic to each C preprocessor, and currently -# we add -std=c++11 flag to CFLAGS_COMMON which +# we add -std=c++11 flag to CXXFLAGS_COMMON which # will cause compilaton error on C files # and we already confirmed that SAI/meta files # can be compiled with success @@ -63,7 +64,8 @@ libsaimeta_la_SOURCES = \ $(top_srcdir)/SAI/meta/saimetadatautils.c \ $(top_srcdir)/SAI/meta/saiserialize.c -libsaimeta_la_CFLAGS = $(DBGFLAGS) $(WARN) +libsaimeta_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libsaimeta_la_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(WARN) $(CODE_COVERAGE_CFLAGS) $(top_srcdir)/SAI/meta/saimetadata.h $(top_srcdir)/SAI/meta/saimetadata.c: saimeta-gen @@ -90,8 +92,9 @@ libsaimetadata_la_SOURCES = \ BUILT_SOURCES = $(top_srcdir)/SAI/meta/saimetadata.h $(top_srcdir)/SAI/meta/saimetadata.c -libsaimetadata_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -libsaimetadata_la_LIBADD = -lhiredis -lswsscommon libsaimeta.la +libsaimetadata_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libsaimetadata_la_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) +libsaimetadata_la_LIBADD = -lhiredis -lswsscommon libsaimeta.la $(CODE_COVERAGE_LIBS) bin_PROGRAMS = tests @@ -104,7 +107,7 @@ tests_SOURCES = \ ../lib/src/SwitchConfig.cpp \ ../lib/src/SwitchConfigContainer.cpp -tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) tests_LDADD = -lhiredis -lswsscommon -lpthread libsaimetadata.la libsaimeta.la TESTS = tests diff --git a/pyext/py2/Makefile.am b/pyext/py2/Makefile.am index 043c7813ce6e..11e0d2d37785 100644 --- a/pyext/py2/Makefile.am +++ b/pyext/py2/Makefile.am @@ -7,7 +7,7 @@ pkgpyexec_LTLIBRARIES = _pysairedis.la INCLUDE=-I../../SAI/inc -I../../SAI/meta -I../../SAI/experimental -I../../lib/inc -I.. _pysairedis_la_SOURCES = pysairedis_wrap.cpp $(SOURCES) -_pysairedis_la_CPPFLAGS = $(INCLUDE) -I/usr/include/python$(PYTHON_VERSION) $(AM_CPPFLAGS) $(CFLAGS_COMMON) \ +_pysairedis_la_CXXFLAGS = $(INCLUDE) -I/usr/include/python$(PYTHON_VERSION) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) \ -Wno-cast-qual -Wno-shadow -Wno-redundant-decls -Wno-conversion $(NO_CAST_FUNCTION_TYPE) _pysairedis_la_LDFLAGS = -module \ diff --git a/pyext/py3/Makefile.am b/pyext/py3/Makefile.am index 97b82350b6a3..ecaf58f3497c 100644 --- a/pyext/py3/Makefile.am +++ b/pyext/py3/Makefile.am @@ -7,7 +7,7 @@ pkgpy3exec_LTLIBRARIES = _pysairedis.la INCLUDE=-I../../SAI/inc -I../../SAI/meta -I../../SAI/experimental -I../../lib/inc -I.. _pysairedis_la_SOURCES = pysairedis_wrap.cpp $(SOURCES) -_pysairedis_la_CPPFLAGS = $(INCLUDE) -I/usr/include/python$(PYTHON3_VERSION) $(AM_CPPFLAGS) $(CFLAGS_COMMON) \ +_pysairedis_la_CXXFLAGS = $(INCLUDE) -I/usr/include/python$(PYTHON3_VERSION) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) \ -Wno-cast-qual -Wno-shadow -Wno-redundant-decls -Wno-conversion $(NO_CAST_FUNCTION_TYPE) _pysairedis_la_LDFLAGS = -module \ diff --git a/saiasiccmp/Makefile.am b/saiasiccmp/Makefile.am index 8a211ddbaa33..2bc5265d377a 100644 --- a/saiasiccmp/Makefile.am +++ b/saiasiccmp/Makefile.am @@ -1,10 +1,4 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/lib/inc \ - -I$(top_srcdir)/SAI/inc \ - -I$(top_srcdir)/SAI/meta \ - -I$(top_srcdir)/SAI/experimental \ - -I$(top_srcdir)/meta \ - -I$(top_srcdir)/syncd +AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/meta -I$(top_srcdir)/syncd bin_PROGRAMS = saiasiccmp @@ -15,6 +9,7 @@ DBGFLAGS = -g endif noinst_LIBRARIES = libAsicCmp.a + libAsicCmp_a_SOURCES = \ AsicCmp.cpp \ View.cpp \ @@ -23,15 +18,18 @@ libAsicCmp_a_SOURCES = \ CommandLineOptions.cpp \ CommandLineOptionsParser.cpp -libAsicCmp_a_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS) +libAsicCmp_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libAsicCmp_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(SAIFLAGS) $(CODE_COVERAGE_CXXFLAGS) saiasiccmp_SOURCES = main.cpp -saiasiccmp_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS) +saiasiccmp_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +saiasiccmp_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(SAIFLAGS) $(CODE_COVERAGE_CXXFLAGS) saiasiccmp_LDADD = libAsicCmp.a \ -lsaimetadata -lsaimeta -ldl -lhiredis -lswsscommon -lpthread -lzmq \ $(top_srcdir)/syncd/libSyncd.a \ -L$(top_srcdir)/syncd/.libs \ $(top_srcdir)/lib/src/libSaiRedis.a \ - -L$(top_srcdir)/meta/.libs + -L$(top_srcdir)/meta/.libs \ + $(CODE_COVERAGE_LIBS) TESTS = test.sh diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am index 7054964b5fd7..4e681983454c 100644 --- a/saidiscovery/Makefile.am +++ b/saidiscovery/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental -I${top_srcdir}/meta -I${top_srcdir}/syncd +AM_CXXFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental -I${top_srcdir}/meta bin_PROGRAMS = saidiscovery @@ -16,5 +16,6 @@ endif saidiscovery_SOURCES = saidiscovery.cpp -saidiscovery_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS) -saidiscovery_LDADD = -lhiredis -lswsscommon $(top_srcdir)/syncd/libSyncd.a $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta +saidiscovery_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +saidiscovery_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(SAIFLAGS) $(CODE_COVERAGE_CXXFLAGS) +saidiscovery_LDADD = -lhiredis -lswsscommon $(top_srcdir)/syncd/libSyncd.a $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta $(CODE_COVERAGE_LIBS) diff --git a/saidump/Makefile.am b/saidump/Makefile.am index b34c944561ab..57e5c165473a 100644 --- a/saidump/Makefile.am +++ b/saidump/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental +AM_CXXFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental bin_PROGRAMS = saidump @@ -9,5 +9,6 @@ DBGFLAGS = -g endif saidump_SOURCES = saidump.cpp -saidump_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -saidump_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -L$(top_srcdir)/lib/src/.libs -lsairedis -lzmq +saidump_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +saidump_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) +saidump_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -L$(top_srcdir)/lib/src/.libs -lsairedis -lzmq $(CODE_COVERAGE_LIBS) diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am index 5b7aa1d95497..e456d9330307 100644 --- a/saiplayer/Makefile.am +++ b/saiplayer/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental +AM_CXXFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental bin_PROGRAMS = saiplayer @@ -15,8 +15,10 @@ libSaiPlayer_a_SOURCES = \ SaiPlayer.cpp -libSaiPlayer_a_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -std=c++14 +libSaiPlayer_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libSaiPlayer_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -std=c++14 $(CODE_COVERAGE_CXXFLAGS) saiplayer_SOURCES = saiplayer_main.cpp -saiplayer_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -std=c++14 -saiplayer_LDADD = libSaiPlayer.a ../syncd/libSyncd.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq +saiplayer_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +saiplayer_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -std=c++14 $(CODE_COVERAGE_CXXFLAGS) +saiplayer_LDADD = libSaiPlayer.a ../syncd/libSyncd.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am index 12f8b9df68de..52b2862472da 100644 --- a/saisdkdump/Makefile.am +++ b/saisdkdump/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental +AM_CXXFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental bin_PROGRAMS = saisdkdump @@ -16,5 +16,6 @@ SAILIB=-lsai endif saisdkdump_SOURCES = saisdkdump.cpp -saisdkdump_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS) -saisdkdump_LDADD = -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta +saisdkdump_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +saisdkdump_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(SAIFLAGS) $(CODE_COVERAGE_CXXFLAGS) +saisdkdump_LDADD = -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta $(CODE_COVERAGE_LIBS) diff --git a/syncd/Makefile.am b/syncd/Makefile.am index 3082d142b936..df44f8a2aa09 100644 --- a/syncd/Makefile.am +++ b/syncd/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental +AM_CXXFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental bin_PROGRAMS = syncd syncd_request_shutdown tests @@ -60,21 +60,23 @@ libSyncd_a_SOURCES = \ PortMap.cpp \ PortMapParser.cpp -libSyncd_a_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS) -std=c++14 +libSyncd_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libSyncd_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(SAIFLAGS) -std=c++14 $(CODE_COVERAGE_CXXFLAGS) syncd_SOURCES = main.cpp -syncd_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS) -syncd_LDADD = libSyncd.a ../lib/src/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lhiredis -lswsscommon $(SAILIB) -lpthread -lzmq +syncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +syncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(SAIFLAGS) $(CODE_COVERAGE_CXXFLAGS) +syncd_LDADD = libSyncd.a ../lib/src/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lhiredis -lswsscommon $(SAILIB) -lpthread -lzmq $(CODE_COVERAGE_LIBS) if SAITHRIFT -libSyncd_a_CPPFLAGS += -DSAITHRIFT=yes -syncd_CPPFLAGS += -DSAITHRIFT=yes +libSyncd_a_CXXFLAGS += -DSAITHRIFT=yes +syncd_CXXFLAGS += -DSAITHRIFT=yes syncd_LDADD += -lrpcserver -lthrift endif if sonic_asic_platform_mellanox -syncd_CPPFLAGS += -DSAI_SUPPORT_UNINIT_DATA_PLANE_ON_REMOVAL -libSyncd_a_CPPFLAGS += -DSAI_SUPPORT_UNINIT_DATA_PLANE_ON_REMOVAL +syncd_CXXFLAGS += -DSAI_SUXXORT_UNINIT_DATA_PLANE_ON_REMOVAL +libSyncd_a_CXXFLAGS += -DSAI_SUXXORT_UNINIT_DATA_PLANE_ON_REMOVAL endif libSyncdRequestShutdown_a_SOURCES = \ @@ -82,14 +84,17 @@ libSyncdRequestShutdown_a_SOURCES = \ RequestShutdownCommandLineOptions.cpp \ RequestShutdownCommandLineOptionsParser.cpp -libSyncdRequestShutdown_a_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +libSyncdRequestShutdown_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libSyncdRequestShutdown_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) syncd_request_shutdown_SOURCES = syncd_request_shutdown.cpp -syncd_request_shutdown_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread +syncd_request_shutdown_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +syncd_request_shutdown_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) +syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread $(CODE_COVERAGE_LIBS) tests_SOURCES = tests.cpp -tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -tests_LDADD = libSyncd.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/lib/src/.libs -lsairedis -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq +tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) +tests_LDADD = libSyncd.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/lib/src/.libs -lsairedis -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) + TESTS = tests diff --git a/tests/Makefile.am b/tests/Makefile.am index 7d1ff2aa0d77..ab81fe844fed 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental +AM_CXXFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental bin_PROGRAMS = vssyncd tests testclient @@ -12,27 +12,28 @@ SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs vssyncd_SOURCES = ../syncd/main.cpp -vssyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS) -vssyncd_LDADD = ../syncd/libSyncd.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lzmq +vssyncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +vssyncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(SAIFLAGS) $(CODE_COVERAGE_CXXFLAGS) +vssyncd_LDADD = ../syncd/libSyncd.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lzmq $(CODE_COVERAGE_LIBS) if SAITHRIFT vssyncd_LDADD += -lrpcserver -lthrift endif tests_SOURCES = tests.cpp -tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) tests_LDADD = -lhiredis -lswsscommon -lpthread \ $(top_srcdir)/lib/src/libsairedis.la \ $(top_srcdir)/syncd/libSyncd.a \ -L$(top_srcdir)/meta/.libs \ - -lsaimetadata -lsaimeta -lzmq + -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) testclient_SOURCES = testclient.cpp -testclient_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +testclient_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) testclient_LDADD = -lhiredis -lswsscommon -lpthread \ $(top_srcdir)/lib/src/libsairedis.la \ $(top_srcdir)/syncd/libSyncd.a \ -L$(top_srcdir)/meta/.libs \ - -lsaimetadata -lsaimeta -lzmq + -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) TESTS = aspellcheck.pl conflictnames.pl swsslogentercheck.sh tests BCM56850.pl MLNX2700.pl diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am index cb96b81b3fb6..3582be1e46fc 100644 --- a/vslib/src/Makefile.am +++ b/vslib/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I/usr/include/libnl3 -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/lib/inc +AM_CXXFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I/usr/include/libnl3 -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/lib/inc if DEBUG DBGFLAGS = -ggdb -D_DEBUG_ @@ -116,15 +116,17 @@ libsaivs_la_SOURCES = \ sai_vs_vlan.cpp \ sai_vs_wred.cpp -libSaiVS_a_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +libSaiVS_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libSaiVS_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) -libsaivs_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -libsaivs_la_LIBADD = -lhiredis -lswsscommon libSaiVS.a +libsaivs_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) +libsaivs_la_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) +libsaivs_la_LIBADD = -lhiredis -lswsscommon libSaiVS.a $(CODE_COVERAGE_LIBS) bin_PROGRAMS = tests tests_SOURCES = tests.cpp -tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) tests_LDADD = -lhiredis -lswsscommon -lpthread libsaivs.la $(top_srcdir)/meta/libsaimetadata.la $(top_srcdir)/meta/libsaimeta.la TESTS = tests