From patchwork Fri Jun 15 19:46:55 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: 138818 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1294826lji; Fri, 15 Jun 2018 13:40:54 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ0PdRjcYKr4NfXV/0dI6mg7wEwwzHon6wVaSYS55Inqbenx+xs/2JX989sYhJFLKgFM0AP X-Received: by 2002:a37:d78c:: with SMTP id t12-v6mr2748364qkt.45.1529095254570; Fri, 15 Jun 2018 13:40:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529095254; cv=none; d=google.com; s=arc-20160816; b=EWB3V3jHur0HYIINEZbvwO2jRtHuOF+zYoE8O8Jbe2qprT4s127o2QFYkhmxDALZH/ 9BZm0Y3tBbGGQWlbBI6++OaHz+m00mdIVYggDujv2gjMD9dIqcrVkRWveS3Tp0ze7ctZ cI2LHNn7Dp1JtDNLSvtTBEBfMv9Qzr0QGEtWDcK4dsC4FjJJsxVr7e+Z6CtV9k7JzyYE VJaSrAReAujHiayi4XuYQYjsZx6GZ2VpjdGvmTcO25ZjtGswOoMUntLe8d7Xkn1xnE96 Lby46+dhwTwgjmn3kUE+I56FN/unMP77y0kADo//pRDqmi2tpgMsfw9fWhTCrFv8vdcD j63g== 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=mSIXXcoEhkPNSBj6LcFs9WE8AwTDfJdWNjGtQPcq5js=; b=NjrKK4ZkXnd67v6UUHwxPoJ9LuGT7b+ygtQKTrJr8DrDwgOK1Rf0Z//HKkIIaFzQSs yF3lTwJvxDAdPD+azI7lpdSUvEz3QHCTyPyQGnCD83vJx2bV8j5UIzv19BsSglodpGZJ HwfEg/qv4RbFo28vxlOtTe/Dn0DB+cy3e6MJfL17CgYN9XZQxVrcNiphJiAo7Sdnlrge owqvpiLSoLf7x13WidjrD6IUm9FqazGNmp8bwzaqob1E4UrWcJB0iEAwuVhwIbP0XgG1 RGkMk8bZjkC1VCqry5Z6crXR/deGp6midAJAHlLb/7i49vmQxshBwDM9RAznmb1yicgD Nbrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YWc0BPSR; 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 c25-v6si8237554qtq.389.2018.06.15.13.40.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 13:40:54 -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=YWc0BPSR; 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]:49287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvWg-0001yz-0N for patch@linaro.org; Fri, 15 Jun 2018 16:40:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56161) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuyG-0000bQ-J4 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:05:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTuyE-0007ly-87 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:05:20 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:51531) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTuyD-0007kf-Hk for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:05:18 -0400 Received: by mail-wm0-x230.google.com with SMTP id r15-v6so5256866wmc.1 for ; Fri, 15 Jun 2018 13:05:17 -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=mSIXXcoEhkPNSBj6LcFs9WE8AwTDfJdWNjGtQPcq5js=; b=YWc0BPSRElmzLFY9sB6L1+GqzecGTjoYsFcIHd0xCuKPRnX+MnUd73z3De6b0Nt6MA XH0cUGlYmah7/wgE6N9uDtOZDt+Ix31nOAx53zMn/i7kdIXRgq4pSIQGJ3O/L5cdiOf9 7HGOXn0mWc+wTIjDudcbor4+0wJUjbHH4St3o= 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=mSIXXcoEhkPNSBj6LcFs9WE8AwTDfJdWNjGtQPcq5js=; b=Hebn4CKqnD7gxo+3MMmx4dyoLixZ7sPI6Yg8kNz5VHW/InkpQuz0NVFRAlPlNGajBm TfZjXSQ+deBbJDxD/dE2o2YFy2zTJWbq1tCaDeOT7kPnQ829bcOuEJ7skOZRPtJzSBIg 3svXBHvwHd1J6N5pNQ4ZNzl5xbTJ/GH2eXRgB3g5SLqiQqZLYLYTvzlJyofVN28MV/G8 2x50ZUupXPM+TU9C4JK8q7k07j1LVPWDPW7co6TeYxGZxblH9/1rmJfVQhQVhmDKXlX8 HcqZDMQMG3drCR+9JqNDV3Urn44IsmwrCTd5afsutLNuGoIz+J+1O4b8sj9ZzZWLgC/l tJwQ== X-Gm-Message-State: APt69E3JwBjrbRo1BJEU7Mk8kY5ZF8aW1z6w6YgUBrE/lq3ZLTkLEeIc cW8/kK7kujXmlETI7v6XhPztMQ== X-Received: by 2002:a1c:f45:: with SMTP id 66-v6mr2229024wmp.124.1529093116402; Fri, 15 Jun 2018 13:05:16 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s191-v6sm3997031wmd.27.2018.06.15.13.05.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 13:05:13 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4C1773E043B; Fri, 15 Jun 2018 20:47:09 +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, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:46:55 +0100 Message-Id: <20180615194705.28019-45-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-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::230 Subject: [Qemu-devel] [PATCH v7 44/54] 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- 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 v6 - bare make -> $(MAKE) for sub-makes v7 - fixed spelling - shorten CROSS-BUILD to BUILD and RUN-TESTS to RUN with additional info to the right. --- MAINTAINERS | 1 + Makefile.target | 5 +++ tests/tcg/Makefile.include | 88 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 tests/tcg/Makefile.include -- 2.17.1 diff --git a/MAINTAINERS b/MAINTAINERS index 3795a32c27..6a8d42ab3d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2153,6 +2153,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 dad2cf8778..a9d8928f96 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..57470b2a2c --- /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)), \ + "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)), \ + "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, "BUILD", \ + "$(TARGET_NAME) guest-tests SKIPPED") + +run-guest-tests: + $(call quiet-command, /bin/true, "RUN", \ + "tests for $(TARGET_NAME) SKIPPED") +endif + +# It doesn't matter if these don't exits +.PHONY: clean-guest-tests +clean-guest-tests: + rm -rf tests || echo "no $(TARGET_NAME) tests to remove"