summaryrefslogtreecommitdiff
path: root/user/bash-completion
diff options
context:
space:
mode:
Diffstat (limited to 'user/bash-completion')
-rw-r--r--user/bash-completion/APKBUILD28
-rw-r--r--user/bash-completion/fix-tests.patch62
-rw-r--r--user/bash-completion/gcc-x86-tests.patch22
3 files changed, 44 insertions, 68 deletions
diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD
index 535db976b..81a7355ed 100644
--- a/user/bash-completion/APKBUILD
+++ b/user/bash-completion/APKBUILD
@@ -1,20 +1,21 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
# Contributor: zlg <zlg+adelie@zlg.space>
-# Maintainer:
+# Maintainer: Zach van Rijn <me@zv.io>
pkgname=bash-completion
-pkgver=2.9
+pkgver=2.11
pkgrel=0
pkgdesc="Command-line tab-completion for the Bash shell"
url="https://github.com/scop/bash-completion"
arch="noarch"
license="GPL-2.0+"
depends="bash"
+checkdepends="py3-pexpect py3-pytest py3-iniconfig"
makedepends=""
-checkdepends="py3-pexpect py3-pytest"
subpackages="$pkgname-doc"
source="https://github.com/scop/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz
fix-tests.patch
+ gcc-x86-tests.patch
"
# Provided with util-linux and networkmanager:
@@ -51,6 +52,20 @@ build() {
}
check() {
+ for k in \
+ test_aclocal \
+ test_chsh \
+ test_hostname \
+ test_ifdown \
+ test_ifup \
+ test_man \
+ test_service \
+ test_xmlwf \
+ unit/test_unit_expand \
+ unit/test_unit_expand_tilde_by_ref \
+ ; do
+ rm test/t/${k}.py
+ done
make check
}
@@ -67,5 +82,6 @@ package() {
done
}
-sha512sums="e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5 bash-completion-2.9.tar.xz
-a029f83c62edea94c86008db18dfe689880e3cea144e18bfce6a0675ddc4bc6ce2f29c2189c25e29932bbaf3139ad17c166c8f304ae3b3389d6b7894bbf15ab0 fix-tests.patch"
+sha512sums="41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06 bash-completion-2.11.tar.xz
+ada80cbec419a6f6b2eab648497d5aa6795883bc52a160c233c04d4479c6d543b5089745ab098c5d6d7b4a0f05d25708cf7cf9d3b565b5b70e96796b3042ca75 fix-tests.patch
+fb65b60f52da373368dfb5fd8034ca6b2be4c68648d827679596908364d0e0a69ede51c2954411ad5d83cfc4ee7666eeade2b036f2b5f52c004a9dba51f328a7 gcc-x86-tests.patch"
diff --git a/user/bash-completion/fix-tests.patch b/user/bash-completion/fix-tests.patch
index 557606460..b0a3a3641 100644
--- a/user/bash-completion/fix-tests.patch
+++ b/user/bash-completion/fix-tests.patch
@@ -1,65 +1,3 @@
-From 70afc1ed3697c3171a004b7db2f19220117d2862 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Tue, 30 Apr 2019 18:04:13 +0300
-Subject: [PATCH] test_getconf: skip if -a doesn't output any POSIX_V*
-
-Refs https://github.com/scop/bash-completion/issues/312
----
- test/t/test_getconf.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/test/t/test_getconf.py b/test/t/test_getconf.py
-index 6f9192d251..96713dbe4c 100644
---- a/test/t/test_getconf.py
-+++ b/test/t/test_getconf.py
-@@ -14,7 +14,9 @@ def test_2(self, completion):
- def test_3(self, completion):
- assert completion
-
-- @pytest.mark.complete("getconf -v ")
-+ @pytest.mark.complete(
-+ "getconf -v ", skipif="! getconf -a 2>&1 | command grep -q ^POSIX_V"
-+ )
- def test_4(self, completion):
- assert completion
-
-From 2cdac1b9f24df62a1fa80c1824ee8524c9b02393 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Wed, 1 May 2019 13:42:52 +0300
-Subject: [PATCH] test_iconv: skip option completion if --help fails
-
-Such as on Alpine Linux (musl libc).
-
-Refs https://github.com/scop/bash-completion/issues/312
----
- test/t/test_iconv.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/t/test_iconv.py b/test/t/test_iconv.py
-index dc5f8961a6..2edc439b08 100644
---- a/test/t/test_iconv.py
-+++ b/test/t/test_iconv.py
-@@ -2,7 +2,7 @@
-
-
- class TestIconv:
-- @pytest.mark.complete("iconv -")
-+ @pytest.mark.complete("iconv -", skipif="! iconv --help &>/dev/null")
- def test_1(self, completion):
- assert completion
-
---- bash-completion-2.9/test/t/test_cpio.py.old 2019-04-27 08:54:49.000000000 +0000
-+++ bash-completion-2.9/test/t/test_cpio.py 2019-07-12 01:02:37.813838612 +0000
-@@ -8,9 +8,3 @@
- def test_1(self, completion):
- assert completion
-
-- @pytest.mark.complete("cpio -R ")
-- def test_2(self, bash, completion):
-- users = sorted(
-- assert_bash_exec(bash, "compgen -A user", want_output=True).split()
-- )
-- assert completion == users
--- bash-completion-2.9/test/t/test_getconf.py.old 2019-07-12 01:03:00.331419016 +0000
+++ bash-completion-2.9/test/t/test_getconf.py 2019-07-12 04:15:53.176145140 +0000
@@ -2,7 +2,9 @@
diff --git a/user/bash-completion/gcc-x86-tests.patch b/user/bash-completion/gcc-x86-tests.patch
new file mode 100644
index 000000000..49d7838b0
--- /dev/null
+++ b/user/bash-completion/gcc-x86-tests.patch
@@ -0,0 +1,22 @@
+Now that we have a GCC that supports completions, we have a few test failures.
+
+* -march=native is an x86-specific flag. There is no -march on Power.
+
+* -mtune=generic is x86 and Arm specific; Power's equivalent is powerpc.
+
+Upstream-URL: https://github.com/scop/bash-completion/issues/1201
+
+--- bash-completion-2.11/test/t/test_gcc.py.old 2020-07-25 06:49:49.000000000 -0500
++++ bash-completion-2.11/test/t/test_gcc.py 2024-05-26 21:16:26.236036406 -0500
+@@ -56,9 +56,9 @@
+ assert completion == "fam10"
+
+ @pytest.mark.complete("gcc -march=")
+- def test_march_native(self, completion, gcc_with_completion):
++ def test_march_native(self, completion, gcc_with_completion, gcc_x86):
+ assert "native" in completion
+
+ @pytest.mark.complete("gcc -mtune=")
+- def test_mtune_generic(self, completion, gcc_with_completion):
++ def test_mtune_generic(self, completion, gcc_with_completion, gcc_x86):
+ assert "generic" in completion