[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/24] tests: Fixes test-io-channel-file by mask only owner file s
From: |
Thomas Huth |
Subject: |
[PULL 20/24] tests: Fixes test-io-channel-file by mask only owner file state mask bits |
Date: |
Wed, 16 Sep 2020 13:47:27 +0200 |
From: Yonggang Luo <luoyonggang@gmail.com>
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>
Message-Id: <20200915171234.236-20-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@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.18.2
- [PULL 09/24] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full, (continued)
- [PULL 09/24] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full, Thomas Huth, 2020/09/16
- [PULL 11/24] meson: disable crypto tests are empty under win32, Thomas Huth, 2020/09/16
- [PULL 12/24] tests: Fixes test-replication.c on msys2/mingw., Thomas Huth, 2020/09/16
- [PULL 14/24] osdep: file locking functions are not available on Win32, Thomas Huth, 2020/09/16
- [PULL 15/24] meson: Use -b to ignore CR vs. CR-LF issues on Windows, Thomas Huth, 2020/09/16
- [PULL 13/24] tests: test-replication disable /replication/secondary/* on msys2/mingw., Thomas Huth, 2020/09/16
- [PULL 16/24] meson: remove empty else and duplicated gio deps, Thomas Huth, 2020/09/16
- [PULL 17/24] vmstate: Fixes test-vmstate.c on msys2/mingw, Thomas Huth, 2020/09/16
- [PULL 19/24] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c, Thomas Huth, 2020/09/16
- [PULL 18/24] tests: Fixes test-io-channel-socket.c tests under msys2/mingw, Thomas Huth, 2020/09/16
- [PULL 20/24] tests: Fixes test-io-channel-file by mask only owner file state mask bits,
Thomas Huth <=
- [PULL 22/24] tests: Fixes test-qdev-global-props.c, Thomas Huth, 2020/09/16
- [PULL 21/24] tests: fix test-util-sockets.c, Thomas Huth, 2020/09/16
- [PULL 23/24] ci: Enable msys2 ci in cirrus, Thomas Huth, 2020/09/16
- [PULL 24/24] cirrus: Building freebsd in a single shot, Thomas Huth, 2020/09/16
- Re: [PULL 00/24] qtests, unit tests and Cirrus-CI fixes / improvements, Peter Maydell, 2020/09/17
- Re: [PULL 00/24] qtests, unit tests and Cirrus-CI fixes / improvements, Peter Maydell, 2020/09/17