From 96100139fc9c05c0ad2236a240783543f0778b85 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Thu, 3 Oct 2024 12:32:45 +0100
Subject: [PATCH] tests: ls: don't always skip a capability test

* tests/ls/no-cap.sh: Move to being a root only test, since
commit v9.5-132-g2a6bed933 we now need to call setcap
to make the test effective.  Otherwise we would have always
just skipped the test.
---
 tests/local.mk     | 2 +-
 tests/ls/no-cap.sh | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/local.mk b/tests/local.mk
index 2b885798a9..3223b58aa7 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -124,6 +124,7 @@ all_root_tests =				\
   tests/id/setgid.sh				\
   tests/install/install-C-root.sh		\
   tests/ls/capability.sh			\
+  tests/ls/no-cap.sh				\
   tests/ls/nameless-uid.sh			\
   tests/chcon/chcon.sh				\
   tests/chroot/chroot-credentials.sh		\
@@ -638,7 +639,6 @@ all_tests =					\
   tests/ls/w-option.sh				\
   tests/ls/multihardlink.sh			\
   tests/ls/no-arg.sh				\
-  tests/ls/no-cap.sh				\
   tests/ls/selinux-segfault.sh			\
   tests/ls/quote-align.sh			\
   tests/ls/size-align.sh			\
diff --git a/tests/ls/no-cap.sh b/tests/ls/no-cap.sh
index 3d84c74ff3..7707421fa4 100755
--- a/tests/ls/no-cap.sh
+++ b/tests/ls/no-cap.sh
@@ -19,13 +19,17 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ ls
 require_strace_ capget
+require_root_
+
+touch file || framework_failure_
+
+setcap 'cap_net_bind_service=ep' file ||
+  skip_ "setcap doesn't work"
 
 LS_COLORS=ca=1; export LS_COLORS
 strace -e capget ls --color=always > /dev/null 2> out || fail=1
 $EGREP 'capget\(' out || skip_ "your ls doesn't call capget"
 
-rm -f out
-
 LS_COLORS=ca=:; export LS_COLORS
 strace -e capget ls --color=always > /dev/null 2> out || fail=1
 $EGREP 'capget\(' out && fail=1
-- 
2.47.2