Commit 234afe78 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-03-08' into staging 



- qtest fixes
- Some generic clean-ups by Philippe
- macOS CI testing via cirrus-ci.com

# gpg: Signature made Fri 08 Mar 2019 08:58:47 GMT
# gpg:                using RSA key 2ED9D774FE702DB5
# 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-2019-03-08:
  cirrus.yml: Add macOS continuous integration task
  tests/bios-tables: Improve portability by searching bash in the $PATH
  vhost-user-test: fix leaks
  tests: Do not use "\n" in g_test_message() strings
  hw/devices: Remove unused TC6393XB_RAM definition
  hw: Remove unused 'hw/devices.h' include
  tests: Move qdict-test-data.txt to tests/data/qobject/

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

# Conflicts:
#	tests/vhost-user-test.c
parents 62cfabb5 4966c5bd

.cirrus.yml

+13 −2
Original line number Diff line number Diff line 
env:

  CIRRUS_CLONE_DEPTH: 1



freebsd_12_task:

  freebsd_instance:

    image: freebsd-12-0-release-amd64

    cpu: 8

    memory: 8G

  env:

    CIRRUS_CLONE_DEPTH: 1

  install_script: pkg install -y

    bison curl cyrus-sasl git glib gmake gnutls

    nettle perl5 pixman pkgconf png usbredir
@@ -14,3 +15,13 @@ freebsd_12_task: 
    - ../configure || { cat config.log; exit 1; }

    - gmake -j8

    - gmake -j8 V=1 check



macos_task:

  osx_instance:

    image: mojave-base

  install_script:

    - brew install pkg-config python glib pixman make sdl2

  script:

    - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }

    - gmake -j$(sysctl -n hw.ncpu)

    - gmake check -j$(sysctl -n hw.ncpu)

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1965,7 +1965,7 @@ F: tests/check-qnull.c 
F: tests/check-qnum.c

F: tests/check-qobject.c

F: tests/check-qstring.c

F: qdict-test-data.txt

F: tests/data/qobject/qdict.txt

T: git https://repo.or.cz/qemu/armbru.git qapi-next



QEMU Guest Agent

configure

+1 −1
Original line number Diff line number Diff line
@@ -7737,7 +7737,7 @@ DIRS="$DIRS tests/fp tests/qgraph" 
DIRS="$DIRS docs docs/interop fsdev scsi"

DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"

DIRS="$DIRS roms/seabios roms/vgabios"

LINKS="Makefile tests/tcg/Makefile qdict-test-data.txt"

LINKS="Makefile tests/tcg/Makefile"

LINKS="$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"

LINKS="$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile"

LINKS="$LINKS tests/fp/Makefile"

hw/alpha/typhoon.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include "qapi/error.h"

#include "cpu.h"

#include "hw/hw.h"

#include "hw/devices.h"

#include "sysemu/sysemu.h"

#include "alpha_sys.h"

#include "exec/address-spaces.h"

hw/arm/allwinner-a10.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include "qemu-common.h"

#include "cpu.h"

#include "hw/sysbus.h"

#include "hw/devices.h"

#include "hw/arm/allwinner-a10.h"

#include "hw/misc/unimp.h"