mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

sdbus-c++: Bump version from 1.00 to 1.1.0

Browse Source 
Cherry-pick upstream commit 7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44 to fix build

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gianfranco
2022-05-19 15:45:59 +02:00
committed by Khem Raj
parent 32581a7a46
commit 973c0c5129
3 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.1.0/7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44.patch
+54
View File
@@ -0,0 +1,54 @@
commit 7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44
Author: Stanislav Angelovic <stanislav.angelovic@siemens.com>
Date: Thu Jan 27 13:38:19 2022 +0100
fix(tests): printer for std::chrono in googletest v1.11.0
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fbf198c..ec42e55 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,7 +19,7 @@ if (NOT TARGET GTest::gmock)
if (NOT TARGET GTest::gmock)
include(FetchContent)
- message("Fetching googletest...")
+ message("Fetching googletest v${GOOGLETEST_VERSION}...")
FetchContent_Declare(googletest
GIT_REPOSITORY ${GOOGLETEST_GIT_REPO}
GIT_TAG release-${GOOGLETEST_VERSION}
diff --git a/tests/integrationtests/Defs.h b/tests/integrationtests/Defs.h
index 2f129a4..2bfc7c9 100644
--- a/tests/integrationtests/Defs.h
+++ b/tests/integrationtests/Defs.h
@@ -56,20 +56,18 @@ const bool DEFAULT_BLOCKING_VALUE{true};
constexpr const double DOUBLE_VALUE{3.24L};
-/** Duration stream operator for human readable gtest value output.
- *
- * Note that the conversion to double is lossy if the input type has 64 or more bits.
- * This is ok for our integration tests because they don't have very
- * accurate timing requirements.
- *
- * @return human readable duration in seconds
- */
+}}
+
+namespace testing::internal {
+
+// Printer for std::chrono::duration types.
+// This is a workaround, since it's not a good thing to add this to std namespace.
template< class Rep, class Period >
-static std::ostream& operator<<(std::ostream& os, const std::chrono::duration<Rep, Period>& d)
-{
+void PrintTo(const ::std::chrono::duration<Rep, Period>& d, ::std::ostream* os) {
auto seconds = std::chrono::duration_cast<std::chrono::duration<double>>(d);
- return os << seconds.count() << " s";
+ *os << seconds.count() << "s";
+}
+
}
-}}
#endif /* SDBUS_CPP_INTEGRATIONTESTS_DEFS_H_ */
meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.0.0/run-ptest → meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.1.0/run-ptest
View File
meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb → meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.1.0.bb
+3 -2
View File
@@ -16,10 +16,11 @@ PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${B
DEPENDS += "expat"
SRCREV = "65782bbf435d91e5eb6af9ddab110df406a824a9"
SRCREV = "bca8e81037766a0454740c40307eea32831c101f"
SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master"
SRC_URI += "file://run-ptest"
SRC_URI += "file://run-ptest \
file://7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44.patch "
EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \
-DBUILD_DOC=ON \