diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-test')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch | 46 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.6.1.bb (renamed from meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb) | 17 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch | 35 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.14.0.bb (renamed from meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb) | 6 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch | 9 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb (renamed from meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb) | 9 |
6 files changed, 55 insertions, 67 deletions
diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch b/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch deleted file mode 100644 index 307377563..000000000 --- a/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5729874fa5059c39aa97cfa08fddf107b7a65c9e Mon Sep 17 00:00:00 2001 -From: Miguel Gaio <mgaio35@gmail.com> -Date: Wed, 3 Oct 2018 10:22:16 +0200 -Subject: [PATCH] Fix convert from char on ARM build - -Some platforms set the signedness of char to unsigned (eg. ARM). -Convert from char should not assume the signedness of char. - -Fix build issue with -Werror,-Wtautological-unsigned-zero-compare flags. - -Signed-off-by: Miguel Gaio <mgaio35@gmail.com> - -Upstream-Status: Accepted [Commit f1faaa9c107113692301ad8bb56084460ef1a2ff] - -Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> ---- - include/internal/catch_tostring.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/internal/catch_tostring.cpp b/include/internal/catch_tostring.cpp -index 4e0c027d..8cbabbf2 100644 ---- a/include/internal/catch_tostring.cpp -+++ b/include/internal/catch_tostring.cpp -@@ -205,7 +205,7 @@ std::string StringMaker<bool>::convert(bool b) { - return b ? "true" : "false"; - } - --std::string StringMaker<char>::convert(char value) { -+std::string StringMaker<signed char>::convert(signed char value) { - if (value == '\r') { - return "'\\r'"; - } else if (value == '\f') { -@@ -222,8 +222,8 @@ std::string StringMaker<char>::convert(char value) { - return chstr; - } - } --std::string StringMaker<signed char>::convert(signed char c) { -- return ::Catch::Detail::stringify(static_cast<char>(c)); -+std::string StringMaker<char>::convert(char c) { -+ return ::Catch::Detail::stringify(static_cast<signed char>(c)); - } - std::string StringMaker<unsigned char>::convert(unsigned char c) { - return ::Catch::Detail::stringify(static_cast<char>(c)); --- -2.19.1 - diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.6.1.bb index 0183c2e41..08d661640 100644 --- a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.6.1.bb @@ -6,19 +6,20 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI = "git://github.com/catchorg/Catch2.git \ - file://0001-Fix-convert-from-char-on-ARM-build.patch" -SRCREV = "9e1bdca4667295fcb16265eae00efa8423f07007" + file://0001-Fix-Wdefaulted-function-deleted-warning.patch \ + " +# v2.6.1 +SRCREV = "dbbab8727c342733f75045483048cdcb52421e32" S = "${WORKDIR}/git" inherit cmake python3native +do_install_append() { + rm ${D}${datadir}/Catch2/lldbinit + rm ${D}${datadir}/Catch2/gdbinit + rmdir ${D}${datadir}/Catch2/ +} # Header-only library RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -do_install_append() { - rm ${D}/${datadir}/Catch2/lldbinit - rm ${D}/${datadir}/Catch2/gdbinit - rmdir ${D}/${datadir}/Catch2/ -} diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch b/meta-openembedded/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch new file mode 100644 index 000000000..555c71ad2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch @@ -0,0 +1,35 @@ +From a39e0eaa8318335260967ffd1d16388eb5a1d6d8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Feb 2019 12:57:00 -0800 +Subject: [PATCH] Fix -Wdefaulted-function-deleted warning + +Clang8 warns + +catch_interfaces_reporter.h:84:25: error: explicitly defaulted move assignment operator is implicitly deleted [-Werror,-Wdefaulted-function-deleted] +| AssertionStats& operator = ( AssertionStats && ) = default; +| ^ + +Upstream-Status: Submitted [https://github.com/catchorg/Catch2/pull/1537] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/internal/catch_interfaces_reporter.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h +index 9d99c981..e5fbf8bb 100644 +--- a/include/internal/catch_interfaces_reporter.h ++++ b/include/internal/catch_interfaces_reporter.h +@@ -80,8 +80,8 @@ namespace Catch { + + AssertionStats( AssertionStats const& ) = default; + AssertionStats( AssertionStats && ) = default; +- AssertionStats& operator = ( AssertionStats const& ) = default; +- AssertionStats& operator = ( AssertionStats && ) = default; ++ AssertionStats& operator = ( AssertionStats const& ) = delete; ++ AssertionStats& operator = ( AssertionStats && ) = delete; + virtual ~AssertionStats(); + + AssertionResult assertionResult; +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb b/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.14.0.bb index 65b08b068..04327862c 100644 --- a/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb +++ b/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.14.0.bb @@ -2,13 +2,13 @@ DESCRIPTION = "CppUnit is the C++ port of the famous JUnit framework for unit te HOMEPAGE = "http://www.freedesktop.org/wiki/Software/cppunit" LICENSE = "LGPL-2.1" SECTION = "libs" +LIC_FILES_CHKSUM = "file://COPYING;md5=b0e9ef921ff780eb328bdcaeebec3269" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = " \ http://dev-www.libreoffice.org/src/cppunit-${PV}.tar.gz \ file://0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch \ " -SRC_URI[md5sum] = "d1c6bdd5a76c66d2c38331e2d287bc01" -SRC_URI[sha256sum] = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f" +SRC_URI[md5sum] = "7ad93022171710a541bfe4bfd8b4a381" +SRC_URI[sha256sum] = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch b/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch index 6a20c1283..441876e40 100644 --- a/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch +++ b/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch @@ -17,15 +17,12 @@ diff --git a/doc/Makefile.am b/doc/Makefile.am index 8815476..3237499 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -22,7 +22,7 @@ htmldir += $(pkgdatadir)/html +@@ -8,7 +8,7 @@ htmldir += $(pkgdatadir)/html html_DATA += $(static_pages) html/index.html install-data-hook: - cp -pR html/* $(DESTDIR)$(htmldir) + cp -R html/* $(DESTDIR)$(htmldir) - # Automake's "distcheck" is sensitive to having files left over - # after "make uninstall", so we have to clean up the install hook. --- -2.5.0 - + uninstall-local: + rm -rf $(DESTDIR)$(htmldir) diff --git a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb index 291501173..342fccf41 100644 --- a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb +++ b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb @@ -1,12 +1,13 @@ DESCRIPTION = "CxxTest is a unit testing framework for C++ that is similar in spirit to JUnit, CppUnit, and xUnit." HOMEPAGE = "http://cxxtest.com/" -LICENSE = "LGPL-2.0" SECTION = "devel" +LICENSE = "LGPL-2.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/cxxtest-${PV}.tar.gz" -SRC_URI[md5sum] = "b3a24b3e1aad9acf6adac37f4c3f83ec" -SRC_URI[sha256sum] = "356d0f4810e8eb5c344147a0cca50fc0d84122c286e7644b61cb365c2ee22083" -LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" +SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec" +SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" + S = "${WORKDIR}/cxxtest-${PV}/python" inherit distutils |