From nobody Wed Feb 11 02:08:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529425231955626.1466266157919; Tue, 19 Jun 2018 09:20:31 -0700 (PDT) Received: from localhost ([::1]:43575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJMt-0002FX-5I for importer@patchew.org; Tue, 19 Jun 2018 12:20:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJ4q-0004X4-ET for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVJ4l-0007Z9-Kl for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:52 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:53058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVJ4l-0007Z1-F3 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:47 -0400 Received: by mail-wm0-x231.google.com with SMTP id p126-v6so1277816wmb.2 for ; Tue, 19 Jun 2018 09:01:47 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n7-v6sm39235wrr.39.2018.06.19.09.01.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 09:01:45 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3628F3E11A6; Tue, 19 Jun 2018 16:44:40 +0100 (BST) 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=O3bd1kKQFTeHiwsVvraCHf6rIURCFJmZoZ8PpvjxNVM=; b=cSIGORyDV1FcJ5dKc7tQgwwsKdb5JTxg4EFb61Hdg4u4ogO+PQbwPk5LZBVm0sB77s wc4Mr4XP//p8uAUcQia/Ah9aU2ZYuF5pJFr2YwedgZY+gBTWv44GQ2SpVrCnqUDQHs0n pQX34vcgBm2o2HtQBfuL2lJNakDfp5DonE/II= 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=O3bd1kKQFTeHiwsVvraCHf6rIURCFJmZoZ8PpvjxNVM=; b=DfIR8N8eSpzmF7S2Tl0+iQk6rMnMDG+Bsu+81v7q8R/bD0GbCLrwL9+iDv5v1OwK6F vpLP1w3NZyhSB6hmdvrTwV9IDX9WXNM0V4lhX3DJ6kuzSsbNoekS7nkqneQfh5sq9qKK 0mhxntCosrXzMOVvGzCu3gEY+KkYrVgN/IcVCngcliH8A+RB8d8IhuUoCipB/cLrsXgm D/v1Q1pTRWEFEUt2jI8OX0ZtCJVrBuSwN3u2ftKNl+ny/C6PfCJcMAPdpEky9ZaGfkDG BPrMwjnXDy0vmHc6auMtylE4bOXdzg2h86gq3NGWcLtt/Pays+5k2O0yLVIdJAd0D5tP Uwgg== X-Gm-Message-State: APt69E0CQFpBevdRyveewOuqNL0+dDuMLNBCdOSSTLmTStXx6UBT5hE+ m6NxzRJCC7SR49jCagRupHEokw== X-Google-Smtp-Source: ADUXVKKQMAlCZ6+A7SYRWXJ138VEANHJz27bSqJ2PKY5DDsNbOh2chAu1XWz34kGy+MmzNAFBRtz7w== X-Received: by 2002:a1c:4189:: with SMTP id o131-v6mr11623216wma.7.1529424106095; Tue, 19 Jun 2018 09:01:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:32 +0100 Message-Id: <20180619154435.18898-54-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PULL 53/56] 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=20Benn=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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e 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)))) =20 build-tcg-tests-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" TARGET_= DIR=3D"$*/" guest-tests,) + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" \ + SKIP_DOCKER_BUILD=3D1 TARGET_DIR=3D"$*/" guest-tests, \ + "BUILD", "TCG tests for $*") =20 run-tcg-tests-%: build-tcg-tests-% - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" TARGET_= DIR=3D"$*/" run-guest-tests,) + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" \ + SKIP_DOCKER_BUILD=3D1 TARGET_DIR=3D"$*/" run-guest-tests, \ + "RUN", "TCG tests for $*") =20 clean-tcg-tests-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" TARGET_= DIR=3D"$*/" 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) =20 docker-image: ${DOCKER_TARGETS} =20 -# 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 "$@" =3D docker-image-debian-bootstrap -a -z "$(EXECUTABLE)"; th= en \ 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=3D$(EXECUTABLE)),\ "BUILD","$*") +endif =20 # 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=3D1 +endif =20 docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid --=20 2.17.1