From patchwork Fri May 25 14:19:13 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: 136920 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3670911lji; Fri, 25 May 2018 07:34:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKDJP0bplJUL5U37WMN06vCulihqb4AK1kLoYbRkwUSegKUXTK6b4sFlYIZcwPhGUm4kF5g X-Received: by 2002:ae9:c010:: with SMTP id u16-v6mr2178905qkk.314.1527258881901; Fri, 25 May 2018 07:34:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527258881; cv=none; d=google.com; s=arc-20160816; b=F6N1dT7mBR/xvhjzEtCGKu5xTQMIsTA9HHQktsniflNgmX/gLYbLoLjZ7ZKwIepWT5 SGXOjPku3EDzneTDrBxu4whkjCEk0fNWUqiLmowkj+Ra7ET4CFKZlkJUEjzbRthYfpJ0 9/RM3zavUnEfNp/poHosHxLW6+c6Er8TnTDxWDNJHBkLnr2kP7HuxtzhC5VNRNS4TBZe eZ2tr52Ev+GV5IWpMWdDIN+RS06ZmUrdEI3Q3CXsBwASeiOY2Pobmk+y9tSbUAzGFEAp 12nlMPAN3oOeyEJ67eH/kYCfRikwNwMXk6l5Pl37lNH9WdWlufSoH5ZAoms9RzAzvck/ urxA== 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=irzt8530NUDL3AWDFqCcoCjNotH6dRgduqvoZ+cxx7/gJhM0j9zBce1sTwy+TreikU KV09c/QQf1Thibmp40G33OcyZsG9mYRXQj62bMW6YkJF48ufsd1yjoFc8mDut/cf1BqF orRZ+FFcdeCmVcO0i9U19/MjhbhDNpWIbSX/zkUprJU7RkVuJ+JjJPMhU5Usd8ZekV7g HVaPn+GoIqBb989DqG194S8KCLE5Gfyrff2jj2sTVak6V/TwdZeqX8VmzV95Bg7jbnE3 AQK67XEfPdiAAaGwkMF6ksw1dPQHpWj/5Nf9NWUo2mxIdWKUu+C4WFGeso5CAjyzblHK aovA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=i6LUgoRO; 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 h6-v6si920507qvo.152.2018.05.25.07.34.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 May 2018 07:34: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=i6LUgoRO; 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]:44373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMDnl-00059h-Ar for patch@linaro.org; Fri, 25 May 2018 10:34:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMDeN-0005o0-Oc for qemu-devel@nongnu.org; Fri, 25 May 2018 10:25:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fMDeM-0003x9-NT for qemu-devel@nongnu.org; Fri, 25 May 2018 10:24:59 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:33363) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fMDeM-0003wP-Gw for qemu-devel@nongnu.org; Fri, 25 May 2018 10:24:58 -0400 Received: by mail-wr0-x236.google.com with SMTP id a15-v6so9587462wrm.0 for ; Fri, 25 May 2018 07:24:58 -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=i6LUgoROO0JxIKHVkM3uD4my92qillgumTT0gtvs72Zbsb7eRt6FreWn42CpunFz9i ck9+SPTFjfcSaBBjTY/9gw0UqV80yfYWqRp/oo+dHR2m+832TXrxcxhA4x5NCXXTT+bD XJLJuPYF/fXwXdoJw08t5KZSz4osmLWCGlI94= 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=G80AqGZL9yw6MsaUDiCmlDN528qOcRwUdfxGLhjS1Tjzz3IxgopFyjHgSQLxDW9SI1 kmb0usOEYTUaP76JIbD+9B5htzs/BMM9WUOzkedBTwuo8hc/jtXDpu4M8wdQgCGI41vq 5ZFwd3/uB69D8EwBntSV+70j0pOQ81PJtf72wQEnWQMnG9psnEJxvDBXsDUik7RoMRiK JUyVzWT4ElyirI1rebr8Zq6xRQFV7Lf4DlLv3rWXkXXdSKgp0IuzZTAh84u/dKkFhpr0 8C8Qm/deimn0d4Mbn7f208OKzzAoHJv8VwSvbhiHdrU6AYXvUpSvD9/C2gBhNyG0SY0p TTDw== X-Gm-Message-State: ALKqPweHwmdhkqU/UZcxRXi6Hy+2/LjyAPoqtBCgIH/j97P+kZvHamsr KOtwpJPbDOUJpdavSCoUGrMMFQ== X-Received: by 2002:adf:dd84:: with SMTP id x4-v6mr2765746wrl.212.1527258297471; Fri, 25 May 2018 07:24:57 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q7-v6sm16558873wrf.0.2018.05.25.07.24.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 May 2018 07:24:54 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CE1CD3E0930; Fri, 25 May 2018 15:19:15 +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: Fri, 25 May 2018 15:19:13 +0100 Message-Id: <20180525141915.6497-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525141915.6497-1-alex.bennee@linaro.org> References: <20180525133851.27161-1-alex.bennee@linaro.org> <20180525141915.6497-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::236 Subject: [Qemu-devel] [PATCH v5 47/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