From 84319c5c07e7283f31930c799dfd948d251d9b73 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 9 Jan 2021 16:32:55 +0100 Subject: [PATCH] test-xattr-util: don't insist that /usr supports xattrs (apparently overlayfs has issues with xattrs, hence don't require that /usr supports xattrs) --- src/test/test-xattr-util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c index f93aca68f0..6aa55ba17e 100644 --- a/src/test/test-xattr-util.c +++ b/src/test/test-xattr-util.c @@ -28,7 +28,7 @@ static void test_fgetxattrat_fake(void) { assert_se(touch(x) >= 0); r = setxattr(x, "user.foo", "bar", 3, 0); - if (r < 0 && errno == EOPNOTSUPP) /* no xattrs supported on /var/tmp... */ + if (r < 0 && ERRNO_IS_NOT_SUPPORTED(errno)) /* no xattrs supported on /var/tmp... */ goto cleanup; assert_se(r >= 0); @@ -42,7 +42,8 @@ static void test_fgetxattrat_fake(void) { safe_close(fd); fd = open("/", O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_NOCTTY); assert_se(fd >= 0); - assert_se(fgetxattrat_fake(fd, "usr", "user.idontexist", v, 3, 0, &size) == -ENODATA); + r = fgetxattrat_fake(fd, "usr", "user.idontexist", v, 3, 0, &size); + assert_se(r == -ENODATA || ERRNO_IS_NOT_SUPPORTED(r)); cleanup: assert_se(unlink(x) >= 0);