qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Yonggang Luo <luoyonggang@gmail.com>
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	[thread overview]
Message-ID: <20200916114731.102080-21-thuth@redhat.com> (raw)
In-Reply-To: <20200916114731.102080-1-thuth@redhat.com>

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



  parent reply	other threads:[~2020-09-16 12:01 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-16 11:47 [PULL 00/24] qtests, unit tests and Cirrus-CI fixes / improvements Thomas Huth
2020-09-16 11:47 ` [PULL 01/24] iotests: Drop readlink -f Thomas Huth
2020-09-16 11:47 ` [PULL 02/24] fuzz: Change the way we write qtest log to stderr Thomas Huth
2020-09-16 11:47 ` [PULL 03/24] tests/qtest/qmp-cmd-test: Use inclusive language Thomas Huth
2020-09-16 11:47 ` [PULL 04/24] tests/socket-helpers: Treat EAI_NONAME as EADDRNOTAVAIL Thomas Huth
2020-09-16 11:47 ` [PULL 05/24] Simplify the .gitignore file Thomas Huth
2020-09-18 17:33   ` Peter Maydell
2020-09-19 10:12     ` Thomas Huth
2020-09-16 11:47 ` [PULL 06/24] qga/commands-win32: Fix problem with redundant protype declaration Thomas Huth
2020-09-16 11:47 ` [PULL 07/24] rcu: Implement drain_call_rcu Thomas Huth
2020-09-16 11:47 ` [PULL 08/24] tests: Convert g_free to g_autofree macro in test-logging.c Thomas Huth
2020-09-16 11:47 ` [PULL 09/24] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full Thomas Huth
2020-09-16 11:47 ` [PULL 10/24] meson: Disable test-char on msys2/mingw for fixing tests stuck Thomas Huth
2020-09-16 11:47 ` [PULL 11/24] meson: disable crypto tests are empty under win32 Thomas Huth
2020-09-16 11:47 ` [PULL 12/24] tests: Fixes test-replication.c on msys2/mingw Thomas Huth
2020-09-16 11:47 ` [PULL 13/24] tests: test-replication disable /replication/secondary/* " Thomas Huth
2020-09-16 11:47 ` [PULL 14/24] osdep: file locking functions are not available on Win32 Thomas Huth
2020-09-16 11:47 ` [PULL 15/24] meson: Use -b to ignore CR vs. CR-LF issues on Windows Thomas Huth
2020-09-16 11:47 ` [PULL 16/24] meson: remove empty else and duplicated gio deps Thomas Huth
2020-09-16 11:47 ` [PULL 17/24] vmstate: Fixes test-vmstate.c on msys2/mingw Thomas Huth
2020-09-16 11:47 ` [PULL 18/24] tests: Fixes test-io-channel-socket.c tests under msys2/mingw Thomas Huth
2020-09-16 11:47 ` [PULL 19/24] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c Thomas Huth
2020-09-16 11:47 ` Thomas Huth [this message]
2020-09-16 11:47 ` [PULL 21/24] tests: fix test-util-sockets.c Thomas Huth
2020-09-16 11:47 ` [PULL 22/24] tests: Fixes test-qdev-global-props.c Thomas Huth
2020-09-16 11:47 ` [PULL 23/24] ci: Enable msys2 ci in cirrus Thomas Huth
2020-09-16 11:47 ` [PULL 24/24] cirrus: Building freebsd in a single shot Thomas Huth
2020-09-17 13:46 ` [PULL 00/24] qtests, unit tests and Cirrus-CI fixes / improvements Peter Maydell
2020-09-17 14:40   ` 罗勇刚(Yonggang Luo)
2020-09-17 15:12     ` Thomas Huth
2020-09-17 15:14 ` Peter Maydell
2020-09-17 15:28   ` Thomas Huth
2020-09-17 15:30     ` Peter Maydell
2020-09-18 11:32       ` Thomas Huth
2020-09-17 16:33     ` 罗勇刚(Yonggang Luo)
2020-09-17 16:40       ` Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200916114731.102080-21-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=luoyonggang@gmail.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).