From patchwork Tue Jun 19 15:44:24 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: 139234 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5435894lji; Tue, 19 Jun 2018 09:48:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ2p5YqiUFuOsgbqeJDvJgFOcA8/nXZKjfuv4QTTk+Fxppmas6jn7mmFxkZVT6d1nakRQqD X-Received: by 2002:ac8:2351:: with SMTP id b17-v6mr15265959qtb.304.1529426888977; Tue, 19 Jun 2018 09:48:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529426888; cv=none; d=google.com; s=arc-20160816; b=A/T/0wERLqeAk4QcB1ddA1Wp7XHCfdxdexiiVV9xplfuZd0YZEH0QJ60r4YfuwxTD6 0gHokusXCLrPexA+h2mzG3vdWT3yo5gs5aHVaDHJs4xyw9dg8WdmIjZCPOGw5hpNi6Mk e3ulr7zldhM0WA0jfuHG3Zd5g5CZ1lyrE1zGkAd3lstw179EQhF3yxEb6Vt0A7AMNOxk mzh1HZ2SxwwIHDBgYLByFTh8nUSKeMbmSbFWZrUZIbEwfzYfOJdoMz9Pi2bOoofExcGV 2t3FGB6feBBLYgFYzntb13vqTZy07a7VQOfktDcECvMUMmEFpr8ViEnM5B4X4mu7xBBV 6+lg== 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=1694YoLsGAyvd4o41Pu94nlGIy1DjzJN4c91JwOL9eo=; b=Zj0eMEIJCRQlLqO29LExUvxJpxT6y7AJVh6BLpdr37qnr1+0ozkrjROcjhHsx1MUg7 9k8Qr+U9NP5armqr0d6HQ5w+sAiEB/nuPmdyIn5wWURT0PCdpb86BwZo8g5ASEirQQdN DCbN1OILVye6kTvVGcd9BalJGw2wDQwH82KI0YtY3CZg8VSpBf84EQj8jZFgMgNzhc0j VJ4YgAI62dTPgtqxgXC7+CVDqFt7d33ZdLGlZPTQvxe+lSrjABcHACIPZvKyD7M0mJbI BY34eazv8O08qeVeEnESlEmBnOMJTMX6VgQAikQi15Iog0Fr11Bwmbvolyqx9G5KfNdX BVjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WeywwNzZ; 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 s8-v6si170095qta.56.2018.06.19.09.48.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:48:08 -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=WeywwNzZ; 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]:43799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJnc-0006pX-Gd for patch@linaro.org; Tue, 19 Jun 2018 12:48:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJ4z-0004dq-7r for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:02:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVJ4t-0007cu-DC for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:02:01 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:42245) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVJ4t-0007cZ-6D for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:55 -0400 Received: by mail-wr0-x22a.google.com with SMTP id w10-v6so197033wrk.9 for ; Tue, 19 Jun 2018 09:01:54 -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=1694YoLsGAyvd4o41Pu94nlGIy1DjzJN4c91JwOL9eo=; b=WeywwNzZCq1f4HhObDiq225TdaNiy3ER8+wjr1WL8V9MNJu17vyVa6/ADPgGKItr66 oeNKdSKvwUT/3JBOWS1ZRUy8vPmoq+wSyidU4aT6AkIUmPkyEYfi9pw8XJfGleKAzDJj SBAd8TuF/twvjamyJq6UUeJbsfVNVw7RnuLY4= 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=1694YoLsGAyvd4o41Pu94nlGIy1DjzJN4c91JwOL9eo=; b=PJgpDZWrtZa2UNY5RVDXPJDIK9s/IJte6V/98Ps8bZmdizSXHk6FB+8uo7FzA8hnl+ RZZuGEJY0/KiQrlGnY5dXBvsYVZsBOasTQ6brH6tHdFJ8d9a2ReR9AI1sU1TTrwY4g+t NSM0hB9zhYc39hyf7PiuaTPxDdy4JfA3V2A6wnfm7gSlDW71O7j2uepixB1yBm+sAvLc fQXcxMnM2P8tkYlsfw7ty7EypTeux9Mg9QBQPXBBKIG7Ufg5qZx2UYmzmSfXne3MwbuG L7MSunf7uPWr8CmqknszvPZJZKT8codd5vgOcmNjhz/woJaj8I+o/eA+UJRRjFI+krXy lqlQ== X-Gm-Message-State: APt69E3+pR7e4raqkmWVkpguRMUn0gIw+76Ro07cYLQK6zJviRjJG1ck m8V4YLj/bL1OkVzC0z2a1nZPMw== X-Received: by 2002:adf:9d02:: with SMTP id k2-v6mr14360030wre.213.1529424113989; Tue, 19 Jun 2018 09:01:53 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p6-v6sm65972wrq.19.2018.06.19.09.01.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 09:01:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7E0CB3E0FA9; 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:24 +0100 Message-Id: <20180619154435.18898-46-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:c0c::22a Subject: [Qemu-devel] [PULL 45/56] 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é --- v2 - use -include instead of complex macro stuff - also include TARGET_BASE_ARCH/Makefile v3 - add build-tcg, make check-tcg actually run tests -- 2.17.1 diff --git a/tests/Makefile.include b/tests/Makefile.include index ca91da26cb..c8faa01a33 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