mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-27 11:07:44 +00:00
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`
This commit is contained in:
commit
647e6164c8
1 changed files with 3 additions and 5 deletions
|
@ -1,9 +1,9 @@
|
||||||
diff --git a/tests/ls/no-cap.sh b/tests/ls/no-cap.sh
|
diff --git a/tests/ls/no-cap.sh b/tests/ls/no-cap.sh
|
||||||
index 3d84c74ff..d1f60e70a 100755
|
index 99f0563bc..f7b9e7885 100755
|
||||||
--- a/tests/ls/no-cap.sh
|
--- a/tests/ls/no-cap.sh
|
||||||
+++ b/tests/ls/no-cap.sh
|
+++ b/tests/ls/no-cap.sh
|
||||||
@@ -21,13 +21,13 @@ print_ver_ ls
|
@@ -27,11 +27,11 @@ setcap 'cap_net_bind_service=ep' file ||
|
||||||
require_strace_ capget
|
skip_ "setcap doesn't work"
|
||||||
|
|
||||||
LS_COLORS=ca=1; export LS_COLORS
|
LS_COLORS=ca=1; export LS_COLORS
|
||||||
-strace -e capget ls --color=always > /dev/null 2> out || fail=1
|
-strace -e capget ls --color=always > /dev/null 2> out || fail=1
|
||||||
|
@ -11,8 +11,6 @@ index 3d84c74ff..d1f60e70a 100755
|
||||||
+strace -e llistxattr ls --color=always > /dev/null 2> out || fail=1
|
+strace -e llistxattr ls --color=always > /dev/null 2> out || fail=1
|
||||||
+$EGREP 'llistxattr\(' out || skip_ "your ls doesn't call llistxattr"
|
+$EGREP 'llistxattr\(' out || skip_ "your ls doesn't call llistxattr"
|
||||||
|
|
||||||
rm -f out
|
|
||||||
|
|
||||||
LS_COLORS=ca=:; export LS_COLORS
|
LS_COLORS=ca=:; export LS_COLORS
|
||||||
-strace -e capget ls --color=always > /dev/null 2> out || fail=1
|
-strace -e capget ls --color=always > /dev/null 2> out || fail=1
|
||||||
-$EGREP 'capget\(' out && fail=1
|
-$EGREP 'capget\(' out && fail=1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue