From patchwork Tue Jun 19 15:44:23 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: 139218 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5421245lji; Tue, 19 Jun 2018 09:34:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI+cvT6D+FPYTxeZNHJptveomZ6M26+FcINhr9cOln50dHIGRUUa70JfVFzNHyizYZvkBmY X-Received: by 2002:a0c:8842:: with SMTP id 2-v6mr15111188qvm.117.1529426097201; Tue, 19 Jun 2018 09:34:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529426097; cv=none; d=google.com; s=arc-20160816; b=gAcbAEdcr/d0SbEEmCEXx5Ptdykjt9RpfPQ97xNpltJdTs8RoJ5wsI2zkOU1oOxmc6 I4f2suvs4xWhn2aCB5CKD8zfyJKIArHEv9cHMQ1yEi/FHbe4zhXvHhzWwJjVui35FdPW 5jix35BKPPXhCJ3BwXLhJqDZaAwCIBLbDaPbDFaRt02dqQwyj0PeE9jiePhWe5NCRI3u /GjALRETv1awomehDLdBoHeAGRPH6f4xA3HLWLm6lwDNiXS2zuRitssPTKdKSEAee8uu NOfPEL5NXqxeSFbFK3lbIqpnu2SmbEcjZzta5qE4CXBufHtovLgSdsSDqgAc49ETR98F SnLg== 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=I8wfM/vHuXOzNmMIA7AsHbNeMhmiWzhCdMtbqSJIMp4=; b=bowpF4GO1jUUwe/l3Z9B7VKkVrExRL+Fm97AwC8r3VJq4gfa+6nuAsi39OEVLIzKxI W5wdAVreuz1rvNAtmUEIeMD46nfyV1ypF7D6rxIs82AHipfwkyKjtW7vuedE8u/DT2MX SvHfChxN9qqjUYkaZQZ5vMvOyL+lCru1bx7Em5/LHpVTQJ96qh+MfxFzX7iKIN1zGImT OD+/WymZ99G70zTQne7Rwc3Cn3dFjnOFsayeKDfQ80TMm0UIN6K248bxRGkDYEK9CSRE GpMYz92bCHJB0Ka8Qw5LBLTzGo0gH3HQfcOpsueB/z53APhGh6khWv232NDqt47zxkR+ wtYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=R8tXkzm2; 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 j23-v6si129048qta.117.2018.06.19.09.34.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:34:57 -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=R8tXkzm2; 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]:43681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJaq-0004YP-Eg for patch@linaro.org; Tue, 19 Jun 2018 12:34:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJOB-0003rF-Fb for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:21:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVJO8-0007FE-9h for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:21:51 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:40829) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVJO8-0007Dq-0q for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:21:48 -0400 Received: by mail-wm0-x243.google.com with SMTP id n5-v6so1519796wmc.5 for ; Tue, 19 Jun 2018 09:21: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=I8wfM/vHuXOzNmMIA7AsHbNeMhmiWzhCdMtbqSJIMp4=; b=R8tXkzm2pPair8qtOJWbHUt17yTLhHtH+J71ZdrpilZoyALoffRUf0HwsV46UqS32D p6pHHnIW20ivWDqIMdBtax2eaBMLg2Yx4hlB3t6fgRX5IWULZcl505/TVTdChYF1LD0P 4upx7SMgpjLuuIWvwvjIVnQ3XhmFeJZXvocSI= 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=I8wfM/vHuXOzNmMIA7AsHbNeMhmiWzhCdMtbqSJIMp4=; b=dP3orAdOc1WlUhoeIItlzqtRlcUFJIqCyZfRjG8zkGG113VAGITEvisZWOzEmcp7UT 54hD4nuJTLdUZB1CDy3MnOIQ5uyDjT6Ii7gEYbesU5iEi/LFplErOCmHUmGnXBLwsATh TBXAAi9ifJpFCRt6/QO3M9gjJVyIQHvV0Aio5sLar5EdJEyd33/HEr4ehMSDchJtuq8X ypSN2UtCZl0J7oT1kWnuU7s1g2PMbj5dFEZcHs3rdVuVwCTrY744M2/af48H+uq3CI+O RFrhP0XvT3YIZNRr6N+QMJ8cy5ad6i8Y4I5/m94+jV+5oF9UBBZAR56qlurH4u1pG6PC eBaA== X-Gm-Message-State: APt69E0/Iuaxk3xzeuLDNaX+C/m6qqLvDK2O3KWyVsJrWsj03ZuVHjU4 ioP39L15Bu1HQloqH4V+oeK8jw== X-Received: by 2002:a1c:6fce:: with SMTP id c75-v6mr12027833wmi.83.1529425306917; Tue, 19 Jun 2018 09:21:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b8-v6sm99888wrp.50.2018.06.19.09.21.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 09:21:45 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6B2083E0F8C; Tue, 19 Jun 2018 16:44:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:23 +0100 Message-Id: <20180619154435.18898-45-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::243 Subject: [Qemu-devel] [PULL 44/56] 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: 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" 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. -- 2.17.1 diff --git a/MAINTAINERS b/MAINTAINERS index aea5788c1d..2a4a7e0e0e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2154,6 +2154,7 @@ Guest Test Compilation Support M: Alex Bennée R: Philippe Mathieu-Daudé 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"