From patchwork Thu Jun 21 06:25:53 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: 139477 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1690448lji; Wed, 20 Jun 2018 23:51:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ8Ucnc8bwLcXE2FIfjXpSpq0rGdKW4Wcosd/0BDDo+u9S+PZWuYMbkxJ6WKyfJLCod7W0x X-Received: by 2002:ae9:c00f:: with SMTP id u15-v6mr20302099qkk.383.1529563885532; Wed, 20 Jun 2018 23:51:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529563885; cv=none; d=google.com; s=arc-20160816; b=icT5A5oDFihzQjDTfsymFPVJdPkWrW8E/yPPyWBZaFGmvA7w0jnoSxp0ruKVqscHfn xSHh94833EtOYZCaahwFdfHZqk7yro/Tn1NlTb9LakL6iUMdNXQAZuRb/gMAMVgQWRsy XQvLQUxBp8BwDsfMNwo427gq78o+UiCCTMvOD/37WJ/rv+hSpKExZ92kL3awQTzEc3bv L4V6S6AplR9iKTdcuhy3o75Z7mLsj71U/h/1NCe6YaqhFVlRTt1K0NbrT46OK+3xbqUz yMdbFNPOZwyXSOyqgTL+c+NFf4slJpWReE6bNE4mTDU96qNpj7nV7JTPrxJrfegCTZx2 ULxA== 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=KtSNU61pLiMwTIXgg6ahYhWjUOB6mI6+NGY86vZay9Y=; b=KK1SMNRZ7NzQHk5f7aqAUk3kVSBqoRNkZJDR07V8tjenvLbe88kSmnhAQHAjUlF+bj If7arDefP+5jriNx2I7hKFPnpkN02mYPoHHWHhgNR6s2wy7isSK76m+eYq9JBnMZRoXu bVYLlsQszUAdjFdHE0pa3OoT/ClfadFj12ckdWvh9YNzoeEUWjYo0y6aKSuaUmeipxMK krtrNkmL+Xdd7UZhQ1ENj6BsefDdxLwxVRe+4EGriUewh8CsbkdICYUh0hJlTeCHvLG4 aJJDPY5f1AfsS7VYTQnd8JF0O2DirrMe5j9HQu53X3xCvV+GmPIX6ahQfvYMmm7ADi7n BQ5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fcKIS4td; 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 127-v6si36408qkd.242.2018.06.20.23.51.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Jun 2018 23:51:25 -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=fcKIS4td; 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]:53360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtRE-0002v5-Sd for patch@linaro.org; Thu, 21 Jun 2018 02:51:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVt8b-0005q2-76 for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVt8a-0003yF-1W for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:09 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:34078) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVt8Z-0003xb-Qm for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:07 -0400 Received: by mail-wr0-x22b.google.com with SMTP id a12-v6so1855953wro.1 for ; Wed, 20 Jun 2018 23:32:07 -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=KtSNU61pLiMwTIXgg6ahYhWjUOB6mI6+NGY86vZay9Y=; b=fcKIS4tdG2vkaZ+Ga9cFbv3USiDnX+QnREYz3VukkLu45PGV35sNhLoGWjDVnWR2m3 WVw6H4hwI4Sb7bBb1vl+i1q8DrktKttL5BzTlUEUE15DbpOE+hV3/FVkSCCzwrHtSXwx XMzQHuBG8IM1XPexukPPjerSzC6yhTfWykFf0= 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=KtSNU61pLiMwTIXgg6ahYhWjUOB6mI6+NGY86vZay9Y=; b=hrbhXdRsseHH3EJWtWYYUjAuCJXvAgHe3kFd+/bILZQw0JLURghPIExEzn5xRaXMbp cbPocEP4ADyhd16ZOVy7GrqCLBCB+s6TPvSXat6RozDQu9Y2OKL8iKFov1K4S3zljUus vcApwkkQzqoPxSdgGxwOrZPHchNaXNAV5qt4Rx6IKVZGNDK6wTnCLmCJTiXzuNg/jyGT PZA+x2dPeZiDe9LZx0Yt7fEodNH8hrTHgD89cAdQZiKHyhBhegWZlE+ozSfr2Y8Foi4B APu9Lx3Cv+Eh+NnfBIBiCdBsXw3zdN3CBBQpzTmNUFrEIZtyTBPHirdOZJK0zdejniWG g21w== X-Gm-Message-State: APt69E1+wMgKBR0vY3RjTbOn828tNbiYtJm9Y58tRe8m/+DYv1aDqO9y r4TyhIzhkn+zPvRpLeZqDQALeg== X-Received: by 2002:adf:c444:: with SMTP id a4-v6mr21373719wrg.20.1529562726741; Wed, 20 Jun 2018 23:32:06 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f17-v6sm1107948wmc.2.2018.06.20.23.31.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:32:02 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 335EF3E14FD; Thu, 21 Jun 2018 07:26:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:25:53 +0100 Message-Id: <20180621062605.941-46-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-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::22b Subject: [Qemu-devel] [PULL v2 45/57] 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é -- 2.17.1 diff --git a/MAINTAINERS b/MAINTAINERS index 4c955425b9..6c747ff69e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2160,6 +2160,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"