From patchwork Thu May 17 17:47:17 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: 136190 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp259882lji; Thu, 17 May 2018 11:10:00 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoEwgQVWvhEvkpi3gthuwdjI1H4CtEwT6OBlU+5nssOniQj1vs9S1NTr2qqgnLj6ZqNyf9h X-Received: by 2002:a37:c40d:: with SMTP id d13-v6mr6001498qki.340.1526580600671; Thu, 17 May 2018 11:10:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526580600; cv=none; d=google.com; s=arc-20160816; b=tnJ6pM7A6XOxLS1ps0PuBxH+1GM+h7wHYnwuMV8gstCQZC+eRfdPsavmA0gbyPB5zn y6LfQQgfmvISnTQo0GJR28xuplMj7HlN3nBeTJDY/vcXKkOeiMiq1Mq0164tLc9iWE1D EMmQBR6tdA3JfcnhM5J3ZGPVAXokrHNY40TbqZsnQHtJ1s3J6MJ+O+t7+1d3mph3qdzf Eou90Bu7j+ZM5XWUV6o3fvFnRzh9C4hOQWEqGTL2eDAmHk/Vl5iXH3THQhD9T2hMfjy4 J7+drwBF96Hp7iqtTA18WUfKouXa4YV0KkaKnQr2PzHrztdsdfQo3ceJZCEYDo9RCbpf A+IQ== 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=YUv1cbQcEjnF3o/ciRLsvzqrURujS6nfvquv6Eh7O4w=; b=KzkCa3+WHC2NRHpk+IOt29DsWQo/rC/3DQV2O39GHyF7fmlL0nfk1RIApnQHLq5cxY ZS/k0rYrsNI0HTovp7PEuDhvjBIrGt8YH3OJay05DnXGtYaPcYPQZz6z7CepTFmc+bUe eitzQHndVDkdk6CGLLO+CZpqQJ8rT7Y8+8IvxGc9ly+QD0IWzNjAOXdStuomqZmD9s3C fEy9NznY6eATLwizuBd6hetCph71zPglUtOFtYKmEpagUKOecHT5T+ER/5Os1CWd8yx6 MQaboYwgnWUtJfnV/Xc8VoL2jvjXctX8aXAX1PMOx1RS97APYUiXCSz4Qyb7PNDZl85H 66bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iemVbqv0; 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 e1-v6si5330074qvj.61.2018.05.17.11.10.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 May 2018 11:10:00 -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=iemVbqv0; 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]:38550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJNLk-0000EM-16 for patch@linaro.org; Thu, 17 May 2018 14:10:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN6Q-0003JL-76 for qemu-devel@nongnu.org; Thu, 17 May 2018 13:54:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJN6P-0007DE-3e for qemu-devel@nongnu.org; Thu, 17 May 2018 13:54:10 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:44796) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJN6O-0007Cr-U7 for qemu-devel@nongnu.org; Thu, 17 May 2018 13:54:09 -0400 Received: by mail-wr0-x22a.google.com with SMTP id y15-v6so6551241wrg.11 for ; Thu, 17 May 2018 10:54:08 -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=YUv1cbQcEjnF3o/ciRLsvzqrURujS6nfvquv6Eh7O4w=; b=iemVbqv0WCP+5opXLJN4vWeaCnOHwM7icTEagx86+fOkqLIx0rjE4nUSZ4xPwpE4Ra gce6oM5XpCGy+0sEuWC6ULWZ/cHxnPhAg5y3cI0jGGRO8PDD2lyg8jwXsPNI7MhH1mea KISDahowqgtUjq0pnuF31U+Fv32DgBGB8mHrA= 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=YUv1cbQcEjnF3o/ciRLsvzqrURujS6nfvquv6Eh7O4w=; b=NOt7Q3jhFmlfZjoGNZQSNzbM4yRJ+EBGf37PmPBhH6t/tkNKAQjYKi971Xj8ZFajeF iKCO9Qa1M7n56xP7NzfYTTv4eHAJlA6lS9NE4fRFPlCjdJgjJP1+4FXOkZthIRu45iVC vSLH2Gzdr3MJ76CRrR/E2ATC9n95wdZfqvK+TAr/hpxSjkNF4cEfFAHDIqZ4O54WC3A0 idAxG8DOiyNpaolCp3loo5kngcXPJ3ewQxEBU19HRS8FaTai00aIvSmGB8np7S/ZIh4L wqQuJGUiuI565cZxtExW5oW3LypJ+wfAsWBYolQfNbD3v5crmI+qDSC/79XCAC9RjJFh iHuA== X-Gm-Message-State: ALKqPweIdPXdil64w74fSDMf4siTbP9+sZcCo8C4e8UJojy38SMymCEy a7t9HEdXycZSW5vQ53ZbNCOFzw== X-Received: by 2002:adf:9466:: with SMTP id 93-v6mr4884697wrq.264.1526579647753; Thu, 17 May 2018 10:54:07 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t203-v6sm6184272wmt.33.2018.05.17.10.53.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 10:53:58 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D3E853E0FC8; 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:17 +0100 Message-Id: <20180517174718.10107-49-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::22a Subject: [Qemu-devel] [PATCH v4 48/49] tests/Makefile.include: add [build|clean|check]-tcg 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" This will ensure all linux-user targets build their guest test programs and ensure check-tcg will run the respective tests. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v2 - use -include instead of complex macro stuff - also include TARGET_BASE_ARCH/Makefile v3 - add build-tcg, make check-tcg actually run tests --- tests/Makefile.include | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) -- 2.17.0 diff --git a/tests/Makefile.include b/tests/Makefile.include index 3d2f0458ab..310ccefdd9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -10,6 +10,7 @@ check-help: @echo " $(MAKE) check-speed Run qobject speed tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-block Run block tests" + @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-report.html Generates an HTML test report" @echo " $(MAKE) check-clean Clean the tests" @echo @@ -916,6 +917,30 @@ check-report.xml: $(patsubst %,check-report-qtest-%.xml, $(QTEST_TARGETS)) check check-report.html: check-report.xml $(call quiet-command,gtester-report $< > $@,"GEN","$@") +# Per guest TCG tests + +LINUX_USER_TARGETS=$(filter %-linux-user,$(TARGET_LIST)) +BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(LINUX_USER_TARGETS)) +CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(LINUX_USER_TARGETS)) +RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(LINUX_USER_TARGETS)) + +build-tcg-tests-%: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" guest-tests,) + +run-tcg-tests-%: build-tcg-tests-% + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" run-guest-tests,) + +clean-tcg-tests-%: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" clean-guest-tests,) + +.PHONY: build-tcg +build-tcg: $(BUILD_TCG_TARGET_RULES) + +.PHONY: check-tcg +check-tcg: $(RUN_TCG_TARGET_RULES) + +.PHONY: clean-tcg +clean-tcg: $(CLEAN_TCG_TARGET_RULES) # Other tests @@ -958,7 +983,6 @@ check-speed: $(patsubst %,check-%, $(check-speed-y)) check-block: $(patsubst %,check-%, $(check-block-y)) check: check-qapi-schema check-unit check-qtest check-decodetree check-clean: - $(MAKE) -C tests/tcg clean rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y)) rm -f tests/test-qapi-gen-timestamp