From patchwork Tue Jun 27 16:09:12 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: 696873 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3866248wrm; Tue, 27 Jun 2023 09:14:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5NSh3rJkBAtlTKjA3Gq8RsEtuTH+j2oTa1v8xwIsb3Qo/1azEgwwUl7jYWwCJ5L2Cyu84J X-Received: by 2002:a05:6214:21eb:b0:635:f640:676a with SMTP id p11-20020a05621421eb00b00635f640676amr699931qvj.47.1687882461696; Tue, 27 Jun 2023 09:14:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882461; cv=none; d=google.com; s=arc-20160816; b=Vskbvb05blAdmhPhK1D26harR7T5ZPOFqS/yvFNgSiogi9tG9a2fJdRIYLPorovLS5 CPy7ocVdbTYw2qn7BfVZbttotqdNzteD3kuzgzVnp4N646eBLsGkzv+ELwhshwvPLCdQ IqQ7CkaWnqxVQIHo9QCcSS4h0zXHf4/0nrY1lJOsA4kx35u8I8HEIrhdrfyW1Hyv1lkU mIAQ+sCWCenRAIYp00tt/CJmikzNig6hQj94NrAoXaEY4tW/x8lyuVbIjUPj380Y5jV6 Q5IY/0+k7x+e87h+Og7B3Hqhr3to2UCUvGUp+LlZH761om4DMuEZRU4HiB8Ur63ziBhh kpww== 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=ArV5Yx1z9lg+jufSSsiXTUg87d1rJ5PmrQDHLSB2i58=; b=LYL39NFFZBPAK5Z+c2Up1gPSgqD/8YHVSjuh6tiYo34bwdlgp/HOmQDpca0Y1jig/7 ozleY6PXV1IOAXsnIfpqHKdgobAad28k1BZNkBAEh5Qxkbg/IsJnS+vH8d4nE0ltfDYw nY8ytPRCAZtnJuUlt2ZgesxoqxWB3g+n4JIKvtIfiRvkitZ/45ixnwTSFKKQm0V5qY92 gCHb9doW25T49Iv/XomxnRlVgfpZuxzl2M4i9u/uY5cyboT9AHVQU0CLjA4vyJIrhCeJ 0k4W5HYfCYLApQJXJuGgJka59dQ2ykAjOlK7omElBW7jZR5EJt9WG+o6DN/x7BhR0ZJO myZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N6DxqWEp; 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 i11-20020a05620a404b00b0076717c67077si388970qko.466.2023.06.27.09.14.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:14:21 -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=N6DxqWEp; 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 1qEBGM-0008CE-QN; Tue, 27 Jun 2023 12:09:54 -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 1qEBGK-0007yz-GZ for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:09:52 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEBGG-0005n5-EZ for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:09:51 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-307d20548adso4301297f8f.0 for ; Tue, 27 Jun 2023 09:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882187; x=1690474187; 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=N6DxqWEpDaZFMfJUwBhRUYwjTDHR2Xnnw+CMoIDrWw1VxmyyEqK6K9KspgCmDLKFNF TEZ8ZabNFHuQVNo/4lc+Wzkn2Iee++V89cbrDnh+quQR20BpLwIwMwKyhC8Y4I7E6TqF 2wm/SweLa7gasuTTObx2P1/A4A6tLGbwV4RbJkwwoC/WX71LgmInzk45vEiaF1Oi3NSj 92cnaHUxSMrCfzneYKW8Z+kzIQe2jnywzLNdvie0J/1uupZRO5Sn6ELItZhNq57D1lmK FLvJ0q9/IMS/Okd5TSCYiNngLmJ5Li3j1G74tS2IV4HN1az66EC9/dW0x7OjAEY6Pcn8 v2Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882187; x=1690474187; 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=KHmOdsYjq2mpnU2neXifm8XHn6UInUsfzYKH3MwmNkgMFrXVgLOwe6sMG10X3t4wL8 We83yW9HRkdT8YcQzjT8bMbUUbCnCi3Q95aKlm/yhrsjA/Nd8Ti68QobAsoQy9YGa6+T QQYlNK6YKq1Hct5m0TFeNoG16BUxQZpevChKyRrWAx/qPAkkpgMqeyCSP+T1EpAStWQ6 SIX4MuphE5ilM0lqIHWdI4xPKmGeq8Wre7cdj19WbSs3AF31MIB7PiHq2qI0fDcGn+UK 1ZSLRMDxCQd6WHdTS+u4B2QKZx3fNgm/CBmaRxvGXwHROXfH7aaCIyC/nQZYFL2YV5e7 /ApA== X-Gm-Message-State: AC+VfDzWGVGCEs0k68s+s3NxgWR+AHeTFYvQG2ENGXkhKs4Svwn2xDzs Nm7VK5Hry4CSLd+TakGLFkdWJw== X-Received: by 2002:adf:e90d:0:b0:313:f623:4dbe with SMTP id f13-20020adfe90d000000b00313f6234dbemr3823646wrm.58.1687882186688; Tue, 27 Jun 2023 09:09:46 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f4-20020a0560001b0400b00307a86a4bcesm10877402wrz.35.2023.06.27.09.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:09:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7269F1FFC1; Tue, 27 Jun 2023 17:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Juan Quintela , Thomas Huth , Cleber Rosa , Leonardo Bras , Beraldo Leal , Peter Maydell , Bin Meng , Yanan Wang , Darren Kenny , Alexander Bulekov , Marcel Apfelbaum , Peter Xu , Radoslaw Biernacki , Laurent Vivier , Paolo Bonzini , Eduardo Habkost , qemu-arm@nongnu.org, Stefan Hajnoczi , Richard Henderson , Bandan Das , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P=2E_Berrang=C3=A9?= , Alexandre Iooss , Marcin Juszkiewicz , Leif Lindholm , Laurent Vivier , Qiuhao Li , Mahmoud Mandour , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 05/36] tests/tcg: add mechanism to handle plugin arguments Date: Tue, 27 Jun 2023 17:09:12 +0100 Message-Id: <20230627160943.2956928-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160943.2956928-1-alex.bennee@linaro.org> References: <20230627160943.2956928-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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