[packages/kinetic-cpp-client] - switched tests to system gmock-devel (as packaged since 1.10.0)

qboosh qboosh at pld-linux.org
Fri May 22 21:26:50 CEST 2020


commit 5f5e703e35822f251d8a010ef01b5dce869004e0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri May 22 21:27:24 2020 +0200

    - switched tests to system gmock-devel (as packaged since 1.10.0)

 kinetic-cpp-client-system-libs.patch | 5 ++---
 kinetic-cpp-client.spec              | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/kinetic-cpp-client.spec b/kinetic-cpp-client.spec
index 4152771..502f9f8 100644
--- a/kinetic-cpp-client.spec
+++ b/kinetic-cpp-client.spec
@@ -19,7 +19,7 @@ BuildRequires:	cmake >= 2.8.6
 %{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	gflags-devel >= 2.0
 BuildRequires:	glog-devel >= 0.3.3
-BuildRequires:	gmock-devel >= 1.6.0
+BuildRequires:	gmock-devel >= 1.10.0
 BuildRequires:	gtest-devel >= 1.6.0
 BuildRequires:	kinetic-protocol >= 4.0
 BuildRequires:	libstdc++-devel
diff --git a/kinetic-cpp-client-system-libs.patch b/kinetic-cpp-client-system-libs.patch
index 691cd30..90e1a95 100644
--- a/kinetic-cpp-client-system-libs.patch
+++ b/kinetic-cpp-client-system-libs.patch
@@ -17,7 +17,7 @@
  
  set(TEST_BINARY "kinetic_client_test")
  set(TEST_BINARY_PATH ${kinetic_cpp_client_BINARY_DIR}/${TEST_BINARY})
-@@ -55,98 +55,17 @@
+@@ -55,98 +55,16 @@
  set(KINETIC_PROTO_VERSION "3.0.0")
  set(KINETIC_PROTO_MD5 "85ca027b870811a297c1f6d792498934")
  
@@ -94,7 +94,6 @@
 -    CONFIGURE_COMMAND ../protoc/configure --prefix=${EXTERNAL_PREFIX}/host --enable-static
 -)
 -
-+#add_library(gmock STATIC /usr/src/gmock/src/gmock-all.cc)
  # Protobuf code generation rules
 -set(PROTOC_PATH "${PREFIX}/host/bin/protoc")
 -set(PROTO_DIR "${CMAKE_BINARY_DIR}/vendor/src/kinetic-proto")
@@ -121,7 +120,7 @@
  )
  set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${GENERATED_SOURCES_PATH})
  
-@@ -158,20 +76,14 @@
+@@ -158,20 +75,14 @@
      src/test/mock
      src/test
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kinetic-cpp-client.git/commitdiff/5f5e703e35822f251d8a010ef01b5dce869004e0



More information about the pld-cvs-commit mailing list