From patchwork Tue Jun 19 15:44:32 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: 139205 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5403484lji; Tue, 19 Jun 2018 09:18:55 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKm0EmKf1+3Y62C0gKMmAQyv/c05b96P6Su74fesg8gnOgyW8M2GYFePJqA7wb0nmfOwFSy X-Received: by 2002:ac8:678c:: with SMTP id b12-v6mr15038499qtp.314.1529425135560; Tue, 19 Jun 2018 09:18:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529425135; cv=none; d=google.com; s=arc-20160816; b=xWQdrXT1sNAkbx4lZO48wGhMR1NT2/+hQFvhnmwTSJClhaDgXFZeyGy/XVF5I3XKZC +Hx4CIb5Z3o75+hMeQqhssiIVwtoq/0pW2pqH+3Udz3E4NH2HYKgx416+gEhmpfWTw2s ElFEXmO0rllMQH5OBbNW8/6MNHgVi7st4D+EnX2ZvzQ1AqdxYsF3f0BFfbQ/AMODA22O QNneEdVtwutxl4sqWdTCgiqDcYCGP0vhTl0RKvP8MfInAx2D96BWv0qgXONvhUF8+Jej gwbPbPMwlqEErObQAcZlBQApvj4fUqUwFUIGACMhVbhmLuIUSv34DblphsXZrp62eFKV yaeQ== 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=O3bd1kKQFTeHiwsVvraCHf6rIURCFJmZoZ8PpvjxNVM=; b=gBbVmK6urdmx0N2V1z3TA7mshpjsOUf3/BmSq76mGhx9LShu5tNFBPa3fDkQvF2ooy 1rAKUA0oQN+Do46kiyqg5sEg9shKzwNrf6Q/48/1X21Ji1rHhQSKYyUAwMw7aoCClGsL AOQgJSrTVXe9dGonzH6xQC5EwzqaGwKH6BdY4jFHs7Kt68P7EnQD3/Us4PZNNUIOZKpJ 1ZiJ6mN1dTZxRtbcwJfoLs21ThospifGAEwRyQCLYvlMLkPqE3QWfs0bXyfQhbywLkKQ EXdszJ/mnBr+yM1/mJ04DuQBLbjSO5XjfFSnT3NDCDVlMdY34fVkqXRpWiHiPqq4tc6W 6I7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cSIGORyD; 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 u185-v6si63346qkc.234.2018.06.19.09.18.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:18:55 -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=cSIGORyD; 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]:43560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJLL-00011j-1I for patch@linaro.org; Tue, 19 Jun 2018 12:18:55 -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) 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-Received: by 2002:a1c:4189:: with SMTP id o131-v6mr11623216wma.7.1529424106095; Tue, 19 Jun 2018 09:01:46 -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) From: =?utf-8?q?Alex_Benn=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 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_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 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