diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-05 11:16:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-05 11:16:30 +0100 |
| commit | fbe400d246cdcdae8d1f64f8be55111dbe4160fd (patch) | |
| tree | 70dd78dc44ab8168ff2db4331c7e3038bd9e9db3 | |
| parent | 676e844d56ccbd0937c27db7a3a06ffe271def3f (diff) | |
| parent | 4a93f78ed086d6f0bceb3f0b281009e6026935b7 (diff) | |
| download | qemu-fbe400d246cdcdae8d1f64f8be55111dbe4160fd.zip | |
Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging
# gpg: Signature made Fri 05 Aug 2016 09:58:50 BST
# gpg: using RSA key 0xCA35624C6A9171C6
# 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/docker-pull-request:
docker: Add "--enable-werror" to configure command line
docker: Be compatible with older docker
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | tests/docker/Makefile.include | 5 | ||||
| -rwxr-xr-x | tests/docker/common.rc | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 78af46837b..4f4707dae0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -107,9 +107,8 @@ docker-run-%: docker-qemu-src fi $(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \ $(call quiet-command,\ - if $(SRC_PATH)/tests/docker/docker.py images \ - --format={{.Repository}}:{{.Tag}} | \ - grep -qx qemu:$(IMAGE); then \ + if $(SRC_PATH)/tests/docker/docker.py images | \ + awk '$$1=="qemu" && $$2=="$(IMAGE)"{found=1} END{exit(!found)}'; then \ $(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \ -t \ $(if $(DEBUG),-i,--net=none) \ diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 77069e1285..0c6d8d5ece 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -24,6 +24,7 @@ requires() build_qemu() { $QEMU_SRC/configure \ + --enable-werror \ ${TARGET_LIST:+"--target-list=${TARGET_LIST}"} \ --prefix="$PWD/install" \ $EXTRA_CONFIGURE_OPTS \ |