[-- Attachment #1: Type: text/plain, Size: 1315 bytes --] There is a new pull request by tornaria against master on the void-packages repository https://github.com/tornaria/void-packages complete-xbps https://github.com/void-linux/void-packages/pull/35201 bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35201.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-complete-xbps-35201.patch --] [-- Type: text/x-diff, Size: 2016 bytes --] From d5ef493649685c0d93da3ece773b447c1a373fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy> Date: Sun, 23 Jan 2022 11:50:34 -0300 Subject: [PATCH] bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 --- .../patches/complete-xbps.patch | 24 +++++++++++++++++++ srcpkgs/bash-completion/template | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch diff --git a/srcpkgs/bash-completion/patches/complete-xbps.patch b/srcpkgs/bash-completion/patches/complete-xbps.patch new file mode 100644 index 000000000000..3e34ef1d78da --- /dev/null +++ b/srcpkgs/bash-completion/patches/complete-xbps.patch @@ -0,0 +1,24 @@ +Complete tar with .xbps files. + +Backported from upstream https://github.com/scop/bash-completion/pull/688 + +--- a/completions/tar ++++ b/completions/tar 2022-01-23 11:42:19.699734913 -0300 +@@ -422,7 +422,7 @@ + + __tar_detect_ext() + { +- local tars='@(@(tar|gem|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst))' ++ local tars='@(@(tar|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst)|gem|xbps)' + ext="$tars" + + case "$tar_mode_arg" in +@@ -430,7 +430,7 @@ + # Should never happen? + ;; + ?(-)*[cr]*f) +- ext='@(tar|gem|spkg)' ++ ext='@(tar|gem|spkg|xbps)' + case ${words[1]} in + *a*) ext="$tars" ;; + *z*) ext='t?(ar.)gz' ;; diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index 8f20e4e7acd7..cf8cb4b0dd75 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,7 +1,7 @@ # Template file for 'bash-completion' pkgname=bash-completion version=2.11 -revision=2 +revision=3 build_style=gnu-configure make_install_args="profiledir=/etc/bash/bashrc.d" depends="bash"
[-- Attachment #1: Type: text/plain, Size: 1320 bytes --] There is an updated pull request by tornaria against master on the void-packages repository https://github.com/tornaria/void-packages complete-xbps https://github.com/void-linux/void-packages/pull/35201 bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35201.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-complete-xbps-35201.patch --] [-- Type: text/x-diff, Size: 2233 bytes --] From 12dcdc7c4f957b97810616ec3caeb46882af99f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy> Date: Sun, 23 Jan 2022 11:50:34 -0300 Subject: [PATCH] bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 Fix checkdepends so tests run. --- .../patches/complete-xbps.patch | 24 +++++++++++++++++++ srcpkgs/bash-completion/template | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch diff --git a/srcpkgs/bash-completion/patches/complete-xbps.patch b/srcpkgs/bash-completion/patches/complete-xbps.patch new file mode 100644 index 000000000000..3e34ef1d78da --- /dev/null +++ b/srcpkgs/bash-completion/patches/complete-xbps.patch @@ -0,0 +1,24 @@ +Complete tar with .xbps files. + +Backported from upstream https://github.com/scop/bash-completion/pull/688 + +--- a/completions/tar ++++ b/completions/tar 2022-01-23 11:42:19.699734913 -0300 +@@ -422,7 +422,7 @@ + + __tar_detect_ext() + { +- local tars='@(@(tar|gem|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst))' ++ local tars='@(@(tar|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst)|gem|xbps)' + ext="$tars" + + case "$tar_mode_arg" in +@@ -430,7 +430,7 @@ + # Should never happen? + ;; + ?(-)*[cr]*f) +- ext='@(tar|gem|spkg)' ++ ext='@(tar|gem|spkg|xbps)' + case ${words[1]} in + *a*) ext="$tars" ;; + *z*) ext='t?(ar.)gz' ;; diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index 8f20e4e7acd7..a1d9d3123334 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,10 +1,11 @@ # Template file for 'bash-completion' pkgname=bash-completion version=2.11 -revision=2 +revision=3 build_style=gnu-configure make_install_args="profiledir=/etc/bash/bashrc.d" depends="bash" +checkdepends="python3-pytest python3-pexpect" short_desc="Programmable completion for the GNU Bash shell" maintainer="skmpz <dem.procopiou@gmail.com>" license="GPL-2.0-or-later"
[-- Attachment #1: Type: text/plain, Size: 2487 bytes --] New comment by tornaria on void-packages repository https://github.com/void-linux/void-packages/pull/35201#issuecomment-1019581536 Comment: Just FTR, the failed tests are exactly the same with or without the patch that this PR introduces: ``` =========================== short test summary info ============================ FAILED test_aclocal.py::TestAclocal::test_1 - assert <CompletionResult []> FAILED test_chsh.py::TestChsh::test_2 - assert <CompletionResult []> FAILED test_ether_wake.py::TestEtherWake::test_1 - assert <CompletionResult []> FAILED test_gdb.py::TestGdb::test_2 - AssertionError: assert <CompletionRe...... FAILED test_ifdown.py::TestIfdown::test_1 - assert <CompletionResult []> FAILED test_ifstat.py::TestIfstat::test_2 - assert <CompletionResult []> FAILED test_ifup.py::TestIfup::test_1 - assert <CompletionResult []> FAILED test_iperf.py::TestIperf::test_2 - assert <CompletionResult []> FAILED test_killall.py::TestKillall::test_1 - assert <CompletionResult []> FAILED test_nethogs.py::TestNethogs::test_1 - assert <CompletionResult []> FAILED test_perldoc.py::TestPerldoc::test_1 - AssertionError: assert 'Path' i... FAILED test_perldoc.py::TestPerldoc::test_3 - AssertionError: assert <Complet... FAILED test_pgrep.py::TestPgrep::test_1 - assert <CompletionResult []> FAILED test_pidof.py::TestPidof::test_1 - assert <CompletionResult []> FAILED test_pkill.py::TestPkill::test_1 - assert <CompletionResult []> FAILED test_pwdx.py::TestPwdx::test_1 - assert <CompletionResult []> FAILED test_renice.py::TestRenice::test_1 - assert <CompletionResult []> FAILED test_renice.py::TestRenice::test_2 - assert <CompletionResult []> FAILED test_reptyr.py::TestReptyr::test_1 - assert <CompletionResult []> FAILED test_service.py::TestService::test_1 - assert <CompletionResult []> FAILED test_tar.py::TestTar::test_4 - AssertionError: assert <CompletionResul... FAILED test_tar.py::TestTar::test_22 - AssertionError: assert <CompletionResu... FAILED unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_1 - Assertio... FAILED unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_2 - assert <... FAILED unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_3 - assert <... FAILED unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_4 - assert <... = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) = ``` I'd rather wait for the next upstream release to worry about tests passing.
[-- Attachment #1: Type: text/plain, Size: 368 bytes --] New comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35201#issuecomment-1019582881 Comment: > Just FTR, the failed tests are exactly the same with or without the patch that this PR introduces: > > I'd rather wait for the next upstream release to worry about tests passing. Let's disable them with a FIXME comment
[-- Attachment #1: Type: text/plain, Size: 1320 bytes --] There is an updated pull request by tornaria against master on the void-packages repository https://github.com/tornaria/void-packages complete-xbps https://github.com/void-linux/void-packages/pull/35201 bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35201.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-complete-xbps-35201.patch --] [-- Type: text/x-diff, Size: 2746 bytes --] From dc3236d767881e9e0aaeb8663e4012825c9c41a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy> Date: Sun, 23 Jan 2022 11:50:34 -0300 Subject: [PATCH] bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 Fix checkdepends so tests run, but ci-skip since 26 tests fail atm, with the goal of have check pass for next release 2.12. --- .../patches/complete-xbps.patch | 24 +++++++++++++++++++ srcpkgs/bash-completion/template | 7 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch diff --git a/srcpkgs/bash-completion/patches/complete-xbps.patch b/srcpkgs/bash-completion/patches/complete-xbps.patch new file mode 100644 index 000000000000..3e34ef1d78da --- /dev/null +++ b/srcpkgs/bash-completion/patches/complete-xbps.patch @@ -0,0 +1,24 @@ +Complete tar with .xbps files. + +Backported from upstream https://github.com/scop/bash-completion/pull/688 + +--- a/completions/tar ++++ b/completions/tar 2022-01-23 11:42:19.699734913 -0300 +@@ -422,7 +422,7 @@ + + __tar_detect_ext() + { +- local tars='@(@(tar|gem|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst))' ++ local tars='@(@(tar|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst)|gem|xbps)' + ext="$tars" + + case "$tar_mode_arg" in +@@ -430,7 +430,7 @@ + # Should never happen? + ;; + ?(-)*[cr]*f) +- ext='@(tar|gem|spkg)' ++ ext='@(tar|gem|spkg|xbps)' + case ${words[1]} in + *a*) ext="$tars" ;; + *z*) ext='t?(ar.)gz' ;; diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index 8f20e4e7acd7..ae3bc7517323 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,13 +1,18 @@ # Template file for 'bash-completion' pkgname=bash-completion version=2.11 -revision=2 +revision=3 build_style=gnu-configure make_install_args="profiledir=/etc/bash/bashrc.d" depends="bash" +checkdepends="python3-pytest python3-pexpect" short_desc="Programmable completion for the GNU Bash shell" maintainer="skmpz <dem.procopiou@gmail.com>" license="GPL-2.0-or-later" homepage="https://github.com/scop/bash-completion" distfiles="https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz" checksum=73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac + +# Summary of tests: = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) = +# Let's try to fix this for 2.12; see #35201 +make_check=ci-skip
[-- Attachment #1: Type: text/plain, Size: 300 bytes --] New comment by tornaria on void-packages repository https://github.com/void-linux/void-packages/pull/35201#issuecomment-1019586161 Comment: > Let's disable them with a FIXME comment With the idea of #34766 I would annotate this as `check_xfail="*"` so the checks run but the error is ignored.
[-- Attachment #1: Type: text/plain, Size: 426 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35201#discussion_r790344028 Comment: ```suggestion # Summary of tests: = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) = # FIXME: 26 tests fail, see #35201 ``` `FIXME` is a common string, so people can find things to fix in the repository with a simple command `git grep FIXME`
[-- Attachment #1: Type: text/plain, Size: 217 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35201#discussion_r790343702 Comment: some tests also fail locally for me ```suggestion make_check=no ```
[-- Attachment #1: Type: text/plain, Size: 1320 bytes --] There is an updated pull request by tornaria against master on the void-packages repository https://github.com/tornaria/void-packages complete-xbps https://github.com/void-linux/void-packages/pull/35201 bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35201.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-complete-xbps-35201.patch --] [-- Type: text/x-diff, Size: 3917 bytes --] From fda0c14bc2b4af804fc143ae8762ff8aeb4af250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy> Date: Sun, 23 Jan 2022 11:50:34 -0300 Subject: [PATCH] bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 Fix checkdepends so tests run, deselect 26 tests that fail atm, with the goal of fixing this for next release 2.12. --- .../patches/complete-xbps.patch | 24 +++++++++++ srcpkgs/bash-completion/template | 43 ++++++++++++++++++- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch diff --git a/srcpkgs/bash-completion/patches/complete-xbps.patch b/srcpkgs/bash-completion/patches/complete-xbps.patch new file mode 100644 index 000000000000..3e34ef1d78da --- /dev/null +++ b/srcpkgs/bash-completion/patches/complete-xbps.patch @@ -0,0 +1,24 @@ +Complete tar with .xbps files. + +Backported from upstream https://github.com/scop/bash-completion/pull/688 + +--- a/completions/tar ++++ b/completions/tar 2022-01-23 11:42:19.699734913 -0300 +@@ -422,7 +422,7 @@ + + __tar_detect_ext() + { +- local tars='@(@(tar|gem|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst))' ++ local tars='@(@(tar|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst)|gem|xbps)' + ext="$tars" + + case "$tar_mode_arg" in +@@ -430,7 +430,7 @@ + # Should never happen? + ;; + ?(-)*[cr]*f) +- ext='@(tar|gem|spkg)' ++ ext='@(tar|gem|spkg|xbps)' + case ${words[1]} in + *a*) ext="$tars" ;; + *z*) ext='t?(ar.)gz' ;; diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index 8f20e4e7acd7..177b17b4d74c 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,13 +1,54 @@ # Template file for 'bash-completion' pkgname=bash-completion version=2.11 -revision=2 +revision=3 build_style=gnu-configure make_install_args="profiledir=/etc/bash/bashrc.d" depends="bash" +checkdepends="python3-pytest python3-pexpect" short_desc="Programmable completion for the GNU Bash shell" maintainer="skmpz <dem.procopiou@gmail.com>" license="GPL-2.0-or-later" homepage="https://github.com/scop/bash-completion" distfiles="https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz" checksum=73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac + +# Summary of tests: +# = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) = + +# FIXME: 26 tests listed below fail, see #35201 +_test_deselect=" + test_aclocal.py::TestAclocal::test_1 + test_chsh.py::TestChsh::test_2 + test_ether_wake.py::TestEtherWake::test_1 + test_gdb.py::TestGdb::test_2 + test_ifdown.py::TestIfdown::test_1 + test_ifstat.py::TestIfstat::test_2 + test_ifup.py::TestIfup::test_1 + test_iperf.py::TestIperf::test_2 + test_killall.py::TestKillall::test_1 + test_nethogs.py::TestNethogs::test_1 + test_perldoc.py::TestPerldoc::test_1 + test_perldoc.py::TestPerldoc::test_3 + test_pgrep.py::TestPgrep::test_1 + test_pidof.py::TestPidof::test_1 + test_pkill.py::TestPkill::test_1 + test_pwdx.py::TestPwdx::test_1 + test_renice.py::TestRenice::test_1 + test_renice.py::TestRenice::test_2 + test_reptyr.py::TestReptyr::test_1 + test_service.py::TestService::test_1 + test_tar.py::TestTar::test_4 + test_tar.py::TestTar::test_22 + unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_1 + unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_2 + unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_3 + unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_4 + " + +pre_check() { + for t in $_test_deselect; do + PYTEST_ADDOPTS+=" --deselect=t/$t" + done + export PYTEST_ADDOPTS +}
[-- Attachment #1: Type: text/plain, Size: 197 bytes --] New review comment by tornaria on void-packages repository https://github.com/void-linux/void-packages/pull/35201#discussion_r790720683 Comment: Changed this by deselecting the 26 failing tests.
[-- Attachment #1: Type: text/plain, Size: 1320 bytes --] There is an updated pull request by tornaria against master on the void-packages repository https://github.com/tornaria/void-packages complete-xbps https://github.com/void-linux/void-packages/pull/35201 bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35201.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-complete-xbps-35201.patch --] [-- Type: text/x-diff, Size: 4276 bytes --] From 7c2d138f56aaea80625a11d2e88310f79e42a240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy> Date: Sun, 23 Jan 2022 11:50:34 -0300 Subject: [PATCH] bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 Fix checkdepends so tests run, deselect 26 tests that fail atm, with the goal of fixing this for next release 2.12. Also conditionally deselect a couple of tests that fail only on CI. --- .../patches/complete-xbps.patch | 24 +++++++++ srcpkgs/bash-completion/template | 51 ++++++++++++++++++- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch diff --git a/srcpkgs/bash-completion/patches/complete-xbps.patch b/srcpkgs/bash-completion/patches/complete-xbps.patch new file mode 100644 index 000000000000..3e34ef1d78da --- /dev/null +++ b/srcpkgs/bash-completion/patches/complete-xbps.patch @@ -0,0 +1,24 @@ +Complete tar with .xbps files. + +Backported from upstream https://github.com/scop/bash-completion/pull/688 + +--- a/completions/tar ++++ b/completions/tar 2022-01-23 11:42:19.699734913 -0300 +@@ -422,7 +422,7 @@ + + __tar_detect_ext() + { +- local tars='@(@(tar|gem|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst))' ++ local tars='@(@(tar|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst)|gem|xbps)' + ext="$tars" + + case "$tar_mode_arg" in +@@ -430,7 +430,7 @@ + # Should never happen? + ;; + ?(-)*[cr]*f) +- ext='@(tar|gem|spkg)' ++ ext='@(tar|gem|spkg|xbps)' + case ${words[1]} in + *a*) ext="$tars" ;; + *z*) ext='t?(ar.)gz' ;; diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index 8f20e4e7acd7..8908de525e82 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,13 +1,62 @@ # Template file for 'bash-completion' pkgname=bash-completion version=2.11 -revision=2 +revision=3 build_style=gnu-configure make_install_args="profiledir=/etc/bash/bashrc.d" depends="bash" +checkdepends="python3-pytest python3-pexpect" short_desc="Programmable completion for the GNU Bash shell" maintainer="skmpz <dem.procopiou@gmail.com>" license="GPL-2.0-or-later" homepage="https://github.com/scop/bash-completion" distfiles="https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz" checksum=73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac + +# Summary of tests: +# = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) = + +# FIXME: 26 tests listed below fail, see #35201 +_test_deselect=" + test_aclocal.py::TestAclocal::test_1 + test_chsh.py::TestChsh::test_2 + test_ether_wake.py::TestEtherWake::test_1 + test_gdb.py::TestGdb::test_2 + test_ifdown.py::TestIfdown::test_1 + test_ifstat.py::TestIfstat::test_2 + test_ifup.py::TestIfup::test_1 + test_iperf.py::TestIperf::test_2 + test_killall.py::TestKillall::test_1 + test_nethogs.py::TestNethogs::test_1 + test_perldoc.py::TestPerldoc::test_1 + test_perldoc.py::TestPerldoc::test_3 + test_pgrep.py::TestPgrep::test_1 + test_pidof.py::TestPidof::test_1 + test_pkill.py::TestPkill::test_1 + test_pwdx.py::TestPwdx::test_1 + test_renice.py::TestRenice::test_1 + test_renice.py::TestRenice::test_2 + test_reptyr.py::TestReptyr::test_1 + test_service.py::TestService::test_1 + test_tar.py::TestTar::test_4 + test_tar.py::TestTar::test_22 + unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_1 + unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_2 + unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_3 + unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_4 +" + +if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then + # these fail on CI because of some confusion with the homedir + _test_deselect+=" + unit/test_unit_expand.py::TestUnitExpand::test_user_home + unit/test_unit_expand_tilde_by_ref.py::TestUnitExpandTildeByRef::test_expand + " +fi + +pre_check() { + for t in $_test_deselect; do + PYTEST_ADDOPTS+=" --deselect=t/$t" + done + export PYTEST_ADDOPTS +}
[-- Attachment #1: Type: text/plain, Size: 193 bytes --] New comment by tornaria on void-packages repository https://github.com/void-linux/void-packages/pull/35201#issuecomment-1020660805 Comment: @paper42 should be ok now, both local and CI pass.
[-- Attachment #1: Type: text/plain, Size: 1156 bytes --] There's a merged pull request on the void-packages repository bash-completion: complete tar with xbps files https://github.com/void-linux/void-packages/pull/35201 Description: Backported from upstream https://github.com/scop/bash-completion/pull/688 <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl -->