From patchwork Fri Jun 15 19:47:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 138811 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1289849lji; Fri, 15 Jun 2018 13:34:40 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKOxo74VyGDq/30XsV3e2YOfUrLKmkk9g5EcJSygteloPNAJKKU+7O0nwu9lylTrP+yVId6 X-Received: by 2002:a37:2b66:: with SMTP id r99-v6mr2794938qkh.286.1529094880664; Fri, 15 Jun 2018 13:34:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529094880; cv=none; d=google.com; s=arc-20160816; b=a58hDglg+nfgYlZTdUqe5Z/VVrjAeV1xD62u4Nw39BFcxlpVcwKfTEYxUz+5b9z994 RbsuzzjG+rCXfA2H1+GdCkcqh77R6jwTphfCBUpI8Jgi1B3uNTc8lQ77blxWt0Rlk4dz c89T612aF+KIRUdtuxTM265q7W+6P/SSRbUu+8lfAS0dj7dDNY1BFshcQ8KOyEUA9p8k V8ShXhflDloU1JYqSr3em6FegsXMnBfFyBe1Y9vXUf0kGt/2eVYLy7Bst9+1p+LnH4ky OVNogWrW+Pywl+Ng/UkGTWzkznHD/y2MFrqD4Yle/xrjjMNFOcqONIn6qkVSykXrUn6c 5SCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=bSAB/pZYyx+rDoBfi2/5llk1/I1vzy+OOyIbDcC2TEQ=; b=qfyeGCzMWJ5U13Lks0XeaaItYJFYINbusbXu/opnRDICFSQNKcMrloTOhtfPc4BKKB /jMC1WmxyGmvRgsvLDQj1dfH67gDdnPhPlO4ZHZiXG6q7ymfaiYoCHTlidKDziUqH42U B1ULnq4uAS6ugHT41m7HELzpzbQXGpkeZ/OZgY9KkJtRJGd5nArhIMXptyS4x1KmcLwS vAAYzlbYP8h8a0kR0jktd+0nOsPvacpI1Omxxo0uU3M40Lrpmu/7dzQDl4Vqvoc8F3Q9 AW1Tr44shqE2uT+Chj7K5IgxaHoP0h/5M/vVrmKT8NyLWM2sKTZhLMv3YRHITay6xUOB IwaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OqnqopOu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l2-v6si8757325qvl.34.2018.06.15.13.34.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 13:34:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OqnqopOu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvQe-0005mv-3Y for patch@linaro.org; Fri, 15 Jun 2018 16:34:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuyB-0000Yn-Qr for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:05:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTuyA-0007iM-I1 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:05:15 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:36765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTuyA-0007hf-3k for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:05:14 -0400 Received: by mail-wr0-x22f.google.com with SMTP id f16-v6so11022476wrm.3 for ; Fri, 15 Jun 2018 13:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bSAB/pZYyx+rDoBfi2/5llk1/I1vzy+OOyIbDcC2TEQ=; b=OqnqopOuFJy1l0P3F3m7jjN9dy8UWDj0Wtj5wWmcxwfUjCjG+tJ4COmWUzVkBLM8r/ q/ur+b9+4IirYBgdk4rMf8R6X33oJFyk+cBXGLhkQDUOmAYm9LeYxYnl4Dn4AU/G6ePk pk+cvF6OaKkDjg7L39KMBR7gK1OQHFLpyxu3w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bSAB/pZYyx+rDoBfi2/5llk1/I1vzy+OOyIbDcC2TEQ=; b=KvYuVBGRQ/huhPhjwz1PXy8GapvTMiMcdjOWtmTeZhT8FwEE/4zrDfKbmXS1xcsM56 WKHhci136QNeErHEzdLQqBAowypLRhEyl7A9Jyl2zceeCJek0+jyMfqK4xE63lTYXqbU k19e/zT2m8zZoIwoSAUYAN4EhV29iGns0R2bPazdtwBCaQxZfZxMjvTeWmH1Bgc/7GNl mHCZqbftQ4kmy3Uqa/rdil6XrVCRMJ4F6hz3/qjxDlqXdQfWsT3KuYUvxaUwHj0w7pz9 kUmY5MltjG/u2z6GU5BiPOemqKz3LgnEPBzKor9WR/Io6SOrlCInL/z0tWO56ixKyCiq VXlw== X-Gm-Message-State: APt69E0Gs8v/bKyNge7y3I4Fao9OkEGk45qwF/9SZFZivlNolyjhpFuU bWBEPZFjVy6hPeLSoWiZCIU2Pg== X-Received: by 2002:adf:e392:: with SMTP id e18-v6mr2884244wrm.94.1529093113004; Fri, 15 Jun 2018 13:05:13 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y8-v6sm11066922wrq.35.2018.06.15.13.05.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 13:05:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DA1F73E1058; Fri, 15 Jun 2018 20:47:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:47:02 +0100 Message-Id: <20180615194705.28019-52-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22f Subject: [Qemu-devel] [PATCH v7 51/54] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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: Alex Bennée --- tests/Makefile.include | 8 ++++++-- tests/docker/Makefile.include | 13 ++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/tests/Makefile.include b/tests/Makefile.include index 2dd0700a88..dad20e1b9b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -947,10 +947,14 @@ $(foreach PROBE_TARGET,$(TARGET_LIST), \ $(eval build-tcg-tests-$(PROBE_TARGET): $(DOCKER_PREREQ)))) 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,) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 87f449264f..c0f09505bb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -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