From patchwork Fri Jun 30 18:03:50 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: 697955 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp592875wrs; Fri, 30 Jun 2023 11:06:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlEbtnm1BB+qBqM2g+OPosSbDwGMJ9JJJuH1b7Wno4XWCb70XQWrx3sZf0SaZjf1Dy0nHHFA X-Received: by 2002:a05:6214:27c4:b0:635:df49:719c with SMTP id ge4-20020a05621427c400b00635df49719cmr4674965qvb.22.1688148371249; Fri, 30 Jun 2023 11:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688148371; cv=none; d=google.com; s=arc-20160816; b=jpnOoVYzAjOS4SL8TmmZ3m85T0GBq2USpdQfBYLFDw/Obb2tBzRHda8JFV5W1DBRlY A7ouG5BFbVOelD1in+FqMXyStO5sUCvgjnUjCSlr3jIyF82T+sOqc3Rlnbtt5ovl3Mr1 klcWm0I4z6BglSwtior7GBeV9W/spMwgMi8CWEfrt1OsMXV+vpdgQJLhE+phvI9sn/hA 90D+a6dj1DTXOMWI2XT2g73DnRkR3ZuV4ZLew77Mo6MQx2Vo1HcMWG2h8aAGuEOmJTvL ZM20lGIX9jyCJsHxMAeSQe7H5/zS1n915R82sxiZd+QdqOOjWHpt+nkTYe2F82uA0QHs RRcA== 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=OltHerz+Vf7zZkebZbScoRT4WgVwJDskRS7DoEjx2Hw=; b=A91AFubtZH2g05lLcmeF7V+lnwqozfLlJ/5ykb4kYBzW5Gt79d6Cy0SX/YgxcxsnkQ SMLnJocs2v664dRC0/0C9073YqAkLU+Yd/jAacYsQqllDiO34XgtnObrFZKs/2yNUT+T ubw9AbmaQREtazMTtkmAEjTbbU4aepq+QWxT0sIb9Yfa4ZJganSAFp2HQ4Ce+fz9gkNs voxPJ8LiDWOPxywTrs4U+gJzjmBQ4XQHq6um7M0ztT8pulnZKAX7kRaHHMvX/swj+4Df yj5sKme2DyyQDSIIUbAOflMfDqFPnkun1bx8l3sYVxYaie/wUE06xNkvijgoveXbBJvK cYJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lqbvm6pq; 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 kd25-20020a056214401900b00635e2f1ec88si6576827qvb.476.2023.06.30.11.06.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jun 2023 11:06:11 -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=lqbvm6pq; 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 1qFIU2-0008LX-3x; Fri, 30 Jun 2023 14:04:38 -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 1qFITv-0008Hh-ND for qemu-devel@nongnu.org; Fri, 30 Jun 2023 14:04:31 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFITs-0006yb-AD for qemu-devel@nongnu.org; Fri, 30 Jun 2023 14:04:31 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3fbc59de009so13910035e9.3 for ; Fri, 30 Jun 2023 11:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688148267; x=1690740267; 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=lqbvm6pqNewUj6RaKfZVi7dE9g8W3q0ZBjF95DMcrcjTNDFusfskvIHAZLOvVzetEw dKryrBXBWXPB5kHTZeo/D8UtNTR/yhRFHw20GiEapa3TeDKxxSWfPkWphjuVsU2EBuX+ LwTOBmhYa3FRqRbsuECPn3H5VxN1DeCLEhTt1NlrkiUFW6x4kJB04DX9NEwA4FknAovm uhsSUF4gBoYM/sh7DpPQltOBDnoVWZopWMJyYEqw5fZJl1r0Go9z9wmOsdWsaauUbDI5 LXJ2xJqQDtgBuAKAzVPWabmUsuGKBnsRF7sHa/dmhZuM8Nabvem72ZAQToQWOmecIjJ5 vARw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688148267; x=1690740267; 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=XoGufJtdV6WS0+pehRuZW0fJkUnD5hE7aNFS1sjYAfTAk3Qalu8QiYVgIfwJ6g9lHZ uuRsruOHfN+dgEGt1RFKY+11+F5KiqEuQA82Vxz3DnBt84v6AzI4FYhpNrPhwAM6pa/V k5orxHotPOyElHrCda7zOY5I8J9vs9ZQUj6Jkncu6TFtTDu8JaMbeKoWIMVSXYZX9Oin MdcNx221OGXPdtzgrgylsispU/ad2MBOs+0HZ6dvXmpuShLp8sq13MIMGSKsYgravjRm jzNRI/7QDCCO7oUlxJCUUbaXIZ62x0QB5Pg7QwIZEuR7t9LvYJBx3z+vTGcJ830k+MRV Awww== X-Gm-Message-State: AC+VfDynxmX7Ios09OXR4R7P7qDzg+u4cc6NnDGCpO8rmzIFkGbimK4X XXEVK0eRg3FAnQe+dEhoN3g9Ow== X-Received: by 2002:a05:600c:218f:b0:3fb:5dad:1392 with SMTP id e15-20020a05600c218f00b003fb5dad1392mr2327208wme.17.1688148266903; Fri, 30 Jun 2023 11:04:26 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id c1-20020a05600c0ac100b003fba6a0c881sm10400961wmr.43.2023.06.30.11.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 11:04:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 748461FFC0; Fri, 30 Jun 2023 19:04:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Stefan Hajnoczi , Leonardo Bras , Laurent Vivier , Peter Xu , Juan Quintela , Beraldo Leal , Radoslaw Biernacki , Qiuhao Li , Peter Maydell , Yanan Wang , Riku Voipio , Wainer dos Santos Moschetta , Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Eduardo Habkost , Thomas Huth , Laurent Vivier , Bin Meng , Marcel Apfelbaum , Bandan Das , Cleber Rosa , Richard Henderson , Leif Lindholm , Marcin Juszkiewicz , qemu-arm@nongnu.org, Darren Kenny , Alexander Bulekov Subject: [PATCH v4 05/38] tests/tcg: add mechanism to handle plugin arguments Date: Fri, 30 Jun 2023 19:03:50 +0100 Message-Id: <20230630180423.558337-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230630180423.558337-1-alex.bennee@linaro.org> References: <20230630180423.558337-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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