diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-50-DISSECT/test.sh | 1 | ||||
| -rwxr-xr-x | test/units/testsuite-50.mountnfsd.sh | 4 | ||||
| -rwxr-xr-x | test/units/testsuite-62.sh | 10 |
3 files changed, 5 insertions, 10 deletions
diff --git a/test/TEST-50-DISSECT/test.sh b/test/TEST-50-DISSECT/test.sh index b93697b73c..a0cd677f07 100755 --- a/test/TEST-50-DISSECT/test.sh +++ b/test/TEST-50-DISSECT/test.sh @@ -36,6 +36,7 @@ test_append_files() { fi inst_binary mksquashfs inst_binary unsquashfs + inst_binary pkcheck install_verity_minimal } diff --git a/test/units/testsuite-50.mountnfsd.sh b/test/units/testsuite-50.mountnfsd.sh index fea6b7d50b..59974e41e6 100755 --- a/test/units/testsuite-50.mountnfsd.sh +++ b/test/units/testsuite-50.mountnfsd.sh @@ -10,7 +10,9 @@ if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] || \ [[ ! -f /usr/lib/systemd/system/systemd-nsresourced.socket ]] || \ ! command -v mksquashfs || \ ! grep -q bpf /sys/kernel/security/lsm || - ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep .; then + ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep . || \ + systemd-analyze compare-versions "$(uname -r)" lt 6.5 || \ + systemd-analyze compare-versions "$(pkcheck --version | awk '{print $3}')" lt 124; then echo "Skipping mountnfsd/nsresourced tests" exit 0 fi diff --git a/test/units/testsuite-62.sh b/test/units/testsuite-62.sh index 84c92247b8..1fbb3cb1c2 100755 --- a/test/units/testsuite-62.sh +++ b/test/units/testsuite-62.sh @@ -34,15 +34,7 @@ teardown() { systemd-analyze log-level info } -KERNEL_VERSION="$(uname -r)" -KERNEL_MAJOR="${KERNEL_VERSION%%.*}" -KERNEL_MINOR="${KERNEL_VERSION#"$KERNEL_MAJOR".}" -KERNEL_MINOR="${KERNEL_MINOR%%.*}" - -MAJOR_REQUIRED=5 -MINOR_REQUIRED=7 - -if [[ "$KERNEL_MAJOR" -lt $MAJOR_REQUIRED || ("$KERNEL_MAJOR" -eq $MAJOR_REQUIRED && "$KERNEL_MINOR" -lt $MINOR_REQUIRED) ]]; then +if systemd-analyze compare-versions "$(uname -r)" lt 5.7; then echo "kernel is not 5.7+" >>/skipped exit 77 fi |