From patchwork Mon Jun 26 21:59:05 2023 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: 696498 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3447075wrm; Mon, 26 Jun 2023 15:01:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4MdpdVLV5yWGRYTKAUjwIcpJTOG5dD83i0l/mulqrIgwxdBMMfBUc9Y9JNqnOIG5D/sv+L X-Received: by 2002:ac8:5c08:0:b0:400:9fed:7247 with SMTP id i8-20020ac85c08000000b004009fed7247mr5615007qti.32.1687816887033; Mon, 26 Jun 2023 15:01:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687816887; cv=none; d=google.com; s=arc-20160816; b=iSq7vbZ+GEZptm2VtG5Oi21YVIB+Uo8vcid43i8stpJM7CWoA+V2JiJRuRJxPoito6 /fOefa6iJVX+LXJ8PL18njCnteqtTEGe1b0q5VKrMvnfE/GoLQ451k1kb2gokULT+iBR miRzqFPgagKo0Hpz8TpBe5ZgGWiUqu528pKbiAIJYXOwXPvzakSK2sZCIT0fA3sX4qZI /8EIEO06gzy5eHxXVCij7fHPVH8BlRndOzzn2hFg6Z1OLUKSTM3QMmqw0EPOoT2q98j5 UW7CvL5sCtgkh4mr+aucJtHi0j+MhSukk9fbp+GIvj2F3mdXO9Ok5iFSfgyarrxJyKZ5 49UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=I9YIwoz2syzBIvgIfb1KrTiedkOwekCcwMFZMGMcvn4=; fh=sQEya64SXtq2IEsk3H77u01QQAMvGjGQGvqUW/mcVd0=; b=I+BxUUTFShqAzQicCR39YJUGbPOMqx7vqplg5bcVXRSLJeXiZcmK7OYgaMvNztFGV/ TNEKqvP0Lr/9t7zI5IO5IwcwV/9EtPsyHllVcG3q+fkVzgeXuFQVgdYeN6NhXja5nOmU DJDv1MGyTRLR9uxRFf+NhEAHVIhRqiQl4Ckom6Dji57eGYuB4gtfhzz4nSJUtlstLiqo 0k4bGpt/qaCUv7OvzBlluJ21N+aFQaqtC0HTRWcDS60rGQI/w+LbFWZi6BFjjg+FuOde mc8c4I05lM0mqgp9aPKNXce5zqyCti0co7ZyygfuIqO/pwxNJ5nkR30s/1xnKQFf8kKj jrsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mvNbMpVt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o11-20020a05622a008b00b003f6a92e7f20si2292214qtw.726.2023.06.26.15.01.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 15:01:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mvNbMpVt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDuFJ-0002e1-3y; Mon, 26 Jun 2023 17:59:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDuFF-0002bL-Qo for qemu-devel@nongnu.org; Mon, 26 Jun 2023 17:59:37 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDuFB-0004sb-CW for qemu-devel@nongnu.org; Mon, 26 Jun 2023 17:59:37 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3112f5ab0b1so3467222f8f.0 for ; Mon, 26 Jun 2023 14:59:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687816772; x=1690408772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I9YIwoz2syzBIvgIfb1KrTiedkOwekCcwMFZMGMcvn4=; b=mvNbMpVtxraiXaBijebT9NTHWo812zjH8dn9J+Mp5IevPCqj7ULih+qHuLBH0DIsnb IoNazy2T+5Xl4DcYh+lWwyww8zcM7YWRbkkjcorwgLewZzCQhZyTpzkrvrZQVtPn9qHn yahX6PbFA1decuaHUwWv01wIPB+nd/CDZP8x4DGUcY5eZOLMU4dubzL0T0+Xg0/Pc1Oj y6BZ4TEhTrvc5jCFryNyUaK1R/z0qI0yhRSHa+kErxJPUM+2aydpHtuBTm+Qs0TXpkuA 7FE7xTOv4fQabLS9gnvKq1tTj/uOtkl6e+xvjeA4Db2BgPA9qZ4V3CPNtKbCn9GGVH8c SLhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687816772; x=1690408772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I9YIwoz2syzBIvgIfb1KrTiedkOwekCcwMFZMGMcvn4=; b=iqHYvgs/8sdkKh1+EGA0rUGIZH0PnXL6jS9olZ5GptcdltfonLfwEabm5BhVO0SN9N lys7xp30WQi2Jq91JqOdWw8gf6yQQMUl9JKdzz5MnLGZLg1rlG+Wh9h+MWWMW4Q4faXX jolvtZIUwH51h21nRnSlN9+ot3e8ElxostohJYHBBnX8MNNFngozNUGyyCkpSbzoVryH o0Vg1REfTYmzj+7hh0Z7RFjx3dayyFAqjrmupm49pqUnkip8OvBh0zUvBkZag6alZTum PQCUBnKlbbB+d6BR87F/KmH09MdFnJFcU2X44vCgD66CsE3HO/kb7mVONVJSJVUF+fYz Fs9A== X-Gm-Message-State: AC+VfDwRP5HEyUbEL1/8vS8TWEatxaXhyrX5rQKktO2tBKnx50A1FexZ ClDpLvv238e7ug5dzci7AjsBUg== X-Received: by 2002:a5d:6884:0:b0:311:1101:abb7 with SMTP id h4-20020a5d6884000000b003111101abb7mr19425826wru.65.1687816772103; Mon, 26 Jun 2023 14:59:32 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l17-20020a5d5611000000b0030c6751a49dsm8364006wrv.115.2023.06.26.14.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 14:59:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6EAC81FFC0; Mon, 26 Jun 2023 22:59:27 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Juan Quintela , Alexandre Iooss , Thomas Huth , Marcel Apfelbaum , Leif Lindholm , Riku Voipio , Peter Maydell , Paolo Bonzini , Bandan Das , Leonardo Bras , Cleber Rosa , Richard Henderson , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Mahmoud Mandour , Stefan Hajnoczi , Yanan Wang , Eduardo Habkost , Bin Meng , qemu-arm@nongnu.org, Wainer dos Santos Moschetta , Darren Kenny , Radoslaw Biernacki , Marcin Juszkiewicz , Qiuhao Li , Laurent Vivier Subject: [PATCH v2 05/26] tests/tcg: add mechanism to handle plugin arguments Date: Mon, 26 Jun 2023 22:59:05 +0100 Message-Id: <20230626215926.2522656-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626215926.2522656-1-alex.bennee@linaro.org> References: <20230626215926.2522656-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We recently missed a regression that should have been picked up by check-tcg. This was because the libmem plugin is effectively a NOP if the user doesn't specify the type to use. Rather than changing the default behaviour add an additional expansion so we can take this into account in future. Message-Id: <20230623122100.1640995-6-alex.bennee@linaro.org> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/Makefile.target | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 72876cc84e..2462c26000 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -169,13 +169,17 @@ extract-plugin = $(wordlist 2, 2, $(subst -with-, ,$1)) RUN_TESTS+=$(EXTRA_RUNS) +# Some plugins need additional arguments above the default to fully +# exercise things. We can define them on a per-test basis here. +run-plugin-%-with-libmem.so: PLUGIN_ARGS=$(COMMA)inline=true$(COMMA)callback=true + ifeq ($(filter %-softmmu, $(TARGET)),) run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<) run-plugin-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ - -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \ -d plugin -D $*.pout \ $(call strip-plugin,$<)) else @@ -189,7 +193,7 @@ run-plugin-%: $(call run-test, $@, \ $(QEMU) -monitor none -display none \ -chardev file$(COMMA)path=$@.out$(COMMA)id=output \ - -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \ -d plugin -D $*.pout \ $(QEMU_OPTS) $(call strip-plugin,$<)) endif