From f16f628d1f8c2ca37df10b2d84dea05d6b9ebab1 Mon Sep 17 00:00:00 2001 From: wangmy Date: Fri, 7 Jan 2022 22:27:32 +0800 Subject: bats: upgrade 1.4.1 -> 1.5.0 0001-install.sh-consider-multilib.patch removed since it is included in 1.5.0 Changelog: Issues for this release ========= Added: --------- new command line flags (#488) --verbose-run: Make run print $output by default -x, --trace: Print test commands as they are executed (like set -x)` --show-output-of-passing-tests: Print output of passing tests --print-output-on-failure: Automatically print the value of $output on failed tests --gather-test-outputs-in : Gather the output of failing and passing tests as files in directory Experimental: add return code checks to run via !/- (#367, #507) install.sh and uninstall.sh take an optional second parameter for the lib folder name to allow for multilib install, e.g. into lib64 (#452) add run flag --keep-empty-lines to retain empty lines in ${lines[@]} (#224, a894fbf) add run flag --separate-stderr which also fills $stderr and $stderr_lines (#47, 5c9b173d, #507) Fixed: --------- don't glob run's $output when splitting into ${lines[@]} (#151, #152, #158, #156, #281, #289) remove empty line after test with pretty formatter on some terminals (#481) don't run setup_file/teardown_file on files without tests, e.g. due to filtering (#484) print final line without newline on Bash 3.2 for midtest (ERREXIT) failures too (#495, #145) abort with error on missing flock/shlock when running in parallel mode (#496) improved set -u test and fixed some unset variable accesses (#498, #501) shorten suite/file/test temporary folder paths to leave enough space even on restricted systems (#503) Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-test/bats/bats_1.4.1.bb | 32 ---------------- meta-oe/recipes-test/bats/bats_1.5.0.bb | 30 +++++++++++++++ .../files/0001-install.sh-consider-multilib.patch | 43 ---------------------- 3 files changed, 30 insertions(+), 75 deletions(-) delete mode 100644 meta-oe/recipes-test/bats/bats_1.4.1.bb create mode 100644 meta-oe/recipes-test/bats/bats_1.5.0.bb delete mode 100644 meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch diff --git a/meta-oe/recipes-test/bats/bats_1.4.1.bb b/meta-oe/recipes-test/bats/bats_1.4.1.bb deleted file mode 100644 index 13babd5ea5..0000000000 --- a/meta-oe/recipes-test/bats/bats_1.4.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Bash Automated Testing System" -DESCRIPTION = "Bats is a TAP-compliant testing framework for Bash. It \ -provides a simple way to verify that the UNIX programs you write behave as expected." -AUTHOR = "Sam Stephenson & bats-core organization" -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;branch=master;protocol=https \ - file://0001-install.sh-consider-multilib.patch \ - " -# v1.4.1 -SRCREV = "54e965fa9d269c2b3ff9036d81f32bac3df0edea" - -S = "${WORKDIR}/git" - -do_configure:prepend() { - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-file - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-test -} - -do_install() { - # Just a bunch of bash scripts to install - ${S}/install.sh ${D}${prefix} ${baselib} -} - -RDEPENDS:${PN} = "bash" -FILES:${PN} += "${libdir}/bats-core/*" - -PACKAGECONFIG ??= "pretty" -PACKAGECONFIG[pretty] = ",,,ncurses" diff --git a/meta-oe/recipes-test/bats/bats_1.5.0.bb b/meta-oe/recipes-test/bats/bats_1.5.0.bb new file mode 100644 index 0000000000..ffbb37c8a1 --- /dev/null +++ b/meta-oe/recipes-test/bats/bats_1.5.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "Bash Automated Testing System" +DESCRIPTION = "Bats is a TAP-compliant testing framework for Bash. It \ +provides a simple way to verify that the UNIX programs you write behave as expected." +AUTHOR = "Sam Stephenson & bats-core organization" +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;branch=master;protocol=https" +# v1.4.1 +SRCREV = "99d64eb017abcd6a766dd0d354e625526da69cb3" + +S = "${WORKDIR}/git" + +do_configure:prepend() { + sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats + sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-file + sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-test +} + +do_install() { + # Just a bunch of bash scripts to install + ${S}/install.sh ${D}${prefix} ${baselib} +} + +RDEPENDS:${PN} = "bash" +FILES:${PN} += "${libdir}/bats-core/*" + +PACKAGECONFIG ??= "pretty" +PACKAGECONFIG[pretty] = ",,,ncurses" diff --git a/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch b/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch deleted file mode 100644 index c7393ca2ed..0000000000 --- a/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 -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 ---- - 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 - -- cgit 1.2.3-korg