diff options
| author | Paolo Bonzini | 2022-04-19 11:10:14 +0200 |
|---|---|---|
| committer | Alex Bennée | 2022-04-20 17:04:20 +0200 |
| commit | 77162849a6313083d493171826978ff58a53240a (patch) | |
| tree | ba0780ccd70964342c65a9fe2b8118e7152104fa /tests/docker/Makefile.include | |
| parent | tests/tcg: isolate from QEMU's config-host.mak (diff) | |
| download | qemu-77162849a6313083d493171826978ff58a53240a.tar.gz qemu-77162849a6313083d493171826978ff58a53240a.tar.xz qemu-77162849a6313083d493171826978ff58a53240a.zip | |
tests/docker: remove SKIP_DOCKER_BUILD
It is now unused.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220401141326.1244422-17-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220419091020.3008144-20-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/Makefile.include')
| -rw-r--r-- | tests/docker/Makefile.include | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index eb100c294f..ca2157db46 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -33,15 +33,7 @@ $(DOCKER_SRC_COPY): docker-qemu-src: $(DOCKER_SRC_COPY) -# General rule for building docker images. If we are a sub-make -# invoked with SKIP_DOCKER_BUILD we still check the image is up to date -# though -ifdef SKIP_DOCKER_BUILD -docker-image-%: $(DOCKER_FILES_DIR)/%.docker - $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu/$* $<, \ - "CHECK", "$*") -else +# General rule for building docker images. docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ $(DOCKER_SCRIPT) build -t qemu/$* -f $< \ @@ -77,8 +69,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) -endif - # Enforce dependencies for composite images # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES := debian10 debian11 |