Commit cff54773 authored by Alex Bennée's avatar Alex Bennée
Browse files

tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1 



As we now ensure all the images we are going to use are built in the
top level make file lets not over complicate things by running the
full script again. We do run the check script just in case someone
deletes the docker image while we are running.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent f97da1f7

tests/Makefile.include

+6 −2
Original line number Diff line number Diff line
@@ -947,10 +947,14 @@ $(foreach PROBE_TARGET,$(TARGET_LIST), \ 
endif



build-tcg-tests-%:

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" guest-tests,)

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" \

		SKIP_DOCKER_BUILD=1 TARGET_DIR="$*/" guest-tests, \

		"BUILD", "TCG tests for $*")



run-tcg-tests-%: % build-tcg-tests-%

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" run-guest-tests,)

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" \

		SKIP_DOCKER_BUILD=1 TARGET_DIR="$*/" run-guest-tests, \

		"RUN", "TCG tests for $*")



clean-tcg-tests-%:

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" clean-guest-tests,)

tests/docker/Makefile.include

+12 −1
Original line number Diff line number Diff line
@@ -34,7 +34,15 @@ docker-qemu-src: $(DOCKER_SRC_COPY) 


docker-image: ${DOCKER_TARGETS}



# General rule for building docker images

# General rule for building docker images. If we are a sub-make

# invoked with SKIP_DOCKER_BUILD we still check the image is upto date

# though

ifdef SKIP_DOCKER_BUILD

docker-image-%: $(DOCKER_FILES_DIR)/%.docker

	$(call quiet-command, \

		$(DOCKER_SCRIPT) check --quiet qemu:$* $<, \

		"CHECK", "$*")

else

docker-image-%: $(DOCKER_FILES_DIR)/%.docker

	@if test "$@" = docker-image-debian-bootstrap -a -z "$(EXECUTABLE)"; then \

		echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1 ; \
@@ -46,6 +54,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker 
		$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\

		$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\

		"BUILD","$*")

endif



# Enforce dependencies for composite images

docker-image-debian: docker-image-debian9
@@ -65,7 +74,9 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe 
# Debian SID images - we are tracking a rolling distro so we want to

# force a re-build of the base image if we ever need to build one of

# its children.

ifndef SKIP_DOCKER_BUILD

docker-image-debian-sid: NOCACHE=1

endif



docker-image-debian-alpha-cross: docker-image-debian-sid

docker-image-debian-hppa-cross: docker-image-debian-sid