diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-12-05 17:29:42 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-12-05 17:31:10 +0100 |
| commit | 6578d89c170cc7b524b9bccafffd5b4207bf646f (patch) | |
| tree | 02ac2bde7655b7d7285294709a37944754c29261 | |
| parent | ef0051070f820dd5c83a73c0f069cfc4fb373db8 (diff) | |
| download | glibc-6578d89c170cc7b524b9bccafffd5b4207bf646f.tar.gz glibc-6578d89c170cc7b524b9bccafffd5b4207bf646f.tar.xz glibc-6578d89c170cc7b524b9bccafffd5b4207bf646f.zip | |
misc/test-errno-linux: Handle EINVAL from quotactl
In commit 3dd4d40b420846dd35869ccc8f8627feef2cff32 ("xfs: Sanity check
flags of Q_XQUOTARM call"), Linux 5.4 added checking for the flags
argument, causing the test to fail due to too restrictive test
expectations.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit 1f7525d924b608a3e43b10fcfb3d46b8a6e9e4f9)
| -rw-r--r-- | sysdeps/unix/sysv/linux/test-errno-linux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/test-errno-linux.c b/sysdeps/unix/sysv/linux/test-errno-linux.c index be1135351d..073e2fba64 100644 --- a/sysdeps/unix/sysv/linux/test-errno-linux.c +++ b/sysdeps/unix/sysv/linux/test-errno-linux.c @@ -160,8 +160,9 @@ do_test (void) fails |= test_wrp (EINVAL, poll, &pollfd, -1, 0); /* quotactl returns ENOSYS for kernels not configured with CONFIG_QUOTA, and may return EPERM if called within certain types - of containers. */ - fails |= test_wrp2 (LIST (ENODEV, ENOSYS, EPERM), + of containers. Linux 5.4 added additional argument validation + and can return EINVAL. */ + fails |= test_wrp2 (LIST (ENODEV, ENOSYS, EPERM, EINVAL), quotactl, Q_GETINFO, NULL, -1, (caddr_t) &dqblk); fails |= test_wrp (EINVAL, sched_getparam, -1, &sch_param); fails |= test_wrp (EINVAL, sched_getscheduler, -1); |