From patchwork Thu May 17 17:47:16 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: 136205 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp277371lji; Thu, 17 May 2018 11:27:44 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqsImeiByb42mJhE7Wl8i3U3TcKfeT/Nao/i+AXYX1dwhY1jBwlzUM8eAMPaU5PJzWqMQVd X-Received: by 2002:a37:aa4b:: with SMTP id t72-v6mr5897780qke.215.1526581664214; Thu, 17 May 2018 11:27:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526581664; cv=none; d=google.com; s=arc-20160816; b=XRYpBaQ4+MbDIup+/sJU+6QnD51P3/iBuVo7SVUduXUIO5YljZ7ASjCFNLG1kEqZlJ Mrnc5o+C9tETrWF/PHzvxqGYPH9FJ0ZEP/4RJBUma62MwM1sg/m3wY4Y1XW20fQ4sX1T XWGANP1HDjRyG01Pgis0SJvbcVd0r5lPQHa8Rb0OUtghWjTDd/x+1HwLgBfhhu0mqzga UJ9GppLzYOjdNqjnw9Hbsho5A6tBKTYiJt20irIXg60Jeb0tBFmR9zabvwksF062XQjO +Prjon+2TMgHdBDai7gb8J+izzaepxfa7Btt2dzVtMBNvMNH4CWbCkCxYzqC9tVMbX9j EL8A== 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=vbXtM98b/3UETC3TG5aECUyBwDFQYNUKr9ixOxZ+KRI=; b=zbXTb4oiDFUGkCl9bLRN+O/SUpUf2+Zz9zagtTnFu1V+i6i+97LWMbq8NxqFBodSQF Sq9IT8Ef8qO0M6AFYwOdBQn2rIO4+W3Ep3Wbo2ltSeP8171XnRxpszwUQDW/daJ9JMnD 143yihltoN5m13YptTtX6LzADt19rV9KoblDq1kQObyJmsaAdfckVMTia2czsnYxsDEo scYs2atN8tcXdRGwO6iE7QUXBF/tEdvVJAZfq+d8ruMdEyugnAT4+kl7xOBzzHi0wQAI fNFBM+lrGXHUVuK6tUcIrdfn+MwlKhFjNUxHhUcmRA2HMfE4qPEdLLZ/kCm9rkTyMfjK VSkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gW3CvPOS; 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 t26-v6si5769728qvt.135.2018.05.17.11.27.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 May 2018 11:27:44 -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=gW3CvPOS; 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]:38660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJNct-000695-JY for patch@linaro.org; Thu, 17 May 2018 14:27:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJNG0-0003eu-1b for qemu-devel@nongnu.org; Thu, 17 May 2018 14:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJNFy-000530-Mw for qemu-devel@nongnu.org; Thu, 17 May 2018 14:04:04 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:33060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJNFy-00052T-EM for qemu-devel@nongnu.org; Thu, 17 May 2018 14:04:02 -0400 Received: by mail-wr0-x241.google.com with SMTP id o4-v6so6617310wrm.0 for ; Thu, 17 May 2018 11:04:02 -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=vbXtM98b/3UETC3TG5aECUyBwDFQYNUKr9ixOxZ+KRI=; b=gW3CvPOSwRjBvkSEjwNMeCOSnMxEn+zW6ZTJRTLH4Ivp9TT5MYE4F22iyBcM12ELoA P1Maz9J11G34OFEmjy9NSxquRFmJZIR5Mzn1bBEDghbH1mCLrQBjTQvtz37bIrHpLz1k BgtxgYWhGWGaeJrJcmInjk6GG9ZtW4cFLjfWU= 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=vbXtM98b/3UETC3TG5aECUyBwDFQYNUKr9ixOxZ+KRI=; b=ib37tb//ZYPoEpT7Y33Z/rs0/hOhx62y/4sDJ6HLYAOe42PgAkcF4uDNZ9T8wnKT3I ZAptXoYvk68aKDZ/wYNMb2tCPQqYSGTASpTrIkJHiMBhNKq1xnfH6cTQdcBCZdts3RiM YOYG/PufM/H6dVMp0Ambrvr+J8XyvaZRHvCwmqsoC/bnF3IYmZYicnWVm2RGEO1xsk8U s59Bg4+5QsNz5F8IuhKiTcvLes6LdEq080yosVRli3x7UVzNULePZ6g1fjs9jAGbz4W6 irjhfM703DmifPcrRbp+yLZSO+5qsMp7ID+0a98DoJ4VowVpY5obloKxYrUbbiOHxyDi Rcmg== X-Gm-Message-State: ALKqPwfYIXND82cflqZbvali3x3o3BEbO7x/JfqrGdjl8/OLTqgNIex6 XiP0BVgA3BUkvctYnJ6RJWfPLg== X-Received: by 2002:adf:984c:: with SMTP id v70-v6mr5191416wrb.100.1526580241261; Thu, 17 May 2018 11:04:01 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m64-v6sm8954112wmb.12.2018.05.17.11.03.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 11:03:57 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C0BE93E0FBD; Thu, 17 May 2018 18:47:22 +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: Thu, 17 May 2018 18:47:16 +0100 Message-Id: <20180517174718.10107-48-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517174718.10107-1-alex.bennee@linaro.org> References: <20180517174718.10107-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:c0c::241 Subject: [Qemu-devel] [PATCH v4 47/49] Makefile.target: add (clean-/build-)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?= , qemu-devel@nongnu.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 --- v4 - pulled Makefile.include bits from next patch - added qemu-$(TARGET_NAME) dependency for running tests - accept SPEED parameter to run slow tests - pass BUILD_STATIC - update MAINTAINERS --- MAINTAINERS | 1 + Makefile.target | 5 +++ tests/tcg/Makefile.include | 88 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 tests/tcg/Makefile.include -- 2.17.0 diff --git a/MAINTAINERS b/MAINTAINERS index ae569f9cf6..7e02e03358 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2110,6 +2110,7 @@ W: http://patchew.org/QEMU/ Guest Test Compilation Support M: Alex Bennée F: tests/tcg/Makefile +F: tests/tcg/Makefile.include L: qemu-devel@nongnu.org Documentation 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..fbefc8b23b --- /dev/null +++ b/tests/tcg/Makefile.include @@ -0,0 +1,88 @@ +# -*- 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 $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include +-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include + +GUEST_BUILD= +TCG_MAKE=$(SRC_PATH)/tests/tcg/Makefile +# 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 $(TCG_MAKE) CC=$(CROSS_CC_GUEST) \ + BUILD_STATIC=$(CROSS_CC_GUEST_STATIC) \ + EXTRA_CFLAGS=$(CROSS_CC_GUEST_CFLAGS)), \ + "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 $(TCG_MAKE) CC=$(DOCKER_COMPILE_CMD) \ + BUILD_STATIC=y \ + EXTRA_CFLAGS=$(DOCKER_CROSS_COMPILER_CFLAGS)), \ + "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) + +run-guest-tests: guest-tests qemu-$(TARGET_NAME) + $(call quiet-command, \ + (cd tests && make -f $(TCG_MAKE) SPEED=$(SPEED) run), \ + "RUN-TESTS", "for $(TARGET_NAME)") + +else +guest-tests: + $(call quiet-command, /bin/true, "CROSS-BUILD", \ + "$(TARGET_NAME) guest-tests SKIPPED") + +run-guest-tests: + $(call quiet-command, /bin/true, "RUN-TESTS", \ + "for $(TARGET_NAME) 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"