[PATCH] tests: Fixes building test-util-filemonitor.c on msys2/mingw

[PATCH] tests: Fixes building test-util-filemonitor.c on msys2/mingw

[Yonggang Luo]

Fixes the following compiling error:
../tests/test-util-filemonitor.c: In function 'test_file_monitor_events':
../tests/test-util-filemonitor.c:620:17: error: too many arguments to function 'mkdir'
  620 |             if (mkdir(pathsrc, 0700) < 0) {
      |                 ^~~~~
In file included from C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/unistd.h:10,
                 from C:/work/xemu/qemu/include/qemu/osdep.h:93,
                 from ../tests/test-util-filemonitor.c:21:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/io.h:282:15: note: declared here
  282 |   int __cdecl mkdir (const char *) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
      |               ^~~~~

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 tests/test-util-filemonitor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/test-util-filemonitor.c b/tests/test-util-filemonitor.c
index 8f0eff3d03..b629e10857 100644
--- a/tests/test-util-filemonitor.c
+++ b/tests/test-util-filemonitor.c
@@ -23,6 +23,8 @@
 #include "qapi/error.h"
 #include "qemu/filemonitor.h"
 
+#include <glib/gstdio.h>
+
 #include <utime.h>
 
 enum {
@@ -617,7 +619,7 @@ test_file_monitor_events(void)
             if (debug) {
                 g_printerr("Mkdir %s\n", pathsrc);
             }
-            if (mkdir(pathsrc, 0700) < 0) {
+            if (g_mkdir_with_parents(pathsrc, 0700) < 0) {
                 g_printerr("Unable to mkdir %s: %s",
                            pathsrc, strerror(errno));
                 goto cleanup;
-- 
2.28.0.windows.1

Re: [PATCH] tests: Fixes building test-util-filemonitor.c on msys2/mingw

[Richard Henderson]

On 9/5/20 1:34 PM, Yonggang Luo wrote:
> Fixes the following compiling error:
> ../tests/test-util-filemonitor.c: In function 'test_file_monitor_events':
> ../tests/test-util-filemonitor.c:620:17: error: too many arguments to function 'mkdir'
>   620 |             if (mkdir(pathsrc, 0700) < 0) {
>       |                 ^~~~~
> In file included from C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/unistd.h:10,
>                  from C:/work/xemu/qemu/include/qemu/osdep.h:93,
>                  from ../tests/test-util-filemonitor.c:21:
> C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/io.h:282:15: note: declared here
>   282 |   int __cdecl mkdir (const char *) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
>       |               ^~~~~
> 
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  tests/test-util-filemonitor.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH] tests: Fixes building test-util-filemonitor.c on msys2/mingw

[Daniel P. Berrangé]

On Sun, Sep 06, 2020 at 04:34:25AM +0800, Yonggang Luo wrote:
> Fixes the following compiling error:
> ../tests/test-util-filemonitor.c: In function 'test_file_monitor_events':
> ../tests/test-util-filemonitor.c:620:17: error: too many arguments to function 'mkdir'
>   620 |             if (mkdir(pathsrc, 0700) < 0) {
>       |                 ^~~~~
> In file included from C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/unistd.h:10,
>                  from C:/work/xemu/qemu/include/qemu/osdep.h:93,
>                  from ../tests/test-util-filemonitor.c:21:
> C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/io.h:282:15: note: declared here
>   282 |   int __cdecl mkdir (const char *) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
>       |               ^~~~~
> 
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  tests/test-util-filemonitor.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|