From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Wed, 22 May 2019 16:56:09 +0000 (+0100)
Subject: test/gtest: fix issue with CI
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F62%2F19762%2F1;p=tldk.git

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>
---

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