From 160d681f4be278e35c8027b6fe576ed1ec16e33d Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Wed, 30 Oct 2019 00:59:48 +0000 Subject: [PATCH] Fix mock_tests build --- tests/Makefile.am | 2 ++ tests/mock_tests/Makefile.am | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8818cbf..2fe345e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = mock_tests + CFLAGS_SAI = -I /usr/include/sai TESTS = tests diff --git a/tests/mock_tests/Makefile.am b/tests/mock_tests/Makefile.am index c140a65..7a7819c 100644 --- a/tests/mock_tests/Makefile.am +++ b/tests/mock_tests/Makefile.am @@ -1,6 +1,8 @@ -CFLAGS_SAI = -I /usr/include/sai +CFLAGS_SAI = -I /usr/include/sai -I ../../orchagent/ -bin_PROGRAMS = tests +TESTS = tests + +noinst_PROGRAMS = tests LDADD_SAI = -lsaimeta -lsaimetadata -lsaivs -lsairedis @@ -19,7 +21,7 @@ tests_SOURCES = aclorch_ut.cpp saispy_ut.cpp intfsorch_ut.cpp \ mock_consumerstatetable.cpp \ mock_hiredis.cpp \ mock_redisreply.cpp \ - ut_saihelper.cpp \ + ut_saihelper.cpp \ ../../orchagent/orchdaemon.cpp \ ../../orchagent/orch.cpp \ ../../orchagent/notifications.cpp \ @@ -47,7 +49,9 @@ tests_SOURCES = aclorch_ut.cpp saispy_ut.cpp intfsorch_ut.cpp \ ../../orchagent/vnetorch.cpp \ ../../orchagent/dtelorch.cpp \ ../../orchagent/flexcounterorch.cpp \ - ../../orchagent/watermarkorch.cpp + ../../orchagent/watermarkorch.cpp \ + ../../orchagent/chassisorch.cpp \ + ../../orchagent/sfloworch.cpp tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) -I../orchagent -- 2.18.0