[mock_tests] fix tests build

Signed-off-by: Stepan Blyschak <[email protected]>
sonic-net · Oct 31, 2019 · 46f0658 · 46f0658
1 parent 60686fa
commit 46f0658
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 30 deletions.
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -2,6 +2,8 @@ CFLAGS_SAI = -I /usr/include/sai
 
 TESTS = tests
 
+SUBDIRS = mock_tests
+
 noinst_PROGRAMS = tests
 
 if DEBUG

diff --git a/tests/mock_tests/Makefile.am b/tests/mock_tests/Makefile.am
@@ -13,42 +13,43 @@ endif
 CFLAGS_GTEST =
 LDADD_GTEST = -L/usr/src/gtest
 
-tests_SOURCES = swssnet_ut.cpp request_parser_ut.cpp aclorch_ut.cpp saispy_ut.cpp \
+tests_SOURCES = aclorch_ut.cpp saispy_ut.cpp \
                 mock_orchagent_main.cpp \
                 mock_dbconnector.cpp \
                 mock_consumerstatetable.cpp \
                 mock_hiredis.cpp \
                 mock_redisreply.cpp \
-                ../orchagent/orchdaemon.cpp \
-                ../orchagent/orch.cpp \
-                ../orchagent/notifications.cpp \
-                ../orchagent/routeorch.cpp \
-                ../orchagent/neighorch.cpp \
-                ../orchagent/intfsorch.cpp \
-                ../orchagent/portsorch.cpp \
-                ../orchagent/copporch.cpp \
-                ../orchagent/tunneldecaporch.cpp \
-                ../orchagent/qosorch.cpp \
-                ../orchagent/bufferorch.cpp \
-                ../orchagent/mirrororch.cpp \
-                ../orchagent/fdborch.cpp \
-                ../orchagent/aclorch.cpp \
-                ../orchagent/saihelper.cpp \
-                ../orchagent/switchorch.cpp \
-                ../orchagent/pfcwdorch.cpp \
-                ../orchagent/pfcactionhandler.cpp \
-                ../orchagent/policerorch.cpp \
-                ../orchagent/crmorch.cpp \
-                ../orchagent/request_parser.cpp \
-                ../orchagent/vrforch.cpp \
-                ../orchagent/countercheckorch.cpp \
-                ../orchagent/vxlanorch.cpp \
-                ../orchagent/vnetorch.cpp \
-                ../orchagent/dtelorch.cpp \
-                ../orchagent/flexcounterorch.cpp \
-                ../orchagent/watermarkorch.cpp
+                $(top_srcdir)/orchagent/orchdaemon.cpp \
+                $(top_srcdir)/orchagent/orch.cpp \
+                $(top_srcdir)/orchagent/notifications.cpp \
+                $(top_srcdir)/orchagent/routeorch.cpp \
+                $(top_srcdir)/orchagent/neighorch.cpp \
+                $(top_srcdir)/orchagent/intfsorch.cpp \
+                $(top_srcdir)/orchagent/portsorch.cpp \
+                $(top_srcdir)/orchagent/copporch.cpp \
+                $(top_srcdir)/orchagent/tunneldecaporch.cpp \
+                $(top_srcdir)/orchagent/qosorch.cpp \
+                $(top_srcdir)/orchagent/bufferorch.cpp \
+                $(top_srcdir)/orchagent/mirrororch.cpp \
+                $(top_srcdir)/orchagent/fdborch.cpp \
+                $(top_srcdir)/orchagent/aclorch.cpp \
+                $(top_srcdir)/orchagent/saihelper.cpp \
+                $(top_srcdir)/orchagent/switchorch.cpp \
+                $(top_srcdir)/orchagent/pfcwdorch.cpp \
+                $(top_srcdir)/orchagent/pfcactionhandler.cpp \
+                $(top_srcdir)/orchagent/policerorch.cpp \
+                $(top_srcdir)/orchagent/crmorch.cpp \
+                $(top_srcdir)/orchagent/request_parser.cpp \
+                $(top_srcdir)/orchagent/vrforch.cpp \
+                $(top_srcdir)/orchagent/countercheckorch.cpp \
+                $(top_srcdir)/orchagent/vxlanorch.cpp \
+                $(top_srcdir)/orchagent/vnetorch.cpp \
+                $(top_srcdir)/orchagent/dtelorch.cpp \
+                $(top_srcdir)/orchagent/flexcounterorch.cpp \
+                $(top_srcdir)/orchagent/watermarkorch.cpp \
+                $(top_srcdir)/orchagent/chassisorch.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
+tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) -I$(top_srcdir)/orchagent
 tests_LDADD = $(LDADD_GTEST) $(LDADD_SAI) -lnl-genl-3 -lhiredis -lhiredis -lpthread \
         -lswsscommon -lswsscommon -lgtest -lgtest_main