From patchwork Tue Jun 27 16:06:29 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: 696861 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3864661wrm; Tue, 27 Jun 2023 09:11:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5aC/F8axlQR4bU5A5M62aogMmy+8j+2tQQgj5CMdHUWT+uxmr3l1jhbRpZGSoME0ZxLk0Z X-Received: by 2002:a05:620a:3902:b0:765:70cf:d7a4 with SMTP id qr2-20020a05620a390200b0076570cfd7a4mr10192154qkn.71.1687882293307; Tue, 27 Jun 2023 09:11:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882293; cv=none; d=google.com; s=arc-20160816; b=cXa78knXas/NZPN2TIFojFHuHqha6Ty+tEp8FmAP3ocZLZA1V3QOlYLSTzknA4SmGe yuy5udGSldNDiFPz7QnLqV7Uf5HHrGQcsMxqpQkyqbZ1O1VM7hoxzJbsjUsF0y06wK5v 6wMke3bS0uvVqyBRS/9HqcGFXlY5pk7PHQs4bxgcL4iAQh+z/g7I5i+SBiauNA9mKW67 O1NU6uVAjblHYJLd5FysimOjgQpwnxp6geM9brf6GB/h7rupag9j7CVcrsieKfaG+PSy niFOmgF2rDh9eXgHOpOQyUOv1Cx57VlX0+bTMlkUESuBXGUVZiqvxchTpE4wbjxahtzh oNzA== 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=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=FzuqQ99Y4sbwSJD1fD3q6J7WdQiJVk1kLQRo3r9Ewwb4pnxAV6Tc51T49QZuwzu1fH 3ZQ0u8EbeL1W6vKpjq5Vrc38m538BWoRve50Si4m4y7+leahVWUum1Iimk0iYLaJKo3n YYDIkG/1aAD3bIC4WtZAu4D/psHDwlh+dbc+GC7DRxg1XTky6rZxuOBldNRraNNEbppu FFU1gx49xLlNvJa2YC+S4piltYWSUc6/yC5GSMBBud13HHxClVZns7iNkweLJ1wtr+8q Ymy9eETRO3TXeSoErLbntWbdGtONWh+CeVvA7qqpBcmtYrTS56pAH93Fh7ywLwZU6OmS vIMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BImmWDS1; 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 uw7-20020a05620a4d8700b007639d123e23si3301449qkn.26.2023.06.27.09.11.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:11:33 -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=BImmWDS1; 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 1qEBE2-0000KZ-II; Tue, 27 Jun 2023 12:07:30 -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 1qEBDh-00009i-QL for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:09 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEBDd-00057K-H4 for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:09 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3fb10fd9ae9so21485895e9.2 for ; Tue, 27 Jun 2023 09:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882024; x=1690474024; 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=BImmWDS1AhWeNAqHgZ1mRvKhHyuW1pnoYGmQZkwgX/zB/yNEaqmpiJgy0CHvx1K/Et +ajzyDCHkA166ee0WMRI8OJM8PJ0MsRF3edfl0KYyLw9p0jqbiMfZteslS1LuuA07CY5 e5KKch2klLZlL6RK+2N2X9c44mV6F/ilBqMN/IN7CTR3l4320qF6cmrLjcBceVCWKDYA J7Rf1lX8T4iQ9cjztdBPtrzH19j3wr7xj036eD2IxDpnzxYsMvGVgvGK0oHoj7V5ra6g mn75riyd20SG5ceftVFOZ0iBrA5lgu9GF3om0CSSWS4c6zhsLpxas+Q7Blc7YqrHyrgL WPNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882024; x=1690474024; 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=UuVGHImzD+XinOv9EFV1TC5fjpUeWwDGOWhXzXWswuqMSWfAnGC1NimEAoDflrGaVc Gqvbz0CJOyLPkW3fRHkFVTsoodqh8Q9r0yxsiWtJXovI/kcbOYNdNKxh9Zv+O35bKw40 ngaXGsRd7nRKEJqkh0EMArDRd7GJ0KdpGXfgn4tHCOPim7uzdpbvNlHd8qOjqKU6Wt7X 5oZzRKabvxp8Sw5BpfjyQQZDCUm3GXlO3zkuVlQAmhZnVP+At3fJk46AgKbDnBmS4eWb oLC5iwCUWGrMNo2oO8q7PmjppZ+zG+2dRLMoIUGRfoXUwgtVIp1jDG+zDYu92Gn/sJ2m uDlA== X-Gm-Message-State: AC+VfDy7DuyaYyGshgJwMCZ4WaKPmF52EroT/oNJX5/Kidt5hX5mWN0O 12zZV2SQpHzd9tS4tIhR5EvDFw== X-Received: by 2002:a05:600c:ad4:b0:3f9:b8b8:20df with SMTP id c20-20020a05600c0ad400b003f9b8b820dfmr15197504wmr.33.1687882023856; Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m21-20020a7bca55000000b003f4248dcfcbsm14145540wml.30.2023.06.27.09.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5968A1FFC0; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 05/36] tests/tcg: add mechanism to handle plugin arguments Date: Tue, 27 Jun 2023 17:06:29 +0100 Message-Id: <20230627160700.2955547-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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=unavailable 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