From patchwork Thu Jun 21 06:25:54 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: 139480 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1692137lji; Wed, 20 Jun 2018 23:53:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJDxArawVCIV9CoFjJpc6Zlh58yK6ASIJvYQuKTOYNsn0ecVZ8bXI4MPHU6r8g6MoW93eXD X-Received: by 2002:ac8:3115:: with SMTP id g21-v6mr21667856qtb.230.1529564021613; Wed, 20 Jun 2018 23:53:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529564021; cv=none; d=google.com; s=arc-20160816; b=MgCrcpOLXpxLdEyZRO0hs01orTIMA9mke8OfY3f52Hg2UWaadDJvvCYcvx9YsOgi99 so1hoQAuoGOrTmewyDv3EdUkhKPY3wzYPWnwkGCStU1ZDk1fr+MXIgvTQaV32ImP+zVQ 0UJcJ4600CW3eAx4Vk4jKT7Z/P2pouTQTIg4foHx/Hq3RUnwe/FGQWt/Bn8WACepftav TF6M07Gu3wAPmLPiS8y6Pa4MY9qyP7gBJFE7PUd1hm3EAfRA82Wp3xauK90POGDVxkRT DpeGkyWDtQZ8Smcw98wqeJ7EQfZS/3K/iN9N2SRT6gpDPbcQF9+0JKeFmJp0Hdtl/HYw L1ew== 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=v1L3UqOTRcKjWTMiuCesKddnnbNe+20uyCCBpWnbbRI=; b=dOyj6/XtDZ+Wire2IU3yWtXLNsvqEOe+26CazBWhMfPhk453DcFrYKajtOFuTqo/Pw 0Rb1a9YXKImjdRzs+J81ET154+ZVXXvwgyGMiePuEmgsgtqo9lgfqb4tecZqnmaiLiet 5Lmd7ijqhjQNhkYruva8ex/zPhpGWxwn75vxkFmBhvfTyzsVzBxEX7FnXe4+G4bmUzeO 070WNlX6LH44bS4wGBdJ1VOmmsODwi6fS6gCHMfKc/2nb4toHmQHsBwsejl+TPRdvPPv Pdn53uIMrFMxhgoXWP1ZTdHV5CuRxQKl7xOoWE/SQ8aoloTVtI/sXE+4d42/OqOS0Cxs twqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UbSw65Ba; 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 l2-v6si4280288qkl.261.2018.06.20.23.53.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Jun 2018 23:53:41 -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=UbSw65Ba; 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]:53384 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtTR-0005do-1U for patch@linaro.org; Thu, 21 Jun 2018 02:53:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVt8c-0005r5-2b for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVt8b-0003z4-2X for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:10 -0400 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:38770) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVt8a-0003yW-SV for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:09 -0400 Received: by mail-wr0-x229.google.com with SMTP id e18-v6so1837154wrs.5 for ; Wed, 20 Jun 2018 23:32: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=v1L3UqOTRcKjWTMiuCesKddnnbNe+20uyCCBpWnbbRI=; b=UbSw65BavFYfPrs33PzCOpm8PdTHBYIrUPfzYlMJqU/xENvaP4TvjjvDooDn8eKyJu 7Es0N3crDxhMou9LkAavWfdyHkeDMwgwgayyMm9umdfFyN6PJXwexymUm2jiRXnjEcyh HTVvcfsquFPVFUfTQfAvFMm9WZOfVVqWmmBcw= 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=v1L3UqOTRcKjWTMiuCesKddnnbNe+20uyCCBpWnbbRI=; b=bz4EUBmNqe5TZUqayRT9jKD0Axh/X5wazenapdt0pqJOefEF8ioVhT+HAMgED1cE1k hs4ZJkKxI1ejZaNYCwIUTBk3p/mOsrEx7lDysOQTGqIGZg44QwYMb38nEN3Qr9qYfRV0 yzTBuQKByCSh5WhvxZpBxwUQkJ3Z80aR4qhZ90P0O9U3+aqW1EBSyQKCZJEthYya/PvA CDeenD4xaKjGNjW9ULHgWpVapE8h1koOdSnBc6045UCHHGD7rmXqyGYJYqz8KVKwvQjt 1WyEWghYm5XAmPxkdEOipvsmpwJVm/CV02kkYScPmSaNWHKRQMTjFISDj0L59v8Y9pk6 hFCQ== X-Gm-Message-State: APt69E0kiu8SFN4WZTwU+1fL8eP2JgMVt8QWbkzl4g8BfWSFeDsR5tb1 BKaVLZHI3hhQmQyXi/F0CLclBQ== X-Received: by 2002:adf:9897:: with SMTP id w23-v6mr3310945wrb.9.1529562727837; Wed, 20 Jun 2018 23:32:07 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q17-v6sm4447348wro.30.2018.06.20.23.31.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:32:06 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 45E623E1500; 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:54 +0100 Message-Id: <20180621062605.941-47-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::229 Subject: [Qemu-devel] [PULL v2 46/57] 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: 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" 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é -- 2.17.1 diff --git a/tests/Makefile.include b/tests/Makefile.include index ca91da26cb..5c401874e8 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 @@ -930,6 +931,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 @@ -972,7 +997,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