| Message ID | 20200912224431.1428-21-luoyonggang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | W32, W64 msys2/mingw patches | expand |
On 9/13/20 12:44 AM, 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 | 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. */ This comment would be better located in [*]. > + g_assert_cmpuint(TEST_MASK & ~mask, ==, st.st_mode & TEST_MASK_EXPECT); > > unlink(TEST_FILE); > object_unref(OBJECT(src)); >
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));
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(-)