[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 19/26] tests: Fixes test-io-channel-file by mask only owner f
From: |
Yonggang Luo |
Subject: |
[PATCH v10 19/26] tests: Fixes test-io-channel-file by mask only owner file state mask bits |
Date: |
Wed, 16 Sep 2020 01:12:27 +0800 |
This is the error on msys2/mingw
Running test test-io-channel-file
**
ERROR:../tests/test-io-channel-file.c:59:test_io_channel_file_helper: assertion
failed (TEST_MASK & ~mask == st.st_mode & 0777): (384 == 438)
ERROR test-io-channel-file - Bail out!
ERROR:../tests/test-io-channel-file.c:59:test_io_channel_file_helper: assertion
failed (TEST_MASK & ~mask == st.st_mode & 0777): (384 == 438)
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/test-io-channel-file.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/tests/test-io-channel-file.c b/tests/test-io-channel-file.c
index bac2b07562..0aa0477541 100644
--- a/tests/test-io-channel-file.c
+++ b/tests/test-io-channel-file.c
@@ -28,6 +28,16 @@
#define TEST_FILE "tests/test-io-channel-file.txt"
#define TEST_MASK 0600
+/*
+ * On Windows the stat() function in the C library checks only
+ * the FAT-style READONLY attribute and does not look at the ACL at all.
+ */
+#ifdef _WIN32
+#define TEST_MASK_EXPECT 0700
+#else
+#define TEST_MASK_EXPECT 0777
+#endif
+
static void test_io_channel_file_helper(int flags)
{
QIOChannel *src, *dst;
@@ -56,7 +66,7 @@ static void test_io_channel_file_helper(int flags)
umask(mask);
ret = stat(TEST_FILE, &st);
g_assert_cmpint(ret, >, -1);
- g_assert_cmpuint(TEST_MASK & ~mask, ==, st.st_mode & 0777);
+ g_assert_cmpuint(TEST_MASK & ~mask, ==, st.st_mode & TEST_MASK_EXPECT);
unlink(TEST_FILE);
object_unref(OBJECT(src));
--
2.28.0.windows.1
- [PATCH v10 09/26] osdep: file locking functions are not available on Win32, (continued)
- [PATCH v10 09/26] osdep: file locking functions are not available on Win32, Yonggang Luo, 2020/09/15
- [PATCH v10 16/26] tests: Convert g_free to g_autofree macro in test-logging.c, Yonggang Luo, 2020/09/15
- [PATCH v10 03/26] configure: Fixes ncursesw detection under msys2/mingw and enable curses, Yonggang Luo, 2020/09/15
- [PATCH v10 04/26] win32: Simplify gmtime_r detection direct base on _POSIX_THREAD_SAFE_FUNCTIONS., Yonggang Luo, 2020/09/15
- [PATCH v10 01/26] rcu: Implement drain_call_rcu, Yonggang Luo, 2020/09/15
- [PATCH v10 05/26] curses: Fixes curses compiling errors., Yonggang Luo, 2020/09/15
- [PATCH v10 20/26] tests: fix test-util-sockets.c, Yonggang Luo, 2020/09/15
- [PATCH v10 17/26] tests: Fixes test-io-channel-socket.c tests under msys2/mingw, Yonggang Luo, 2020/09/15
- [PATCH v10 18/26] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c, Yonggang Luo, 2020/09/15
- [PATCH v10 21/26] tests: Fixes test-qdev-global-props.c, Yonggang Luo, 2020/09/15
- [PATCH v10 19/26] tests: Fixes test-io-channel-file by mask only owner file state mask bits,
Yonggang Luo <=
- [PATCH v10 22/26] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full, Yonggang Luo, 2020/09/15
- [PATCH v10 23/26] meson: upgrade meson for execute custom ninjatool under msys2 properly, Yonggang Luo, 2020/09/15
- [PATCH v10 24/26] ci: Enable msys2 ci in cirrus, Yonggang Luo, 2020/09/15
- [PATCH v10 25/26] block: Fixes nfs compiling error on msys2/mingw, Yonggang Luo, 2020/09/15
- [PATCH v10 26/26] block: enable libnfs on msys2/mingw in cirrus.yml, Yonggang Luo, 2020/09/15
- Re: [PATCH v10 00/26] W32, W64 msys2/mingw patches, Thomas Huth, 2020/09/16