Skip to contentSkip to conversation

gtest, gmock: update 1.7.0 -> 1.8.0

PATCH Superseded Andre McCurdy 2 participants 3 messages Dec 15, 2016

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gtest, gmock: update 1.7.0 -> 1.8.0

Starting from the 1.8.0 release, GoogleTest and GoogleMock are maintained in the same repository and released together.

---
 ...install-command-for-libraries-and-headers.patch |  40 --------
 .../cmake-gmock.pc.in-Add-pkg-config-support.patch |  56 -----------
 meta-oe/recipes-test/gmock/gmock_1.7.0.bb          |  23 -----
 ...install-command-for-libraries-and-headers.patch |  32 -------
 ...gtest.pc.in-Add-pkg-config-support-to-gte.patch |  55 -----------
 .../gtest/gtest/Add-pkg-config-support.patch       | 106 +++++++++++++++++++++
 meta-oe/recipes-test/gtest/gtest_1.7.0.bb          |  23 -----
 meta-oe/recipes-test/gtest/gtest_1.8.0.bb          |  27 ++++++
 8 files changed, 133 insertions(+), 229 deletions(-)
 delete mode 100644 meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch
 delete mode 100644 meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch
 delete mode 100644 meta-oe/recipes-test/gmock/gmock_1.7.0.bb
 delete mode 100644 meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch
 delete mode 100644 meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch
 create mode 100644 meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch
 delete mode 100644 meta-oe/recipes-test/gtest/gtest_1.7.0.bb
 create mode 100644 meta-oe/recipes-test/gtest/gtest_1.8.0.bb
meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch deleted +0 -40
deleted file mode 100644
index 0dac998..0000000
@@ -1,40 +0,0 @@
-From ba0a7d65c918cb7e3f2073553c4cc7af5858ed03 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <[email protected]>
-Date: Thu, 31 Jul 2014 16:54:00 -0300
-Subject: [PATCH] cmake: Add install command for libraries and headers
-Organization: O.S. Systems Software LTDA.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Otavio Salvador <[email protected]>
----
- CMakeLists.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 572d044..90e797a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,6 +63,8 @@ include_directories("${gmock_SOURCE_DIR}/include"
-                     # Test sources.
-                     "${gtest_SOURCE_DIR}")
- 
-+install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock DESTINATION include)
-+
- ########################################################################
- #
- # Defines the gmock & gmock_main libraries.  User tests should link
-@@ -82,6 +84,10 @@ cxx_library(gmock_main
-             src/gmock-all.cc
-             src/gmock_main.cc)
- 
-+
-+install(TARGETS gmock DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(TARGETS gmock_main DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+
- ########################################################################
- #
- # Google Mock's own tests.
--- 
-1.9.1
-
meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch deleted +0 -56

56 lines not on this page · raw message

meta-oe/recipes-test/gmock/gmock_1.7.0.bb deleted +0 -23
deleted file mode 100644
index a537f4c..0000000
@@ -1,23 +0,0 @@
-DESCRIPTION = "Google C++ Mocking Framework"
-SECTION = "libs"
-HOMEPAGE = "http://code.google.com/p/googlemock/"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
-
-SRC_URI = "\
-    http://googlemock.googlecode.com/files/${BPN}-${PV}.zip \
-    file://cmake-Add-install-command-for-libraries-and-headers.patch \
-    file://cmake-gmock.pc.in-Add-pkg-config-support.patch \
-"
-
-SRC_URI[md5sum] = "073b984d8798ea1594f5e44d85b20d66"
-SRC_URI[sha256sum] = "26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b"
-
-inherit lib_package cmake
-
-ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-dbg = "1"
-
-RDEPENDS_${PN}-dev += "${PN}-staticdev"
-
-BBCLASSEXTEND = "native nativesdk"
meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch deleted +0 -32
deleted file mode 100644
index b8f5d6f..0000000
@@ -1,32 +0,0 @@
-From bdcbef7b8adde424ee29e7eddc3b0570cc336449 Mon Sep 17 00:00:00 2001
-From: Frederico Cadete <[email protected]>
-Date: Tue, 21 Jun 2016 10:55:38 +0200
-Subject: [PATCH 1/2] Add install command for libraries and headers
-
-Signed-off-by: Frederico Cadete <[email protected]>
----
- CMakeLists.txt | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 57470c8..e969648 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,6 +73,14 @@ target_link_libraries(gtest_main gtest)
- 
- ########################################################################
- #
-+# Install rules
-+install(TARGETS gtest gtest_main
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+
-+########################################################################
-+#
- # Samples on how to link user tests with gtest or gtest_main.
- #
- # They are not built by default.  To build them, set the
--- 
-2.5.0
-
meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch deleted +0 -55

55 lines not on this page · raw message

meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch new file +106 -0

106 lines not on this page · raw message

meta-oe/recipes-test/gtest/gtest_1.7.0.bb deleted +0 -23
deleted file mode 100644
index 5bacf6c..0000000
@@ -1,23 +0,0 @@
-DESCRIPTION = "Google's framework for writing C++ tests"
-HOMEPAGE = "http://code.google.com/p/googletest/"
-SECTION = "libs"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
-
-SRC_URI = "\
-    http://googletest.googlecode.com/files/${BPN}-${PV}.zip \
-    file://0001-Add-install-command-for-libraries-and-headers.patch \
-    file://0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch \
-"
-
-SRC_URI[md5sum] = "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
-SRC_URI[sha256sum] = "247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d"
-
-inherit lib_package cmake
-
-ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-dbg = "1"
-
-RDEPENDS_${PN}-dev += "${PN}-staticdev"
-
-BBCLASSEXTEND = "native nativesdk"
meta-oe/recipes-test/gtest/gtest_1.8.0.bb new file +27 -0
new file mode 100644
index 0000000..483dc1f
@@ -0,0 +1,27 @@
+DESCRIPTION = "Google's framework for writing C++ tests"
+HOMEPAGE = "https://github.com/google/googletest"
+SECTION = "libs"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
+                    file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
+
+PROVIDES += "gmock"
+
+SRC_URI = "\
+    https://github.com/google/googletest/archive/release-${PV}.tar.gz \
+    file://Add-pkg-config-support.patch \
+"
+
+SRC_URI[md5sum] = "16877098823401d1bf2ed7891d7dce36"
+SRC_URI[sha256sum] = "58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8"
+
+S = "${WORKDIR}/googletest-release-${PV}"
+
+inherit cmake
+
+ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY_${PN}-dbg = "1"
+
+RDEPENDS_${PN}-dev += "${PN}-staticdev"
+
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.9.1
#1 lore raw
Quoted 1 line · Andre McCurdy

Add install command for libraries and headers

There seem to be a missing patch which installs the headers and libraries. Did you check if it has merged upstream?

The commit log needs to be extended to mention what happened to those patches as well as that it now provides gmock.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#2 lore raw
Quoted 5 lines · Otavio Salvador
Quoted 1 line · Andre McCurdy

Add install command for libraries and headers

There seem to be a missing patch which installs the headers and libraries. Did you check if it has merged upstream?

Yes, install support has been merged upstream, for both gtest and gmock.

https://github.com/google/googletest/commit/98d988deac06637364f6cd41c45c3db4a8a0b6bc
https://github.com/google/googletest/commit/7c8ac4886a7ad513430d132c446a93c6d395345a

Quoted 2 lines

The commit log needs to be extended to mention what happened to those patches as well as that it now provides gmock.

Thanks for the comments. I'll send a v2.

Quoted 6 lines

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
--