[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 20/24] tests: Fixes test-io-channel-file by mask only owner fi
From: |
Yonggang Luo |
Subject: |
[PATCH v4 20/24] tests: Fixes test-io-channel-file by mask only owner file state mask bits |
Date: |
Thu, 10 Sep 2020 00:14:28 +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>
---
tests/test-io-channel-file.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/tests/test-io-channel-file.c b/tests/test-io-channel-file.c
index bac2b07562..1b0e8d7c1b 100644
--- a/tests/test-io-channel-file.c
+++ b/tests/test-io-channel-file.c
@@ -28,6 +28,12 @@
#define TEST_FILE "tests/test-io-channel-file.txt"
#define TEST_MASK 0600
+#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 +62,9 @@ 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);
+ /* 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. */
+ 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 v4 00/24] W32, W64 msys2/mingw patches, Yonggang Luo, 2020/09/09
- [PATCH v4 01/24] file-win32: Fix "locking" option, Yonggang Luo, 2020/09/09
- [PATCH v4 02/24] rcu: Implement drain_call_rcu, Yonggang Luo, 2020/09/09
- [PATCH v4 04/24] ci: fixes msys2 build by upgrading capstone to 4.0.2, Yonggang Luo, 2020/09/09
- [PATCH v4 05/24] configure: Fixes ncursesw detection under msys2/mingw and enable curses, Yonggang Luo, 2020/09/09
- [PATCH v4 06/24] win32: Simplify gmtime_r detection direct base on _POSIX_THREAD_SAFE_FUNCTIONS., Yonggang Luo, 2020/09/09
- [PATCH v4 15/24] vmstate: Fixes test-vmstate.c on msys2/mingw, Yonggang Luo, 2020/09/09
- [PATCH v4 16/24] cirrus: Building freebsd in a single short, Yonggang Luo, 2020/09/09
- [PATCH v4 20/24] tests: Fixes test-io-channel-file by mask only owner file state mask bits,
Yonggang Luo <=
- [PATCH v4 23/24] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full, Yonggang Luo, 2020/09/09
- [PATCH v4 24/24] ci: Enable msys2 ci in cirrus, Yonggang Luo, 2020/09/09