Skip to content

Commit 647e616

Browse files
authored
Merge pull request #7163 from cakebaker/gnu_patches_fix_ls_no_cap
gnu patches: adapt `tests_ls_no_cap.patch` to GNU `coreutils 9.6`
2 parents d39dcad + 98af681 commit 647e616

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

util/gnu-patches/tests_ls_no_cap.patch

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
diff --git a/tests/ls/no-cap.sh b/tests/ls/no-cap.sh
2-
index 3d84c74ff..d1f60e70a 100755
2+
index 99f0563bc..f7b9e7885 100755
33
--- a/tests/ls/no-cap.sh
44
+++ b/tests/ls/no-cap.sh
5-
@@ -21,13 +21,13 @@ print_ver_ ls
6-
require_strace_ capget
5+
@@ -27,11 +27,11 @@ setcap 'cap_net_bind_service=ep' file ||
6+
skip_ "setcap doesn't work"
77

88
LS_COLORS=ca=1; export LS_COLORS
99
-strace -e capget ls --color=always > /dev/null 2> out || fail=1
1010
-$EGREP 'capget\(' out || skip_ "your ls doesn't call capget"
1111
+strace -e llistxattr ls --color=always > /dev/null 2> out || fail=1
1212
+$EGREP 'llistxattr\(' out || skip_ "your ls doesn't call llistxattr"
1313

14-
rm -f out
15-
1614
LS_COLORS=ca=:; export LS_COLORS
1715
-strace -e capget ls --color=always > /dev/null 2> out || fail=1
1816
-$EGREP 'capget\(' out && fail=1

0 commit comments

Comments
 (0)