qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 1f04fa: iotests: Drop readlink -f


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 1f04fa: iotests: Drop readlink -f
Date: Thu, 17 Sep 2020 07:00:34 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1f04fa3e002e28b96277bf3f09265a4221cdb39b
      
https://github.com/qemu/qemu/commit/1f04fa3e002e28b96277bf3f09265a4221cdb39b
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/qemu-iotests/check

  Log Message:
  -----------
  iotests: Drop readlink -f

On macOS, (out of the box) readlink does not have -f.  We do not really
need readlink here, though, it was just a replacement for realpath
(which is not available on our BSD test systems), which we needed to
make the $(dirname) into an absolute path.

Instead of using either, just use "cd; pwd" like is done for
$source_iotests.

Fixes: b1cbc33a3971b6bb005d5ac3569feae35a71de0f
       ("iotests: Allow running from different directory")
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reported-by: Claudio Fontana <cfontana@suse.de>
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200914145606.94620-1-mreitz@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: d287961f25672d94a38dfdd03d1daa7e3d343c3c
      
https://github.com/qemu/qemu/commit/d287961f25672d94a38dfdd03d1daa7e3d343c3c
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/qtest/fuzz/fuzz.c

  Log Message:
  -----------
  fuzz: Change the way we write qtest log to stderr

Telling QTest to log to /dev/fd/2, essentially results in dup(2). This
is fine, if other code isn't logging to stderr. Otherwise, the order of
the logs is mixed due to buffering issues, since two file-descriptors
are used to write to the same file. We can avoid this, since just
specifying "-qtest" sets the log fd to stderr. If we want to disable
qtest logs, we can just add -qtest-log none.

Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20200819061110.1320568-2-alxndr@bu.edu>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: d97b4b0d0c2313c567e88ef492f132d3e0c8df8f
      
https://github.com/qemu/qemu/commit/d97b4b0d0c2313c567e88ef492f132d3e0c8df8f
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/qtest/qmp-cmd-test.c

  Log Message:
  -----------
  tests/qtest/qmp-cmd-test: Use inclusive language

We simply want to ignore certain queries here, so let's rather
use the term 'ignore' to express this intention.

Message-Id: <20200914163755.42618-1-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: b822c05b812a39940f78e4d020852d134d49dc99
      
https://github.com/qemu/qemu/commit/b822c05b812a39940f78e4d020852d134d49dc99
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/socket-helpers.c

  Log Message:
  -----------
  tests/socket-helpers: Treat EAI_NONAME as EADDRNOTAVAIL

The tests/test-char test is currently always failing on my system since
the getaddrinfo() in socket_can_bind_connect() returns EAI_NONAME when
it is called from socket_check_protocol_support() to check for IPv6.
socket_check_protocol_support() then returns -1 and thus the tests are
not run at all - even though IPv4 is working fine.
socket_can_bind_connect() connect should return EADDRNOTAVAIL in this
case instead, so that socket_check_protocol_support() does not fail.

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200908121543.222872-1-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 0e72b7df4d552f9da33d3559fd84febd86455a99
      
https://github.com/qemu/qemu/commit/0e72b7df4d552f9da33d3559fd84febd86455a99
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Simplify the .gitignore file

Now that we always do out-of-tree builds (and the in-tree builds are
faked via a "build" directory), we can simplify out .gitignore file
quite a bit.

Message-Id: <20200909080305.258961-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 37d98abdc77cfbd158b453d22629e5c7d020c878
      
https://github.com/qemu/qemu/commit/37d98abdc77cfbd158b453d22629e5c7d020c878
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga/commands-win32: Fix problem with redundant protype declaration

When compiling QEMU with MSYS2 on Windows, there is currently the
following error:

../qga/commands-win32.c:62:24: error: redundant redeclaration of
 'CM_Get_DevNode_PropertyW' [-Werror=redundant-decls]
   62 | CMAPI CONFIGRET WINAPI CM_Get_DevNode_PropertyW(
      |                        ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../qga/commands-win32.c:26:
C:/tools/msys64/mingw64/x86_64-w64-mingw32/include/cfgmgr32.h:840:26: note:
 previous declaration of 'CM_Get_DevNode_PropertyW' was here
  840 |   CMAPI CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dnDevInst,
   const DEVPROPKEY *PropertyKey, DEVPROPTYPE *PropertyType, PBYTE 
PropertyBuffer,
   PULONG PropertyBufferSize, ULONG ulFlags);

Seems like this protype is sometimes available in the cfgmgr32.h
header, and sometimes not. Let's silence the compiler warning here
to let the build pass with -Werror, too.

Message-Id: <20200915114757.55635-1-thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: d816614ca4f5af89a2b6d50ac840d7b77973f2fc
      
https://github.com/qemu/qemu/commit/d816614ca4f5af89a2b6d50ac840d7b77973f2fc
  Author: Maxim Levitsky <mlevitsk@redhat.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M include/qemu/rcu.h
    M util/rcu.c

  Log Message:
  -----------
  rcu: Implement drain_call_rcu

This will allow is to preserve the semantics of hmp_device_del,
that the device is deleted immediatly which was changed by previos
patch that delayed this to RCU callback

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Suggested-by: Stefan Hajnoczi <stefanha@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20200915121318.247-2-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 4ed79a1bfb82be118da4014bde007acaaa7a7e7a
      
https://github.com/qemu/qemu/commit/4ed79a1bfb82be118da4014bde007acaaa7a7e7a
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/test-logging.c

  Log Message:
  -----------
  tests: Convert g_free to g_autofree macro in test-logging.c

g_autofree are prefer than g_free when possible.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-17-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 760064efe1f0c4c62cd4a5c3aa793c7b37280089
      
https://github.com/qemu/qemu/commit/760064efe1f0c4c62cd4a5c3aa793c7b37280089
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/test-logging.c

  Log Message:
  -----------
  rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full

drain_call_rcu is necessary on win32, because under win32, if you
don't close the file before remove it, the remove would be fail.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200915121318.247-23-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 2d89880003b5324596e44d4743d14a3be70e392d
      
https://github.com/qemu/qemu/commit/2d89880003b5324596e44d4743d14a3be70e392d
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/meson.build

  Log Message:
  -----------
  meson: Disable test-char on msys2/mingw for fixing tests stuck

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200907200432.2418-3-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 00650e6e46931a7d4d6b3c5bf36bc3bfdcb9b0db
      
https://github.com/qemu/qemu/commit/00650e6e46931a7d4d6b3c5bf36bc3bfdcb9b0db
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/meson.build

  Log Message:
  -----------
  meson: disable crypto tests are empty under win32

Disable following tests on msys2/mingw
      'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 
'pkix_asn1_tab.c',
                                   tasn1, crypto],
      'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 
'pkix_asn1_tab.c', 'crypto-tls-psk-helpers.c',
                                 tasn1, crypto],
      'test-io-channel-tls': ['io-channel-helpers.c', 
'crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c',
                              tasn1, io, crypto]}
These tests are failure with:
ERROR test-crypto-tlscredsx509 - missing test plan
ERROR test-crypto-tlssession - missing test plan
ERROR test-io-channel-tls - missing test plan

Because on win32 those test case are all disabled.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200909094617.1582-12-luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: dce93184b52278983ed9b8db80bd65e18a45356b
      
https://github.com/qemu/qemu/commit/dce93184b52278983ed9b8db80bd65e18a45356b
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/test-replication.c

  Log Message:
  -----------
  tests: Fixes test-replication.c on msys2/mingw.

On Windows there is no path like /tmp/s_local_disk.XXXXXX
Use g_get_tmp_dir instead of /tmp.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-8-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 09d631dbf81b5fb27459af218d8f093e51b94270
      
https://github.com/qemu/qemu/commit/09d631dbf81b5fb27459af218d8f093e51b94270
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/test-replication.c

  Log Message:
  -----------
  tests: test-replication disable /replication/secondary/* on msys2/mingw.

They caused failure on msys2/mingw, that's because file-win32.c not implement
.bdrv_reopen_prepare/commit/abort yet.

This is the error message:
> $ ./tests/test-replication.exe
> # random seed: R02S3f4d1c01af2b0a046990e0235c481faf
> 1..13
> # Start of replication tests
> # Start of primary tests
> ok 1 /replication/primary/read
> ok 2 /replication/primary/write
> ok 3 /replication/primary/start
> ok 4 /replication/primary/stop
> ok 5 /replication/primary/do_checkpoint
> ok 6 /replication/primary/get_error_all
> # End of primary tests
> # Start of secondary tests
> ok 7 /replication/secondary/read
> ok 8 /replication/secondary/write
> Unexpected error in bdrv_reopen_prepare() at ../block.c:4191:
> Block format 'file' used by node '#block4287' does not support reopening
> files

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-9-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 6333da0f0762ac02bac7dc2823f81ded8fceaaeb
      
https://github.com/qemu/qemu/commit/6333da0f0762ac02bac7dc2823f81ded8fceaaeb
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M include/qemu/osdep.h

  Log Message:
  -----------
  osdep: file locking functions are not available on Win32

Do not declare the following locking functions on Win32:
int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive);
int qemu_unlock_fd(int fd, int64_t start, int64_t len);
int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive);
bool qemu_has_ofd_lock(void);

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-10-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: a84258e1f9702f1f6782bda06e97bf65632ccbb1
      
https://github.com/qemu/qemu/commit/a84258e1f9702f1f6782bda06e97bf65632ccbb1
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/qapi-schema/meson.build

  Log Message:
  -----------
  meson: Use -b to ignore CR vs. CR-LF issues on Windows

Ideally we would use the '--strip-trailing-cr' option, but not
being POSIX is a portability problem (i.e. BSDs and Solaris
based OSes). Instead use the '-b' option which, although doing
slightly more, produce the expected result on Windows."

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-11-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: e0d3d8015f858f4d8d2a846d5909f57b709bf2b5
      
https://github.com/qemu/qemu/commit/e0d3d8015f858f4d8d2a846d5909f57b709bf2b5
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: remove empty else and duplicated gio deps

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-14-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 96c64746bf5154fdce3011391362fdcddfe1aa37
      
https://github.com/qemu/qemu/commit/96c64746bf5154fdce3011391362fdcddfe1aa37
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/test-vmstate.c

  Log Message:
  -----------
  vmstate: Fixes test-vmstate.c on msys2/mingw

The vmstate are valid on win32, just need generate tmp path properly

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200910103059.987-17-luoyonggang@gmail.com>
[thuth: Make indentation a little bit nicer]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: dd65e4ad22805392924a9b2ebbe07c4260cae67c
      
https://github.com/qemu/qemu/commit/dd65e4ad22805392924a9b2ebbe07c4260cae67c
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/test-io-channel-socket.c

  Log Message:
  -----------
  tests: Fixes test-io-channel-socket.c tests under msys2/mingw

Currently test-io-channel-socket doesn't init with
qemu_init_main_loop
and that's cause the qemu_aio_context not inited,
and the following is the stack when null pointer accessed:

qemu_fd_register (c:\work\xemu\qemu\util\main-loop.c:336)
qemu_try_set_nonblock (c:\work\xemu\qemu\util\oslib-win32.c:224)
qemu_set_nonblock (c:\work\xemu\qemu\util\oslib-win32.c:230)
socket_can_bind_connect (c:\work\xemu\qemu\tests\socket-helpers.c:93)
socket_check_protocol_support (c:\work\xemu\qemu\tests\socket-helpers.c:141)
main (c:\work\xemu\qemu\tests\test-io-channel-socket.c:568)
__tmainCRTStartup (@__tmainCRTStartup:142)
mainCRTStartup (@1400014f6..140001539:3)
BaseThreadInitThunk (@BaseThreadInitThunk:9)
RtlUserThreadStart (@RtlUserThreadStart:12)

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-18-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: da0652c043c8014ed194a99a7989cc4b0093707e
      
https://github.com/qemu/qemu/commit/da0652c043c8014ed194a99a7989cc4b0093707e
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M util/aio-win32.c

  Log Message:
  -----------
  tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with 
aio-posix.c

This is a fixes for
(C:\work\xemu\qemu\build\tests\test-aio-multithread.exe:19100): GLib-CRITICAL 
**: 23:03:24.965: g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)' 
failed
ERROR test-aio-multithread - Bail out! GLib-FATAL-CRITICAL: 
g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)' failed

(C:\work\xemu\qemu\build\tests\test-bdrv-drain.exe:21036): GLib-CRITICAL **: 
23:03:29.861: g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)' 
failed
ERROR test-bdrv-drain - Bail out! GLib-FATAL-CRITICAL: g_source_remove_poll: 
assertion '!SOURCE_DESTROYED (source)' failed

And the idea comes from https://patchwork.kernel.org/patch/9975239/

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200915171234.236-19-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: a92a783d263ea956d4b45035e224e73852916b7d
      
https://github.com/qemu/qemu/commit/a92a783d263ea956d4b45035e224e73852916b7d
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/test-io-channel-file.c

  Log Message:
  -----------
  tests: Fixes test-io-channel-file by mask only owner file state mask bits

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>


  Commit: 8330bd536c809e3c9a07ce9e0de92a4a6509045e
      
https://github.com/qemu/qemu/commit/8330bd536c809e3c9a07ce9e0de92a4a6509045e
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/test-util-sockets.c

  Log Message:
  -----------
  tests: fix test-util-sockets.c

Fixes following errors:
Running test test-util-sockets
ERROR test-util-sockets - missing test plan

# Start of name tests
**
ERROR:../tests/test-util-sockets.c:93:test_socket_fd_pass_name_good: assertion 
failed (fd != -1): (-1 != -1)
Bail out! ERROR:../tests/test-util-sockets.c:93:test_socket_fd_pass_name_good: 
assertion failed (fd != -1): (-1 != -1)

First should call to qemu_init_main_loop before socket_init,
then on win32 doesn't support for SOCKET_ADDRESS_TYPE_FD socket type

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-21-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 61d9282cdc50b9e161ebdf6efebfc1ba10d92178
      
https://github.com/qemu/qemu/commit/61d9282cdc50b9e161ebdf6efebfc1ba10d92178
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M tests/test-qdev-global-props.c

  Log Message:
  -----------
  tests: Fixes test-qdev-global-props.c

On win32 the line ending are \r\n, so we skip the \n in function 
test_dynamic_globalprop

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915171234.236-22-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: b1788880ba564a8593143dd61d6463b48628d29b
      
https://github.com/qemu/qemu/commit/b1788880ba564a8593143dd61d6463b48628d29b
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M .cirrus.yml

  Log Message:
  -----------
  ci: Enable msys2 ci in cirrus

Install msys2 in a proper way refer to:
 https://github.com/cirruslabs/cirrus-ci-docs/issues/699
The https://wiki.qemu.org/Hosts/W32#Native_builds_with_MSYS2 need to be updated.
There is no need of --cross-prefix, open mingw64.exe instead of msys2.exe then
we don't need the --cross-prefix, besides we use environment variable settings:
    MSYS: winsymlinks:nativestrict
    MSYSTEM: MINGW64
    CHERE_INVOKING: 1
to opening mingw64 native shell.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-25-luoyonggang@gmail.com>
[thuth: Add --target-list-exclude to speed it up a little bit, and
        add capstone package to avoid build failure with internal capstone]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 114daec31d64600e5a070abcdb8de2cf74d01e94
      
https://github.com/qemu/qemu/commit/114daec31d64600e5a070abcdb8de2cf74d01e94
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-16 (Wed, 16 Sep 2020)

  Changed paths:
    M .cirrus.yml

  Log Message:
  -----------
  cirrus: Building freebsd in a single shot

This reverts commit 45f7b7b9f38f5c4d1529a37c93dedfc26a231bba
("cirrus.yml: Split FreeBSD job into two parts").

freebsd 1 hour limit not hit anymore

I think we going to a wrong direction, I think there is some tests a stall the 
test runner,
please look at
https://cirrus-ci.com/task/5110577531977728
When its running properly, the consumed time are little, but when tests running 
too long,
look at the cpu usage, the cpu usage are nearly zero. doesn't consuming time.

And look at
https://cirrus-ci.com/task/6119341601062912

If the tests running properly, the time consuming are little
We should not hide the error by split them

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Ed Maste <emaste@FreeBSD.org>
Message-Id: <20200915121318.247-16-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 5e0a8fda65fc88e76bc50dc5467e143d89566dfa
      
https://github.com/qemu/qemu/commit/5e0a8fda65fc88e76bc50dc5467e143d89566dfa
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M .cirrus.yml
    M .gitignore
    M include/qemu/osdep.h
    M include/qemu/rcu.h
    M meson.build
    M qga/commands-win32.c
    M tests/meson.build
    M tests/qapi-schema/meson.build
    M tests/qemu-iotests/check
    M tests/qtest/fuzz/fuzz.c
    M tests/qtest/qmp-cmd-test.c
    M tests/socket-helpers.c
    M tests/test-io-channel-file.c
    M tests/test-io-channel-socket.c
    M tests/test-logging.c
    M tests/test-qdev-global-props.c
    M tests/test-replication.c
    M tests/test-util-sockets.c
    M tests/test-vmstate.c
    M util/aio-win32.c
    M util/rcu.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/huth-gitlab/tags/pull-request-2020-09-16' into staging

* Fix "readlink -f" problem in iotests on macOS (to fix the Cirrus-CI tests)
* Some minor qtest improvements
* Fix the unit tests to work on MSYS2, too
* Enable building and testing on MSYS2 in the Cirrus-CI
* Build FreeBSD with one task again in the Cirrus-CI

# gpg: Signature made Wed 16 Sep 2020 12:24:29 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2020-09-16: (24 commits)
  cirrus: Building freebsd in a single shot
  ci: Enable msys2 ci in cirrus
  tests: Fixes test-qdev-global-props.c
  tests: fix test-util-sockets.c
  tests: Fixes test-io-channel-file by mask only owner file state mask bits
  tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with 
aio-posix.c
  tests: Fixes test-io-channel-socket.c tests under msys2/mingw
  vmstate: Fixes test-vmstate.c on msys2/mingw
  meson: remove empty else and duplicated gio deps
  meson: Use -b to ignore CR vs. CR-LF issues on Windows
  osdep: file locking functions are not available on Win32
  tests: test-replication disable /replication/secondary/* on msys2/mingw.
  tests: Fixes test-replication.c on msys2/mingw.
  meson: disable crypto tests are empty under win32
  meson: Disable test-char on msys2/mingw for fixing tests stuck
  rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full
  tests: Convert g_free to g_autofree macro in test-logging.c
  rcu: Implement drain_call_rcu
  qga/commands-win32: Fix problem with redundant protype declaration
  Simplify the .gitignore file
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/525009d04fa4...5e0a8fda65fc



reply via email to

[Prev in Thread] Current Thread [Next in Thread]