| Message ID | 20200909094617.1582-20-luoyonggang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | W32, W64 msys2/mingw patches | expand |
On Wed, Sep 09, 2020 at 05:46:15PM +0800, Yonggang Luo wrote: > 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 | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tests/test-io-channel-file.c b/tests/test-io-channel-file.c > index bac2b07562..75aea6450a 100644 > --- a/tests/test-io-channel-file.c > +++ b/tests/test-io-channel-file.c > @@ -56,7 +56,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 & 0700); I think we will want the stronger check on non-Win32, so better to ifdef this to use 0700 only on Win32. Regards, Daniel
diff --git a/tests/test-io-channel-file.c b/tests/test-io-channel-file.c index bac2b07562..75aea6450a 100644 --- a/tests/test-io-channel-file.c +++ b/tests/test-io-channel-file.c @@ -56,7 +56,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 & 0700); unlink(TEST_FILE); object_unref(OBJECT(src));
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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)