[mock_test]: Move mock tests into a separate folder to separate them …

…from vs tests (sonic-net#950) when libsaivs is installed with compile and run the mock tests; otherwise, we will just run the normal vs tests Signed-off-by: Shu0T1an ChenG <[email protected]>
madhanmellanox · Jul 2, 2019 · 5a33f89 · 5a33f89
1 parent c24948c
commit 5a33f89
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 41 deletions.
diff --git a/configure.ac b/configure.ac
@@ -96,9 +96,11 @@ AC_CONFIG_FILES([
     teamsyncd/Makefile
     swssconfig/Makefile
     cfgmgr/Makefile
+    tests/Makefile
 ])
 
+# If no SAI library is installed, compile with SAIVS and run unit tests
 AM_COND_IF([HAVE_SAI],[],
-           [AC_CONFIG_FILES([tests/Makefile])])
+           [AC_CONFIG_FILES([tests/mock_tests/Makefile])])
 
 AC_OUTPUT
diff --git a/fpmsyncd/Makefile.am b/fpmsyncd/Makefile.am
@@ -8,7 +8,7 @@ else
 DBGFLAGS = -g
 endif
 
-fpmsyncd_SOURCES = fpmsyncd.cpp fpmlink.cpp routesync.cpp $(top_srcdir)/warmrestart/warmRestartHelper.cpp $(top_srcdir)/warmrestart/warmRestartHelper.h
+fpmsyncd_SOURCES = fpmsyncd.cpp fpmlink.cpp routesync.cpp $(top_srcdir)/warmrestart/warmRestartHelper.cpp
 
 fpmsyncd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)
 fpmsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -1,5 +1,4 @@
 CFLAGS_SAI = -I /usr/include/sai
-INCLUDES = -I ../orchagent
 
 bin_PROGRAMS = tests
 
@@ -9,47 +8,12 @@ else
 DBGFLAGS = -g -DNDEBUG
 endif
 
-LDADD_SAI = -lsaimeta -lsaimetadata -lsaivs -lsairedis
-
 CFLAGS_GTEST =
 LDADD_GTEST = -L/usr/src/gtest
 
-tests_SOURCES = swssnet_ut.cpp request_parser_ut.cpp 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
+tests_SOURCES = swssnet_ut.cpp request_parser_ut.cpp
 
 tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI)
-tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI)
-tests_LDADD = $(LDADD_GTEST) $(LDADD_SAI) -lnl-genl-3 -lhiredis -lhiredis -lpthread \
+tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) -I../orchagent
+tests_LDADD = $(LDADD_GTEST) -lnl-genl-3 -lhiredis -lhiredis -lpthread \
         -lswsscommon -lswsscommon -lgtest -lgtest_main
diff --git a/tests/mock_tests/Makefile.am b/tests/mock_tests/Makefile.am
@@ -0,0 +1,54 @@
+CFLAGS_SAI = -I /usr/include/sai
+
+bin_PROGRAMS = tests
+
+LDADD_SAI = -lsaimeta -lsaimetadata -lsaivs -lsairedis
+
+if DEBUG
+DBGFLAGS = -ggdb -DDEBUG
+else
+DBGFLAGS = -g -DNDEBUG
+endif
+
+CFLAGS_GTEST =
+LDADD_GTEST = -L/usr/src/gtest
+
+tests_SOURCES = swssnet_ut.cpp request_parser_ut.cpp 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
+
+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_LDADD = $(LDADD_GTEST) $(LDADD_SAI) -lnl-genl-3 -lhiredis -lhiredis -lpthread \
+        -lswsscommon -lswsscommon -lgtest -lgtest_main
diff --git a/tests/aclorch_ut.cpp → tests/mock_tests/aclorch_ut.cpp b/tests/aclorch_ut.cpp → tests/mock_tests/aclorch_ut.cpp
diff --git a/tests/check.h → tests/mock_tests/check.h b/tests/check.h → tests/mock_tests/check.h
diff --git a/tests/mock_consumerstatetable.cpp → tests/mock_tests/mock_consumerstatetable.cpp b/tests/mock_consumerstatetable.cpp → tests/mock_tests/mock_consumerstatetable.cpp
diff --git a/tests/mock_dbconnector.cpp → tests/mock_tests/mock_dbconnector.cpp b/tests/mock_dbconnector.cpp → tests/mock_tests/mock_dbconnector.cpp
diff --git a/tests/mock_hiredis.cpp → tests/mock_tests/mock_hiredis.cpp b/tests/mock_hiredis.cpp → tests/mock_tests/mock_hiredis.cpp
diff --git a/tests/mock_orchagent_main.cpp → tests/mock_tests/mock_orchagent_main.cpp b/tests/mock_orchagent_main.cpp → tests/mock_tests/mock_orchagent_main.cpp
diff --git a/tests/mock_redisreply.cpp → tests/mock_tests/mock_redisreply.cpp b/tests/mock_redisreply.cpp → tests/mock_tests/mock_redisreply.cpp
diff --git a/tests/portal.h → tests/mock_tests/portal.h b/tests/portal.h → tests/mock_tests/portal.h
diff --git a/tests/saispy.h → tests/mock_tests/saispy.h b/tests/saispy.h → tests/mock_tests/saispy.h
diff --git a/tests/saispy_ut.cpp → tests/mock_tests/saispy_ut.cpp b/tests/saispy_ut.cpp → tests/mock_tests/saispy_ut.cpp
diff --git a/tests/ut_helper.h → tests/mock_tests/ut_helper.h b/tests/ut_helper.h → tests/mock_tests/ut_helper.h