diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-02 13:42:52 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-02 13:42:52 +0100 |
| commit | cbd614870fce00f46088be7054a7bf5eadcc77ac (patch) | |
| tree | f9ce32fe04033bef86096cee1e6619344a53486d /docs | |
| parent | 500acc9c410bcea17148a1072e323c08d12e6a6b (diff) | |
| parent | 0bc7a6f3079af7b96e863c6eedef37a86abe1e24 (diff) | |
| download | qemu-cbd614870fce00f46088be7054a7bf5eadcc77ac.zip qemu-cbd614870fce00f46088be7054a7bf5eadcc77ac.tar.gz qemu-cbd614870fce00f46088be7054a7bf5eadcc77ac.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/build-system.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/build-system.txt b/docs/build-system.txt index 5ddddea..2af1e66 100644 --- a/docs/build-system.txt +++ b/docs/build-system.txt @@ -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 |