aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ananyev <konstantin.ananyev@intel.com>2019-05-22 17:56:09 +0100
committerKonstantin Ananyev <konstantin.ananyev@intel.com>2019-05-22 18:22:57 +0100
commitf6603a8bef7990be4bb719aed2d1e82b31e5cdd5 (patch)
tree145c761177ffe396ec2ffd6817defce382d76baa
parent309fc82f90b5f26ccca20967167b6a98085a81af (diff)
test/gtest: fix issue with CI
New googletest version changed default location of builded libraries. Update gtest Makefile to work with both locations. Change-Id: I4bddb257f1edef875c4675bb669b5d2308f6fe0f Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
-rw-r--r--test/gtest/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/gtest/Makefile b/test/gtest/Makefile
index c81cf4c..e980c23 100644
--- a/test/gtest/Makefile
+++ b/test/gtest/Makefile
@@ -94,7 +94,7 @@ CXXFLAGS += -I$(RTE_OUTPUT)/include
CXXFLAGS += $(EXTRA_CFLAGS)
LDFLAGS += -lstdc++
-LDFLAGS += -L$(GMOCK_DIR) -lgmock
+LDFLAGS += -L$(GMOCK_DIR) -L$(GMOCK_DIR)/../lib -lgmock
LDLIBS += -whole-archive -ltle_l4p -ltle_dring
include $(TLDK_ROOT)/mk/tle.cpp-obj.mk
@@ -122,8 +122,8 @@ CFLAGS += $(WERROR_FLAGS)
LDLIBS += gtest-rfc.o
LDLIBS += -lstdc++
-LDLIBS += -L$(GMOCK_DIR) -lgmock
-LDLIBS += -L$(GMOCK_DIR)/gtest -lgtest
+LDLIBS += -L$(GMOCK_DIR) -L$(GMOCK_DIR)/../lib -lgmock
+LDLIBS += -L$(GMOCK_DIR)/gtest -L$(GMOCK_DIR)/../lib -lgtest
LDLIBS += -L$(RTE_OUTPUT)/lib
LDLIBS += -whole-archive -ltle_l4p -ltle_dring -ltle_timer