From patchwork Tue Apr 24 15:24:03 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: 134135 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2425368lji; Tue, 24 Apr 2018 09:12:24 -0700 (PDT) X-Google-Smtp-Source: AIpwx49vF7eLAdLsOPSgCD2hjlOyTvaSKvRURFswU85JkLaaOyU7mqG0nUMJrGb11EQjDIXr3bL+ X-Received: by 2002:ac8:1766:: with SMTP id u35-v6mr28314488qtk.209.1524586344244; Tue, 24 Apr 2018 09:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524586344; cv=none; d=google.com; s=arc-20160816; b=MkUDgREXqwjKEg6Lv5AdlKnZERjVFo7OQklJmYbJ0l7LbV/UAmJbwXThJNzWjjy/DT yCxZaG7q02wTFjvtkwx/ql5Sf1nClK5L/xCV3U+lOXl27gpFjItkctqzdE4tGKCCVRih ZwlyDDf5Z7/CTUN/ZByBpAnh2K4SzW/CvCx5YOQFQxBz7rHuE21r8Mboi5cyJtohZ7mj CYcqztvMZxqrdadjP5zvguMMVTnVl0AYPvyEyV5iKIyTtAq2rAUP9GfB2EiK6LGZeFl4 hrojVklNbHQFX/mgr8dvSao3YIccmmBU4kwGvx2MaRQOq+6I9V74i2ECzAKnGQ2jQYO/ FuIA== 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=8sTsQiWizzrwf7qM4i18PQWMiCuOPDmGd5KJ55R6e78=; b=ZAnOusV0z+VAEceBG4Bx8kwgzretESl9vJdVmCOgXMT09Atn+dRyPEAhcR/6PYxv7b gKMFiFhTKZpfEGCyRanloKJK/vhD5LUAiIJDbVWfkabHogzcxtLezawEKDLmtDyYbxYQ F8+T+/Ogxn7AX+ptdCO56wg0yCaQHrmdtk+GCNV93hXbnLTPs82RX5lcq8cjS5Mz5OIl apL74CuuepKByPT3F7IIRSAJU1FrMlkjcmxniyjiSd5jH5yfdXDsQv6HLtzk8CQ9RmtH D3zrz8X8bFd9xX5U0m+NLkTks9YQJHSJpzsPdzK43LxcRpePF6SDN3ACcp8L35KFkrpS 5PyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=E+BGJ1kJ; 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 50-v6si9854682qtn.237.2018.04.24.09.12.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Apr 2018 09:12:24 -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=E+BGJ1kJ; 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]:59389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB0YJ-0003Nn-Jn for patch@linaro.org; Tue, 24 Apr 2018 12:12:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB06H-0005Mv-BN for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:43:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fB06F-0000jV-Cm for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:43:25 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:46881) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fB06F-0000jA-6F for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:43:23 -0400 Received: by mail-wr0-x241.google.com with SMTP id d1-v6so50408956wrj.13 for ; Tue, 24 Apr 2018 08:43:23 -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=8sTsQiWizzrwf7qM4i18PQWMiCuOPDmGd5KJ55R6e78=; b=E+BGJ1kJuI5PTsmx2UaJfTEmZ7Nt+j5XmbDHpslIgCNrSbZylt9sW90iIvGE2zSNuS PHKY3ZCSNnTQPRbAMBWPnZqlAhmumIXCtA7t2DWkm7cp603FQTHGPeF8Sv7Sxm/RAuTv /a0kvQAIyr57TTSIXylO4231i6YP8baNmfA0g= 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=8sTsQiWizzrwf7qM4i18PQWMiCuOPDmGd5KJ55R6e78=; b=LEMqcdZ078ObvBQ+8sno+hmArYiAgmUh2I5rPhLRvip1cbUjupDj2jSwnl52qrWp18 e2STxRvnwn4H1OttQ/UGMhkriD/RpCQJVVXzeA6y53hFOmPdGnTpnTgLVNDvR3IwSJE5 V74T2uXycIDiSPklI5XOxV2dsWRziRIk7IftkXUjNCZW4NQRfWTcnxE1JVh7moy9rbro 8yP4NgR3p6JqU2vuhfl+YBdga2fzDFXwll6dOIJUuLBCJedgultkI7lZihIQr9r+r0ie MvEx6iIgaR/G7XRUlPOOFrKBneUbUTTihLfxTHF8gC7CzthIiPVTjwUyf9oPi+BzrMZH WKOg== X-Gm-Message-State: ALQs6tABZFRu1g+dgOq87OBfh49XRpbVpehltajYzShx0Dcdk5ZlImgh VEjDrI4Zej6PYpEP1BTa8wtypw== X-Received: by 2002:adf:96c2:: with SMTP id u60-v6mr21029527wrb.204.1524584602030; Tue, 24 Apr 2018 08:43:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b18-v6sm19852284wrb.55.2018.04.24.08.43.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 08:43:15 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E60703E0550; Tue, 24 Apr 2018 16:24:08 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, 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: Tue, 24 Apr 2018 16:24:03 +0100 Message-Id: <20180424152405.10304-45-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180424152405.10304-1-alex.bennee@linaro.org> References: <20180424152405.10304-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 v3 44/46] 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?= , 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 --- Makefile.target | 5 +++ tests/tcg/Makefile.include | 79 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 tests/tcg/Makefile.include -- 2.17.0 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"