diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-test')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/bats/bats_1.5.0.bb (renamed from meta-openembedded/meta-oe/recipes-test/bats/bats_1.4.1.bb) | 6 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch | 43 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.7.bb | 2 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb | 2 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb | 2 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb | 13 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb | 2 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb (renamed from meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb) | 4 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb | 3 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb | 2 |
10 files changed, 16 insertions, 63 deletions
diff --git a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.4.1.bb b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.5.0.bb index 30e83457c9..ffbb37c8a1 100644 --- a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.5.0.bb @@ -6,11 +6,9 @@ HOMEPAGE = "https://github.com/bats-core/bats-core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b" -SRC_URI = "git://github.com/bats-core/bats-core.git \ - file://0001-install.sh-consider-multilib.patch \ - " +SRC_URI = "git://github.com/bats-core/bats-core.git;branch=master;protocol=https" # v1.4.1 -SRCREV = "54e965fa9d269c2b3ff9036d81f32bac3df0edea" +SRCREV = "99d64eb017abcd6a766dd0d354e625526da69cb3" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch b/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch deleted file mode 100644 index c7393ca2ed..0000000000 --- a/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6e3d01f1ff199383b78a7504858c374fbce05f4e Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Thu, 10 Jun 2021 11:11:07 +0800 -Subject: [PATCH] install.sh: consider multilib - -It may install files to /usr/lib64 when multilib is enabled. Add an -optional parameter for install.sh to support it. - -Upstream-Status: Submitted [https://github.com/bats-core/bats-core/pull/452] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - install.sh | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/install.sh b/install.sh -index e660866..d91159e 100755 ---- a/install.sh -+++ b/install.sh -@@ -4,6 +4,7 @@ set -e - - BATS_ROOT="${0%/*}" - PREFIX="$1" -+BASELIB="${2:-lib}" - - if [[ -z "$PREFIX" ]]; then - printf '%s\n' \ -@@ -12,10 +13,10 @@ if [[ -z "$PREFIX" ]]; then - exit 1 - fi - --install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,lib/bats-core,share/man/man{1,7}} -+install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,${BASELIB}/bats-core,share/man/man{1,7}} - install -m 755 "$BATS_ROOT/bin"/* "$PREFIX/bin" - install -m 755 "$BATS_ROOT/libexec/bats-core"/* "$PREFIX/libexec/bats-core" --install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/lib/bats-core" -+install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/${BASELIB}/bats-core" - install -m 644 "$BATS_ROOT/man/bats.1" "$PREFIX/share/man/man1" - install -m 644 "$BATS_ROOT/man/bats.7" "$PREFIX/share/man/man7" - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.7.bb b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.7.bb index 3eda96c731..ed50f659d3 100644 --- a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.7.bb +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.7.bb @@ -5,7 +5,7 @@ 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;branch=v2.x" +SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x;protocol=https" SRCREV = "c4e3767e265808590986d5db6ca1b5532a7f3d13" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb index 59626df07a..554d582a57 100644 --- a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "a4fc3dd7705c277e3a57432895e9852ea105dac9" PV .= "+git${SRCPV}" -SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git \ +SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=master \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb b/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb index e84e03cdb2..921143a74c 100644 --- a/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb @@ -5,7 +5,7 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177" -SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https" +SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https;branch=master" SRCREV = "67d2dfd41e13f09ff218aa08e2d35f1c32f032a1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb index b760690652..65b54ed548 100644 --- a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb +++ b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb @@ -2,21 +2,22 @@ DESCRIPTION = "CxxTest is a unit testing framework for C++ that is similar in sp HOMEPAGE = "http://cxxtest.com/" SECTION = "devel" LICENSE = "LGPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/cxxtest-${PV}.tar.gz" +SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/${BP}.tar.gz" SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec" SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" -S = "${WORKDIR}/cxxtest-${PV}/python" +inherit setuptools3 -inherit distutils3 +SETUPTOOLS_SETUP_PATH = "${S}/python" do_install:append() { install -d ${D}${includedir} - cp -a ../cxxtest ${D}${includedir} + cp -a ${S}/cxxtest/ ${D}${includedir} + # Fix the interpretter as otherwise this points to the build host python sed '1c\ -#!/usr/bin/env python' -i ${D}${bindir}/cxxtestgen +#!/usr/bin/env python3' -i ${D}${bindir}/cxxtestgen } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb index a3a23c8951..eb6a34f301 100644 --- a/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb +++ b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2" SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69" -SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https \ +SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https;branch=master \ file://add_missing_limits_h_include.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb b/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb index 6a9d4b2787..14ab41b144 100644 --- a/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb @@ -1,12 +1,10 @@ SUMMARY = "Test suite for Linux framebuffer" -PV = "1.1.0" - LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" SRCREV = "063ec650960c2d79ac51f5c5f026cb05343a33e2" -SRC_URI = "git://github.com/prpplague/fb-test-app.git" +SRC_URI = "git://github.com//ponty/fb-test-app.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb index d33000b8b5..0480adb96c 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb @@ -20,8 +20,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" DEPENDS = "libpcre glib-2.0 dtc bison-native libbsd" DEPENDS:append:libc-musl = " libexecinfo" -# Use brokensep for now (https://github.com/ColinIanKing/fwts/issues/2) -inherit autotools-brokensep bash-completion pkgconfig +inherit autotools bash-completion pkgconfig LDFLAGS:append:libc-musl = " -lexecinfo" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index ff8cecc5b2..ff8191eff6 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -10,7 +10,7 @@ PROVIDES += "gmock gtest" S = "${WORKDIR}/git" SRCREV = "e2239ee6043f73722e7aa812a459f54a28552929" -SRC_URI = "git://github.com/google/googletest.git" +SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" inherit cmake |