Commit a6646074 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch... 


Merge remote-tracking branch 'remotes/famz/tags/build-and-test-automation-pull-request' into staging

# gpg: Signature made Fri 22 Sep 2017 08:28:38 BST
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/build-and-test-automation-pull-request: (36 commits)
  docker: Drop 'set -e' from run script
  docker: Use archive-source.py
  tests: Add README for vm tests
  MAINTAINERS: Add tests/vm entry
  Makefile: Add rules to run vm tests
  tests: Add OpenBSD image
  tests: Add NetBSD image
  tests: Add FreeBSD image
  tests: Add ubuntu.i386 image
  tests: Add vm test lib
  tests: Add a test key pair
  scripts: Add archive-source.sh
  qemu.py: Add "wait()" method
  gitignore: Ignore vm test images
  MAINTAINERS: Fix subsystem name for "Build and test automation"
  buildsys: Move rdma libs to per object
  buildsys: Move brlapi libs to per object
  buildsys: Move usb redir cflags/libs to per object
  buildsys: Move libusb cflags/libs to per object
  buildsys: Move libcacard cflags/libs to per object
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3aaa8d44 4f6afe41

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
/vscclient

/vhost-user-scsi

/fsdev/virtfs-proxy-helper

*.tmp

*.[1-9]

*.a

*.aux

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1896,6 +1896,7 @@ F: docs/block-replication.txt 


Build and test automation

-------------------------

Build and test automation

M: Alex Bennée <alex.bennee@linaro.org>

M: Fam Zheng <famz@redhat.com>

R: Philippe Mathieu-Daudé <f4bug@amsat.org>
@@ -1904,6 +1905,7 @@ S: Maintained 
F: .travis.yml

F: .shippable.yml

F: tests/docker/

F: tests/vm/

W: https://travis-ci.org/qemu/qemu

W: https://app.shippable.com/github/qemu/qemu

W: http://patchew.org/QEMU/

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -811,6 +811,7 @@ endif 
-include $(wildcard *.d tests/*.d)



include $(SRC_PATH)/tests/docker/Makefile.include

include $(SRC_PATH)/tests/vm/Makefile.include



.PHONY: help

help:
@@ -834,6 +835,7 @@ help: 
	@echo  'Test targets:'

	@echo  '  check           - Run all tests (check-help for details)'

	@echo  '  docker          - Help about targets running tests inside Docker containers'

	@echo  '  vm-test         - Help about targets running tests inside VM'

	@echo  ''

	@echo  'Documentation targets:'

	@echo  '  html info pdf txt'

audio/Makefile.objs

+6 −0
Original line number Diff line number Diff line
@@ -11,3 +11,9 @@ common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o 
common-obj-y += wavcapture.o



sdlaudio.o-cflags := $(SDL_CFLAGS)

sdlaudio.o-libs := $(SDL_LIBS)

alsaaudio.o-libs := $(ALSA_LIBS)

paaudio.o-libs := $(PULSE_LIBS)

coreaudio.o-libs := $(COREAUDIO_LIBS)

dsoundaudio.o-libs := $(DSOUND_LIBS)

ossaudio.o-libs := $(OSS_LIBS)

chardev/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -20,5 +20,6 @@ chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o 
common-obj-y += msmouse.o wctablet.o testdev.o

common-obj-$(CONFIG_BRLAPI) += baum.o

baum.o-cflags := $(SDL_CFLAGS)

baum.o-libs := $(BRLAPI_LIBS)



common-obj-$(CONFIG_SPICE) += spice.o