[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 10/11] 9p: darwin: Adjust assumption on virtio-9p-test
From: |
Will Cohen |
Subject: |
[PATCH v7 10/11] 9p: darwin: Adjust assumption on virtio-9p-test |
Date: |
Tue, 15 Feb 2022 14:04:25 -0500 |
The previous test depended on the assumption that P9_DOTL_AT_REMOVEDIR
and AT_REMOVEDIR have the same value.
While this is true on Linux, it is not true everywhere, and leads to an
incorrect test failure on unlink_at, noticed when adding 9p to darwin:
Received response 7 (RLERROR) instead of 77 (RUNLINKAT)
Rlerror has errno 22 (Invalid argument)
**
ERROR:../tests/qtest/virtio-9p-test.c:305:v9fs_req_recv: assertion
failed (hdr.id == id): (7 == 77) Bail out!
ERROR:../tests/qtest/virtio-9p-test.c:305:v9fs_req_recv: assertion
failed (hdr.id == id): (7 == 77)
Signed-off-by: Fabian Franz <fabianfranz.oss@gmail.com>
[Will Cohen: - Add explanation of patch and description
of pre-patch test failure]
Signed-off-by: Will Cohen <wwcohen@gmail.com>
Acked-by: Thomas Huth <thuth@redhat.com>
[Will Cohen: - Move this patch before 9p: darwin: meson
patch to avoid qtest breakage during
bisecting]
Signed-off-by: Will Cohen <wwcohen@gmail.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
---
tests/qtest/virtio-9p-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index 41fed41de1..6bcf89f0f8 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -1270,7 +1270,7 @@ static void fs_unlinkat_dir(void *obj, void *data,
QGuestAllocator *t_alloc)
/* ... and is actually a directory */
g_assert((st.st_mode & S_IFMT) == S_IFDIR);
- do_unlinkat(v9p, "/", "02", AT_REMOVEDIR);
+ do_unlinkat(v9p, "/", "02", P9_DOTL_AT_REMOVEDIR);
/* directory should be gone now */
g_assert(stat(new_dir, &st) != 0);
--
2.34.1
- [PATCH v7 00/11] 9p: Add support for darwin, Will Cohen, 2022/02/15
- [PATCH v7 01/11] 9p: linux: Fix a couple Linux assumptions, Will Cohen, 2022/02/15
- [PATCH v7 02/11] 9p: Rename 9p-util -> 9p-util-linux, Will Cohen, 2022/02/15
- [PATCH v7 03/11] 9p: darwin: Handle struct stat(fs) differences, Will Cohen, 2022/02/15
- [PATCH v7 04/11] 9p: darwin: Handle struct dirent differences, Will Cohen, 2022/02/15
- [PATCH v7 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT}, Will Cohen, 2022/02/15
- [PATCH v7 06/11] 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX, Will Cohen, 2022/02/15
- [PATCH v7 07/11] 9p: darwin: *xattr_nofollow implementations, Will Cohen, 2022/02/15
- [PATCH v7 08/11] 9p: darwin: Compatibility for f/l*xattr, Will Cohen, 2022/02/15
- [PATCH v7 09/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2022/02/15
- [PATCH v7 10/11] 9p: darwin: Adjust assumption on virtio-9p-test,
Will Cohen <=
- [PATCH v7 11/11] 9p: darwin: meson: Allow VirtFS on Darwin, Will Cohen, 2022/02/15
- Re: [PATCH v7 00/11] 9p: Add support for darwin, Will Cohen, 2022/02/18