From patchwork Tue Apr 10 19:39:18 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: 133105 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1638810ljb; Tue, 10 Apr 2018 12:49:30 -0700 (PDT) X-Google-Smtp-Source: AIpwx49thVdxEeoKY6HHZB5Myaig8b9hOEZizMtq3iKeWar1aTQFbolxu745tk7H+OhO7q0Uc8Lu X-Received: by 10.55.146.199 with SMTP id u190mr2741035qkd.140.1523389770612; Tue, 10 Apr 2018 12:49:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523389770; cv=none; d=google.com; s=arc-20160816; b=yfuRxsuwht/be7gkvQ5fQuq0GydTy5sI5OSSenaYJVnsC+yVGSG100JDolmZPE253A tT744c5ymtiOrSzc/wxDXavqFgnehLZcgYJnB2TXkSJvy2pHAEvnxQhOYvtTyD2HYJbb af8x8pyLwu2TL9RxMzR3ROghVldj0oaOxNcBWk0LuYJFPI6UKZ64JdoChgCusRhYSa1M CE96k1Q7Wqpg5nPg7t3C4RC2dthVjNZOnO1yCJnB5JOMtoOLWZqfAOqYNVPbhbVORdyG /jv8qpF4gFCC+zYkg6f/JP9lDA7G74eM6dS1T7sN2LSKKF2gYVpIErCAeKDgk6KclkvW p8Aw== 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=JXDZoHR3ADwuaecblqpEpAZf+knR99whKuiIxU+U4PQ=; b=Ch3Hhjk7IryFJsYcKTCBHvJDg1+Mmxf2QNqPJ8I3U/GPeDugEavcJmha9Bu2L9Ri4Z OVK6+c6MGuFjVa67RIzsgCeNbhKLJSTNnQ3nSZcgKMMrx46Jo1+2zrskZA+90LETf1a4 g+BM+AqKHFvRwE9sFgxq5L8InV9u2XlCoGEVG5Fhg7o9d5qhlU6LynAJ8yVh2m5bQu5f na+w/FZBb4w8e/WbozzokYcRKd+GYV04SN4pCvT5rGDD0OfcyGgRQArGmsj6Ne38v+Ow bLksA+XW6JRRz3kcLKKBJq22gQ2EXD72m+FygGtKLt9cNiwZFfB7bjgRVYMAA4qobL2c yxew== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Cr3ZpdPn; 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 j4si1312457qkh.388.2018.04.10.12.49.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 10 Apr 2018 12:49:30 -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=Cr3ZpdPn; 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]:39826 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5zGk-0007fq-2f for patch@linaro.org; Tue, 10 Apr 2018 15:49:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5zC3-0004vO-55 for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:44:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5zC0-000186-Sv for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:44:39 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:38625) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f5zC0-00017D-MS for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:44:36 -0400 Received: by mail-wm0-x243.google.com with SMTP id i3so25427281wmf.3 for ; Tue, 10 Apr 2018 12:44:36 -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=JXDZoHR3ADwuaecblqpEpAZf+knR99whKuiIxU+U4PQ=; b=Cr3ZpdPn9kKJY7gZWzhsNy/n5D4KrnvuUxKfIvYokBBeQ92HsYNXgQSCrAZjDnZtsw C0cAIaLPiPyEKx3uY1XGUteEKGA30N/tFfa8Pk49DYBppMStGyGrUrVt/zSBvVfA/6l3 0eVhMiE2S3HqI0+Zx2HCebcznVb7sLPh4EygU= 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=JXDZoHR3ADwuaecblqpEpAZf+knR99whKuiIxU+U4PQ=; b=NhYio3dDwzirzmzihRstRLsKRkSS3j39/UWP8QUBc6oSWbZzIZRrGfslso+CMyTc+n 1bElEuTx+7YIjH6b0tDvRYfz0icE2wnNZCuETZ0/BLlzL3l/CYGxl2Q5O1KOSFsm1JSK e9Ko6nKLGJXKienAHALNu+Oqh7GXlGme/aVPLw4STDPb6s9ytHVM1WwOjsXA3MTTfx+F wl1AHjs3ySEYPBv6Qn8aOTQw6IwJeMed0oyt8FQSkrOtLHWRiV0SfT7s0KPnzQX5AvO2 6+DxXwYbVg1ZnbBKQsz2/y3ZYgwMxRuerGozhcroQLFh3GERVm72E+1ulLYjkYzS326d 313w== X-Gm-Message-State: ALQs6tBsvQ+DoTceKD5FK6cEuejO/D83Nbmh8MEPShGjc3TJdXQzXNcA u+MUhDhuuORPOvMAOgvqI2NAEg== X-Received: by 10.28.18.199 with SMTP id 190mr601028wms.50.1523389475441; Tue, 10 Apr 2018 12:44:35 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q138sm3211872wmd.1.2018.04.10.12.44.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 12:44:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 186993E0FE8; Tue, 10 Apr 2018 20:39:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 10 Apr 2018 20:39:18 +0100 Message-Id: <20180410193919.28026-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180410193919.28026-1-alex.bennee@linaro.org> References: <20180410193919.28026-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::243 Subject: [Qemu-devel] [PATCH v1 23/24] Makefile.target: add (clean-)guest-tests targets 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?= , famz@redhat.com, cota@braap.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now all the build infrastructure is in place we can build tests for each guest that we support. That support mainly depends on having cross compilers installed or docker setup. To keep all the logic for that together we put the rules in tests/tcg/Makefile.include and include it from the main Makefile.target. Signed-off-by: Alex Bennée --- Makefile.target | 5 +++ tests/tcg/Makefile.include | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 tests/tcg/Makefile.include -- 2.16.2 diff --git a/Makefile.target b/Makefile.target index d0ec77a307..a30fd40257 100644 --- a/Makefile.target +++ b/Makefile.target @@ -36,6 +36,11 @@ endif PROGS=$(QEMU_PROG) $(QEMU_PROGW) STPFILES= +# Makefile Tests +ifdef CONFIG_USER_ONLY +include $(SRC_PATH)/tests/tcg/Makefile.include +endif + config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include new file mode 100644 index 0000000000..cb8bb36026 --- /dev/null +++ b/tests/tcg/Makefile.include @@ -0,0 +1,79 @@ +# -*- Mode: makefile -*- +# +# TCG tests (per-target rules) +# +# This Makefile fragement is included from the per-target +# Makefile.target so will be invoked for each linux-user program we +# build. We have two options for compiling, either using a configured +# guest compiler or calling one of our docker images to do it for us. +# + +# The per ARCH makefile, if it exists holds extra information about +# useful docker images or alternative compiler flags. Include it if it +# exists + +ARCH_MAKEFILE=$(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include +CHECK_INCLUDE=$(wildcard $(ARCH_MAKEFILE)) + +ifeq ($(ARCH_MAKEFILE),$(CHECK_INCLUDE)) +include $(ARCH_MAKEFILE) +endif + +GUEST_BUILD= + +# Support installed Cross Compilers + +ifdef CROSS_CC_GUEST + +.PHONY: cross-build-guest-tests +cross-build-guest-tests: + $(call quiet-command, \ + (mkdir -p tests && cd tests && \ + make -f $(SRC_PATH)/tests/tcg/Makefile ARCH=$(TARGET_NAME) CC=$(CROSS_CC_GUEST)), \ + "CROSS-BUILD","$(TARGET_NAME) guest-tests with $(CROSS_CC_GUEST)") + + +GUEST_BUILD=cross-build-guest-tests + +endif + +# Support building with Docker + +ifeq ($(HAVE_USER_DOCKER)$(GUEST_BUILD),y) +ifneq ($(DOCKER_IMAGE),) + +# We also need the Docker make rules to depend on +include $(SRC_PATH)/tests/docker/Makefile.include + +DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \ + --cc $(DOCKER_CROSS_COMPILER) \ + -i qemu:$(DOCKER_IMAGE) \ + -s $(SRC_PATH) -- " +DOCKER_PREREQ=docker-image-$(DOCKER_IMAGE) + +.PHONY: docker-build-guest-tests +docker-build-guest-tests: $(DOCKER_PREREQ) + $(call quiet-command, \ + (mkdir -p tests && cd tests && \ + make -f $(SRC_PATH)/tests/tcg/Makefile ARCH=$(TARGET_NAME) CC=$(DOCKER_COMPILE_CMD)), \ + "CROSS-BUILD","$(TARGET_NAME) guest-tests with docker qemu:$(DOCKER_IMAGE)") + +GUEST_BUILD=docker-build-guest-tests + +endif +endif + +# Final targets +.PHONY: guest-tests + +ifneq ($(GUEST_BUILD),) +guest-tests: $(GUEST_BUILD) +else +guest-tests: + $(call quiet-command, /bin/true, "CROSS-BUILD", "$(TARGET_NAME) guest-tests SKIPPED") +endif + +# It doesn't mater if these don't exits +.PHONY: clean-guest-tests +clean-guest-tests: + rm -rf tests || echo "no $(TARGET_NAME) tests to remove"