morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

tests: drop pointless redirection of stderr from 'command -v'

Browse Source 
The whole point of using 'command -v' is that it's a very portable
way to check if an executable exists. It doesn't print an error.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-09-05 08:07:24 +02:00
parent 51fac9a0bf
commit e1485c0546
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/units/TEST-21-DFUZZER.sh
View File

@@ -4,7 +4,7 @@ set -eux
set -o pipefail
# check dfuzzer is present before testing
if ! command -v dfuzzer &>/dev/null; then
if ! command -v dfuzzer >/dev/null; then
echo "dfuzzer is not installed, skipping" | tee --append /skipped
exit 77
fi

2
test/units/TEST-46-HOMED.sh
View File

@@ -537,7 +537,7 @@ for opt in json multiplexer output synthesize with-dropin with-nss with-varlink;
done
# FIXME: sshd seems to crash inside asan currently, skip the actual ssh test hence
if command -v ssh &>/dev/null && command -v sshd &>/dev/null && ! [[ -v ASAN_OPTIONS ]]; then
if command -v ssh >/dev/null && command -v sshd >/dev/null && ! [[ -v ASAN_OPTIONS ]]; then
at_exit() {
set +e

2
test/units/TEST-50-DISSECT.DDI.sh
View File

@@ -9,7 +9,7 @@ mount -t ddi "$MINIMAL_IMAGE.gpt" "$dir" -o ro,X-mount.mkdir,discard
umount -R "$dir"
# Test systemd-repart --make-ddi=:
if [[ -z "${OPENSSL_CONFIG:?}" ]] || ! command -v mksquashfs &>/dev/null; then
if [[ -z "${OPENSSL_CONFIG:?}" ]] || ! command -v mksquashfs >/dev/null; then
echo "Skipping --make-ddi= tests"
exit 0
fi

6
test/units/TEST-74-AUX-UTILS.ssh.sh
View File

@@ -3,7 +3,7 @@
set -eux
set -o pipefail
if ! command -v ssh &> /dev/null || ! command -v sshd &> /dev/null ; then
if ! command -v ssh >/dev/null || ! command -v sshd >/dev/null ; then
echo "ssh/sshd not found, skipping test." >&2
exit 0
fi
@@ -58,11 +58,11 @@ ssh -o StrictHostKeyChecking=no -v -i "$ROOTID" .host cat /etc/machine-id | cmp
ssh -o StrictHostKeyChecking=no -v -i "$ROOTID" unix/run/ssh-unix-local/socket cat /etc/machine-id | cmp - /etc/machine-id
ssh -o StrictHostKeyChecking=no -v -i "$ROOTID" machine/.host cat /etc/machine-id | cmp - /etc/machine-id
modprobe vsock_loopback ||:
modprobe vsock_loopback || :
if test -e /dev/vsock -a -d /sys/module/vsock_loopback ; then
ssh -o StrictHostKeyChecking=no -v -i "$ROOTID" vsock/1 cat /etc/machine-id | cmp - /etc/machine-id
if ! command -v scp &> /dev/null ; then
if ! command -v scp >/dev/null ; then
echo "scp not found, skipping subtest" >&2
else
OUT_FILE=$(mktemp -u)