From patchwork Wed Jul 18 10:05:04 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: 142260 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp348843ljj; Wed, 18 Jul 2018 03:10:51 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe5nS0Ogg369PsLMt6BBqnLDpt5Ofnab+mjFnLUgA7VI4nJwYsbfhkRy4Ql7n58uaX1l9/6 X-Received: by 2002:ac8:2c72:: with SMTP id e47-v6mr5138919qta.60.1531908651317; Wed, 18 Jul 2018 03:10:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908651; cv=none; d=google.com; s=arc-20160816; b=riOoXwucYfPpgwkq6jTAyBJxrEBc507qWIea2svpnNpcV0ARkODpfrQZGbtxrGBQeu sSUk1xtNQ3WaK0ZL/3N0DGSs2x73gAAfsHbsB3Qdc/z9cgH3fDdaso+fBiK2Act1hAmS vA2dtnPEiI1vzPL1D+LgOVAfGoMGClsijtj66EwDB5dtuUCU0a30AkOSUhGu1ZxkOMRV 533DkK38Hp9tYhTpjZNQEfz6ynkt7xfMv+Q6YGm1MD0IQtGwLy+DC/P0piHPWuhK7sqL j1mkGzf8ikebKBlfYXkxGdAyGvAUXQePSesR797tJkQtRMr6jMxpPyu1rMNUSFU2i1RO 2tVQ== 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=UEhcc8qtR2jdUBgfDDH7ez83SUKwd1NGXpwmEUCgQoE=; b=nOM+5uRfgIYM1/+QkjXrg3WAfZqGvegSYCJ99eKFKL/n+ts8ckRqaRE93h407P+SOB ITXQd3Ai4EINJsjICyiFl3xiyboFC7EiNcrOtUyx9k+KmJpOXCFjzR3VloZDdWD2Ucrt QlZCEzIlw9GrPeYKxk5WmzYfogzLhJakOC+U77+3c/bMlcU5xeMKuaDpvRyof3juA3qv fMx5mzcnTAv60vUIBarJmiOUsoj9lf4Xsk5bTVaQ8PP/i7iIERDHcNF4dGSUAlKqkmdo HNdv+XI9OKelV/goZ7waXdtwDWn8Tm6uTuXOYF0ONKH2Wpasb3a1OVNJXpl2HrZtLOnT HtMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JxPMvsO7; 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 61-v6si843716qtf.322.2018.07.18.03.10.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:10:51 -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=JxPMvsO7; 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]:35691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjQ2-0007bk-Qs for patch@linaro.org; Wed, 18 Jul 2018 06:10:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKi-0003Ju-GG for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKf-00019U-3R for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:20 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:50752) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKe-00018r-GO for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:16 -0400 Received: by mail-wm0-x229.google.com with SMTP id v25-v6so2202856wmc.0 for ; Wed, 18 Jul 2018 03:05:16 -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=UEhcc8qtR2jdUBgfDDH7ez83SUKwd1NGXpwmEUCgQoE=; b=JxPMvsO71rOJkSCUojuwTR6+MTTrLKfHPq1ILAwn8GaFfIjU1ewNCj1cqFkIEmJxdA h5ndnh8ri3JDNioN7Rh2xiiz6jDf+am1Eo/5I424ttBdhMte+nZqz3pMdcwDoq36MO7d ccul81OVQHdu0GgCguS8fAGh5MNbUmLAgSn4M= 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=UEhcc8qtR2jdUBgfDDH7ez83SUKwd1NGXpwmEUCgQoE=; b=acrqF+VnlxaD7oorbFwF1Mg/VsJVajZmz0rII/ApvZeHNGjvxuKw4C4g8KrNuENygm OzgNMeCyHmDA4sNAcMoxrdArFujZcJu+KCksBgwuEN5H7BpRK+YvjYF4pyDmlSm2s5av +hpB0EL0TT/si3sYJ9PfTQ6FuoH2YoYz+Fe/snaNFl7y3qR/+H6XjmygZHWHfa1bgKUO qHKEk+AN9ByWdE9fDFbQYnFn9+QMrvHyN5XXOYUtNWq2kbO+XRqnxSLhgYMAm6uMG1Ty j61I5EqAnDiRtoeXcPCpUGLU0m+zoUN+TCYn4TSmVyasYVWuyu8v1PY/txpQDChxwjkp f4gg== X-Gm-Message-State: AOUpUlHk2G/t0EUJxxKf/tZQcIqcnptQ1fkjfDoVaL1shubVJe15GMBC ZX10AHxy4bWCYKlpT30tx4gw0g== X-Received: by 2002:a1c:9e4d:: with SMTP id h74-v6mr1242500wme.70.1531908315374; Wed, 18 Jul 2018 03:05:15 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s9-v6sm1394301wmc.34.2018.07.18.03.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E158D3E060C; Wed, 18 Jul 2018 11:05:05 +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 Date: Wed, 18 Jul 2018 11:05:04 +0100 Message-Id: <20180718100505.7546-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-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::229 Subject: [Qemu-devel] [PATCH RFC 09/10] tests: tcg skip docker images we can't build 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" We have a mechansim (DOCKER_PARTIAL_IMAGES) for marking stuff that is incomplete or won't build. We can use this to avoid attempting to build them at the top of a check-tcg build. We need to move the inclusion of docker/Makefile.include to ensure everything is resolved by this point. We also have to check this in tests/tcg/Makefile.include to cover the case where users are building directly out of the target tree. Signed-off-by: Alex Bennée --- Makefile | 4 +++- tests/tcg/Makefile.include | 3 +++ tests/tcg/Makefile.probe | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 2da686be33..6bb8035557 100644 --- a/Makefile +++ b/Makefile @@ -434,6 +434,9 @@ dummy := $(call unnest-vars,, \ audio-obj-m \ trace-obj-y) +# we need to know what Docker images can be built before we can +# decide on all the tests that can be built. +include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/Makefile.include all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules @@ -1069,7 +1072,6 @@ endif # Dependencies in Makefile.objs files come from our recursive subdir rules -include $(wildcard *.d tests/*.d) -include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/vm/Makefile.include .PHONY: help diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index 57470b2a2c..e5f0298375 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -41,6 +41,8 @@ ifneq ($(DOCKER_IMAGE),) # We also need the Docker make rules to depend on include $(SRC_PATH)/tests/docker/Makefile.include +ifneq ($(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGE)),) + DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \ --cc $(DOCKER_CROSS_COMPILER) \ -i qemu:$(DOCKER_IMAGE) \ @@ -58,6 +60,7 @@ docker-build-guest-tests: $(DOCKER_PREREQ) GUEST_BUILD=docker-build-guest-tests +endif endif endif diff --git a/tests/tcg/Makefile.probe b/tests/tcg/Makefile.probe index 15c0412657..22c77d6b88 100644 --- a/tests/tcg/Makefile.probe +++ b/tests/tcg/Makefile.probe @@ -20,7 +20,7 @@ DOCKER_PREREQ:= -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include ifndef CROSS_CC_GUEST -ifneq ($(DOCKER_IMAGE),) +ifneq ($(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGE)),) DOCKER_PREREQ:=docker-image-$(DOCKER_IMAGE) endif endif