From patchwork Thu Jun 21 06:26: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: 139469 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1685606lji; Wed, 20 Jun 2018 23:44:58 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKzcXEEv/Zs8iVm6MDdiR1OzylHp0FbxdDP7yeDX5yoAIxbYZ4CoxsByVJQCMoKfuNfo88V X-Received: by 2002:ae9:f448:: with SMTP id z8-v6mr20361799qkl.22.1529563498807; Wed, 20 Jun 2018 23:44:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529563498; cv=none; d=google.com; s=arc-20160816; b=iEx8g7tnJWSWvz2Zuknd9NtF/taZow4v5bSNurwJsJKokxStDDmmTROZC/ODnjuXXz auVcbdcJXdDFn+m5x6eHOXCeswxM8zQJmqZHztzARj8ydzuuPzCIZIO1w6TfjJSF24tI E3URXHk8WJu4wufS/R1jcjIWH2NHjGKbGI/U3KRC1QzkGJycF+CpuTjgdnvLEajXL/vm eMPZXaM8Oqdt6fKR/MJHpbzyHO/FnynKxUH+JcsotiGqYdYQjU9Lx1gr6KYCs+Hk8l9D RrRvF6ZjHHCbsJ579L30X8hn9HmOk7Lp3n4cRJ8J7DbmFMMEIEL8UYt64Z9Ty6CZ1cfI mofw== 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=12glwX2aLX4CZFfP909mrmk2qzF4TdRaeEmEmtHQ14o=; b=Aa6OJ2rEKjZjLMEB21PWNsUFBCsxRJTiHT2NLB0V7EAxuYiJChEBu50aIPtUY+6iqP /Fw60huk1ue8suBZqVWpG6pwFcJ407mJv4TIL6NNkUXG86uoPsr8YC7Lx7Sx0V/H11rV BkKVcG3G4lZ1zQlezVYv+VzKEC3rGiaSM4fTJQ1EUCAzt2gOo3hKKDJ2/6SuAYISd10p R4Pj9WV7fMEpxd9q0mwZ2kj51bOQS/XXc9N2lEG+aV4KiRbwAgv06ISYnt7nFvfLfGgS n4B3I7hMhYnrUQJHm39MLNeP5FCFmXj1mFFb/ovC038nJOw1jHOdakCMrgbVwPd2WcQJ a0Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UJHj089O; 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 q35-v6si457369qtg.299.2018.06.20.23.44.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Jun 2018 23:44:58 -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=UJHj089O; 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]:53328 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtL0-0006A3-6v for patch@linaro.org; Thu, 21 Jun 2018 02:44:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVt33-00016L-Hz for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVt32-0000kJ-Hr for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:25 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:52076) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVt32-0000jr-B0 for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:24 -0400 Received: by mail-wm0-x234.google.com with SMTP id r15-v6so3128931wmc.1 for ; Wed, 20 Jun 2018 23:26:24 -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=12glwX2aLX4CZFfP909mrmk2qzF4TdRaeEmEmtHQ14o=; b=UJHj089O1+LCYgYcgDirjrE/hiDEEkxbC50AyjDhm1bYBEmjiU4YcmVJwT4tfjKzmV 75gquix75pAcXEyijM7d8MsRIRf7tgsKId1dyFe8efPMEyCTAX3M102W6IGt90o+INL9 UrLUW7KzH74rmW2vINVWvXTK0eKRdRMZf3S5s= 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=12glwX2aLX4CZFfP909mrmk2qzF4TdRaeEmEmtHQ14o=; b=EhKfLJFcMf0t5vCZDI0dErPz04RKyMgpB6/4uFTOb+HetZqIkaqJC7lMcs1ahKlooh fTxhqqLNp8XOPWlyBG27r4lc7xxa6tXynLf+yAVhlrDrQvEg3kV/ib1OwpbGshk0zBAF e8v+GDZES+3qtAd8uXRIhirmcGQI1QlMwIgyAfXbXTKd9LPnrn9oCsm3IfBuDc4adl8X PdGMgBq8zRqMPMv21TwZ8rbNBF4fxZ+e/7JymN3deIDM04mQFXXt1qhnIAG7esM418z0 NRhTQV0wTStflxOQcYFKqOM5KZ1wzqnbzS11/1o3eddzL7HPFKthV4HabluU+1+j3FIE M55Q== X-Gm-Message-State: APt69E0h8HJiIxf3oSt/JGRWD6O0cJGJltLafj5tW+TO76Z9gnIs1lt8 kb8BIdwt6aFkD4qN3MirufSolA== X-Received: by 2002:a1c:581:: with SMTP id 123-v6mr3990638wmf.58.1529562383322; Wed, 20 Jun 2018 23:26:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d102-v6sm6808527wma.10.2018.06.20.23.26.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:26:17 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E480A3E1545; Thu, 21 Jun 2018 07:26:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:26:02 +0100 Message-Id: <20180621062605.941-55-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-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:c09::234 Subject: [Qemu-devel] [PULL v2 54/57] 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net 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 -- 2.17.1 diff --git a/tests/Makefile.include b/tests/Makefile.include index da647324a2..7c48cfe14e 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -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,) 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