summaryrefslogtreecommitdiffstats
path: root/tests/util.sh
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2023-10-20 15:52:45 -0400
committerTavian Barnes <tavianator@tavianator.com>2023-10-20 15:52:45 -0400
commit60366e4583a1d148dd5f8171c9148ebb98890478 (patch)
treef0ab64b754339b6c20b2c17b5a1798e44009391f /tests/util.sh
parent962d715ce2dee7a017dacca3b787ade6d33cd1c6 (diff)
downloadbfs-60366e4583a1d148dd5f8171c9148ebb98890478.tar.xz
tests/color: Remove some useless cats
Diffstat (limited to 'tests/util.sh')
-rw-r--r--tests/util.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/util.sh b/tests/util.sh
index efc24b0..31a7b6c 100644
--- a/tests/util.sh
+++ b/tests/util.sh
@@ -76,14 +76,14 @@ drop_root() {
if command -v capsh &>/dev/null; then
if capsh --has-p=cap_dac_override &>/dev/null || capsh --has-p=cap_dac_read_search &>/dev/null; then
if [ -n "${BFS_TRIED_DROP:-}" ]; then
- color >&2 <<EOF
+ color cat >&2 <<EOF
${RED}error:${RST} Failed to drop capabilities.
EOF
exit 1
fi
- color >&2 <<EOF
+ color cat >&2 <<EOF
${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended. Dropping ${BLD}cap_dac_override${RST} and
${BLD}cap_dac_read_search${RST}.
@@ -100,7 +100,7 @@ EOF
UNLESS=" unless ${GRN}capsh${RST} is installed"
fi
- color >&2 <<EOF
+ color cat >&2 <<EOF
${RED}error:${RST} These tests expect filesystem permissions to be enforced, and therefore
will not work when run as ${BLD}$(id -un)${RST}${UNLESS}.
EOF
@@ -122,7 +122,7 @@ callers() {
debug() {
local file="${1/#*\/tests\//tests\/}"
set -- "$file" "${@:2}"
- cprintf "${BLD}%s:%d:${RST} %s\n %s\n" "$@"
+ color printf "${BLD}%s:%d:${RST} %s\n %s\n" "$@"
}
## Deferred cleanup