From 8f6995ddc639a46d825aa0fc294ef589547ca6d3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 4 Feb 2019 21:22:40 -0800 Subject: catch2: Upgrade to 2.6.0 Drop backported patch Signed-off-by: Khem Raj --- .../catch2/catch2/0001-Remove-redundant-move.patch | 37 ---------------------- meta-oe/recipes-test/catch2/catch2_2.5.0.bb | 26 --------------- meta-oe/recipes-test/catch2/catch2_2.6.0.bb | 24 ++++++++++++++ 3 files changed, 24 insertions(+), 63 deletions(-) delete mode 100644 meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch delete mode 100644 meta-oe/recipes-test/catch2/catch2_2.5.0.bb create mode 100644 meta-oe/recipes-test/catch2/catch2_2.6.0.bb diff --git a/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch b/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch deleted file mode 100644 index dc8a8915eb..0000000000 --- a/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7d7428fd09d1bcee281f7b678df8fb71e9365b17 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= - -Date: Thu, 27 Dec 2018 16:08:04 +0100 -Subject: [PATCH] A different approach - ---- - include/internal/catch_session.cpp | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - ---- a/include/internal/catch_session.cpp -+++ b/include/internal/catch_session.cpp -@@ -42,14 +42,20 @@ namespace Catch { - return createReporter(config->getReporterName(), config); - } - -- auto multi = std::unique_ptr(new ListeningReporter); -+ // On older platforms, returning std::unique_ptr -+ // when the return type is std::unique_ptr -+ // doesn't compile without a std::move call. However, this causes -+ // a warning on newer platforms. Thus, we have to work around -+ // it a bit and downcast the pointer manually. -+ auto ret = std::unique_ptr(new ListeningReporter); -+ auto& multi = static_cast(*ret); - - auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners(); - for (auto const& listener : listeners) { -- multi->addListener(listener->create(Catch::ReporterConfig(config))); -+ multi.addListener(listener->create(Catch::ReporterConfig(config))); - } -- multi->addReporter(createReporter(config->getReporterName(), config)); -- return std::move(multi); -+ multi.addReporter(createReporter(config->getReporterName(), config)); -+ return ret; - } - - diff --git a/meta-oe/recipes-test/catch2/catch2_2.5.0.bb b/meta-oe/recipes-test/catch2/catch2_2.5.0.bb deleted file mode 100644 index 26149b31e4..0000000000 --- a/meta-oe/recipes-test/catch2/catch2_2.5.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "A modern, C++-native, header-only, test framework for unit-tests, \ -TDD and BDD - using C++11, C++14, C++17 and later." -AUTHOR = "Phil Nash, Martin Horenovsky and others" -HOMEPAGE = "https://github.com/catchorg/Catch2" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" - -SRC_URI = "git://github.com/catchorg/Catch2.git \ - file://0001-Remove-redundant-move.patch \ - " -# v2.5.0 -#SRCREV = "6ccd467094973824d89efb16cbc553e279f79823" -SRCREV = "461843b1f02a4bf5c59db88ff201d2c56fabf3a4" - -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})" diff --git a/meta-oe/recipes-test/catch2/catch2_2.6.0.bb b/meta-oe/recipes-test/catch2/catch2_2.6.0.bb new file mode 100644 index 0000000000..13beb9e8b5 --- /dev/null +++ b/meta-oe/recipes-test/catch2/catch2_2.6.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "A modern, C++-native, header-only, test framework for unit-tests, \ +TDD and BDD - using C++11, C++14, C++17 and later." +AUTHOR = "Phil Nash, Martin Horenovsky and others" +HOMEPAGE = "https://github.com/catchorg/Catch2" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI = "git://github.com/catchorg/Catch2.git \ + " +# v2.6.0 +SRCREV = "d75e9b3c0f24fe42553131873459611ed155e297" + +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})" -- cgit 1.2.3-korg