aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Desportes <williamdes@wdes.fr>2020-12-14 21:01:27 +0000
committerTBK <tbk@jjtc.eu>2020-12-16 11:25:55 +0000
commitcac6245094021a11003fb0663bfc820394d2b970 (patch)
tree12e3a5fb57b20ab73f797c0d9ed2b700039db564
parent5504750087b1de9054b48cabba0465c90316f0a0 (diff)
downloadaports-cac6245094021a11003fb0663bfc820394d2b970.tar.gz
aports-cac6245094021a11003fb0663bfc820394d2b970.tar.bz2
aports-cac6245094021a11003fb0663bfc820394d2b970.tar.xz
community/shunit2: upgrade to 2.1.8
-rw-r--r--community/shunit2/APKBUILD25
-rw-r--r--community/shunit2/dash-negative-lineno.patch197
2 files changed, 212 insertions, 10 deletions
diff --git a/community/shunit2/APKBUILD b/community/shunit2/APKBUILD
index 74eab1ddf8..32a6ab8458 100644
--- a/community/shunit2/APKBUILD
+++ b/community/shunit2/APKBUILD
@@ -1,27 +1,32 @@
# Contributor: Olliver Schinagl <oliver@schinagl.nl>
+# Contributor: Max Rees <maxcrees@me.com>
+# Contributor: William Desportes <williamdes@wdes.fr>
# Maintainer: Olliver Schinagl <oliver@schinagl.nl>
-pkgname="shunit2"
-pkgver="2.1.7"
-pkgrel=1
+pkgname=shunit2
+pkgver=2.1.8
+pkgrel=0
pkgdesc="A xUnit based unit test framework for Bourne based shell scripts."
url="https://github.com/kward/shunit2/"
arch="noarch"
license="Apache-2.0"
makedepends="bash dash loksh zsh"
-subpackages="${pkgname}-doc"
-source="${pkgname}-${pkgver}.tar.gz::https://github.com/kward/shunit2/archive/v${pkgver}.tar.gz"
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/kward/shunit2/archive/v$pkgver.tar.gz
+ dash-negative-lineno.patch"
check() {
_tmpdir="$(mktemp -d -p "${TMPDIR:-/tmp/}" shunit2.XXXXXXXX)"
- TMPDIR="${_tmpdir}" ./gen_test_report.sh
- rm -rf "${_tmpdir}"
+ # To understand this comment please refer to: https://github.com/kward/shunit2/issues/121
+ env -i TMPDIR="$_tmpdir" SHELL="/bin/bash" TERM=xterm ./test_runner
+ rm -rf "$_tmpdir"
}
package() {
- install -D -m 755 -t "${pkgdir}/usr/bin/" \
+ install -D -m 755 -t "$pkgdir/usr/bin/" \
"shunit2"
- install -D -m 644 -t "${pkgdir}/usr/share/doc/${pkgname}/" \
+ install -D -m 644 -t "$pkgdir/usr/share/doc/$pkgname/" \
"README.md"
}
-sha512sums="35453cf2c469eb1bab2fff0624b8037a09d405c377fec0938875a6339749d5934fe246eec5691a121290ae9e4ee5cbf7768b740c5f0010a5345c4e111c50fbbd shunit2-2.1.7.tar.gz"
+sha512sums="15aaf28996c9fb5ee5419f63b50013a194a7416dea04eb34eae2481f05e0580bd2c6977ad002b421e2785e2024978fda869cad1ef4125857c2a5ea21bf44a06e shunit2-2.1.8.tar.gz
+b289f4fe3da1f269558aa22c844f374c3dd2bd4d90b9d12422b7b5e90f28950ba55e5ec092c2c2532398c25c3b7d37465802dd281c9543bb0f1f56c0957fb5aa dash-negative-lineno.patch"
diff --git a/community/shunit2/dash-negative-lineno.patch b/community/shunit2/dash-negative-lineno.patch
new file mode 100644
index 0000000000..dae2c37762
--- /dev/null
+++ b/community/shunit2/dash-negative-lineno.patch
@@ -0,0 +1,197 @@
+dash reports a negative $LINENO when using shunit2's macros - this isn't
+shunit2's fault, so allow for it in the test cases
+
+--- shunit2-2.1.8/shunit2_macros_test.sh
++++ shunit2-2.1.8/shunit2_macros_test.sh
+@@ -27,13 +27,13 @@ testAssertEquals() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_ASSERT_EQUALS_} 'x' 'y' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_EQUALS_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_ASSERT_EQUALS_} '"some msg"' 'x' 'y' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_EQUALS_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -46,13 +46,13 @@ testAssertNotEquals() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_ASSERT_NOT_EQUALS_} 'x' 'x' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_NOT_EQUALS_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_ASSERT_NOT_EQUALS_} '"some msg"' 'x' 'x' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_NOT_EQUALS_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -65,13 +65,13 @@ testSame() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_ASSERT_SAME_} 'x' 'y' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_SAME_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_ASSERT_SAME_} '"some msg"' 'x' 'y' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_SAME_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -84,13 +84,13 @@ testNotSame() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_ASSERT_NOT_SAME_} 'x' 'x' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_NOT_SAME_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_ASSERT_NOT_SAME_} '"some msg"' 'x' 'x' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_NOT_SAME_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -103,13 +103,13 @@ testNull() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_ASSERT_NULL_} 'x' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_NULL_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_ASSERT_NULL_} '"some msg"' 'x' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_NULL_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -123,13 +123,13 @@ testNotNull()
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_ASSERT_NOT_NULL_} '' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_NOT_NULL_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_ASSERT_NOT_NULL_} '"some msg"' '""' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_NOT_NULL_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stdoutF}" "${stderrF}" >&2
+@@ -142,13 +142,13 @@ testAssertTrue() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_ASSERT_TRUE_} "${SHUNIT_FALSE}" >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_TRUE_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_ASSERT_TRUE_} '"some msg"' "${SHUNIT_FALSE}" >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_TRUE_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -161,13 +161,13 @@ testAssertFalse() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_ASSERT_FALSE_} "${SHUNIT_TRUE}" >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_FALSE_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_ASSERT_FALSE_} '"some msg"' "${SHUNIT_TRUE}" >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_ASSERT_FALSE_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -180,13 +180,13 @@ testFail() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_FAIL_} >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_FAIL_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_FAIL_} '"some msg"' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_FAIL_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -200,13 +200,13 @@ testFailNotEquals()
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_FAIL_NOT_EQUALS_} 'x' 'y' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_FAIL_NOT_EQUALS_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_FAIL_NOT_EQUALS_} '"some msg"' 'x' 'y' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_FAIL_NOT_EQUALS_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -219,13 +219,13 @@ testFailSame() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_FAIL_SAME_} 'x' 'x' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_FAIL_SAME_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_FAIL_SAME_} '"some msg"' 'x' 'x' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_FAIL_SAME_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+@@ -238,13 +238,13 @@ testFailNotSame() {
+ [ -z "${LINENO:-}" ] && startSkipping
+
+ ( ${_FAIL_NOT_SAME_} 'x' 'y' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_FAIL_NOT_SAME_ failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2
+
+ ( ${_FAIL_NOT_SAME_} '"some msg"' 'x' 'y' >"${stdoutF}" 2>"${stderrF}" )
+- grep '^ASSERT:\[[0-9]*\] *' "${stdoutF}" >/dev/null
++ grep '^ASSERT:\[[0-9-]*\] *' "${stdoutF}" >/dev/null
+ rtrn=$?
+ assertTrue '_FAIL_NOT_SAME_ w/ msg failure' ${rtrn}
+ [ "${rtrn}" -ne "${SHUNIT_TRUE}" ] && cat "${stderrF}" >&2