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

Merge remote-tracking branch 'remotes/famz/tags/pull-docker-20160601' into staging 



v2: Fix warning due to include.
    Various temp dir/file changes.
    Don't use "find -executable" to be compatible with Mac.

# gpg: Signature made Wed 01 Jun 2016 10:30:33 BST using RSA key ID 6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/pull-docker-20160601:
  .gitignore: Ignore docker source copy
  MAINTAINERS: Add tests/docker
  docker: Add EXTRA_CONFIGURE_OPTS
  docs: Add text for tests/docker in build-system.txt
  docker: Add travis tool
  docker: Add mingw test
  docker: Add clang test
  docker: Add full test
  docker: Add quick test
  docker: Add common.rc
  docker: Add test runner
  docker: Add images
  Makefile: Rules for docker testing
  Makefile: Always include rules.mak
  rules.mak: Add "COMMA" constant
  tests: Add utilities for docker testing

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 500acc9c 0bc7a6f3

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -108,4 +108,5 @@ 
cscope.*

tags

TAGS

docker-src.*

*~

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1615,3 +1615,10 @@ Build system architecture 
M: Daniel P. Berrange <berrange@redhat.com>

S: Odd Fixes

F: docs/build-system.txt



Docker testing

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

Docker based testing framework and cases

M: Fam Zheng <famz@redhat.com>

S: Maintained

F: tests/docker/

Makefile

+5 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ BUILD_DIR=$(CURDIR) 
# Before including a proper config-host.mak, assume we are in the source tree

SRC_PATH=.



UNCHECKED_GOALS := %clean TAGS cscope ctags

UNCHECKED_GOALS := %clean TAGS cscope ctags docker docker-%



# All following code might depend on configuration variables

ifneq ($(wildcard config-host.mak),)
@@ -30,7 +30,6 @@ CONFIG_ALL=y 
-include config-all-devices.mak

-include config-all-disas.mak



include $(SRC_PATH)/rules.mak

config-host.mak: $(SRC_PATH)/configure

	@echo $@ is out-of-date, running configure

	@# TODO: The next lines include code which supports a smooth
@@ -49,6 +48,8 @@ ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fa 
endif

endif



include $(SRC_PATH)/rules.mak



GENERATED_HEADERS = config-host.h qemu-options.def

GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h

GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c
@@ -643,3 +644,5 @@ endif 
# Include automatically generated dependency files

# Dependencies in Makefile.objs files come from our recursive subdir rules

-include $(wildcard *.d tests/*.d)



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

docs/build-system.txt

+5 −0
Original line number Diff line number Diff line
@@ -438,6 +438,11 @@ top level Makefile, so anything defined in this file will influence the 
entire build system. Care needs to be taken when writing rules for tests

to ensure they only apply to the unit test execution / build.



- tests/docker/Makefile.include



Rules for Docker tests. Like tests/Makefile, this file is included

directly by the top level Makefile, anything defined in this file will

influence the entire build system.



- po/Makefile

rules.mak

+2 −0
Original line number Diff line number Diff line 


COMMA := ,



# Don't use implicit rules or variables

# we have explicit rules for everything

MAKEFLAGS += -rR