diff --git a/tests/mv/sticky-to-xpart.sh b/tests/mv/sticky-to-xpart.sh index a1f777c33..4c9a67f02 100755 --- a/tests/mv/sticky-to-xpart.sh +++ b/tests/mv/sticky-to-xpart.sh @@ -59,10 +59,19 @@ chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ onp='Operation not permitted' sed "s/Not owner/$onp/;s/Permission denied/$onp/" out-t > out -cat <<\EOF > exp -mv: cannot remove 't/root-owned': Operation not permitted +# On some systems (OpenBSD 7.5), the initial rename fails with EPERM, +# which is arguably better than the Linux kernel's EXDEV. +cat <exp1 || framework_failure_ +mv: cannot move 't/root-owned' to '$other_partition_tmpdir/root-owned': $onp EOF -compare exp out || fail=1 +compare exp1 out >/dev/null || { + + cat <exp || framework_failure_ +mv: cannot remove 't/root-owned': $onp +EOF + + compare exp out || fail=1 +} Exit $fail