From patchwork Mon Jun 26 20:25:14 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: 696491 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3416939wrm; Mon, 26 Jun 2023 13:27:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5CkzmIcK1wzXQ0DFLdbFiRBGjcZD6iXo3S4g/U8WZVklSW/DIrqb8FJrUSjgjE5maIIGcs X-Received: by 2002:a05:620a:290b:b0:765:7957:1b06 with SMTP id m11-20020a05620a290b00b0076579571b06mr8156454qkp.10.1687811226793; Mon, 26 Jun 2023 13:27:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687811226; cv=none; d=google.com; s=arc-20160816; b=aTm4/F0XLPOZXHVDmCm60HJwsycYOGr939/IDdetJB7UqLdBraLNyox8N5siYnz8kH DyDFoEDWWRf+tW5+atiH+ca61fuV46m/v29ZmTI/iHh+ymIKGXuni8XH2b4n8zQCUAPy SUNr+MR2rl7+YDB8hAzceOYZARXsylhjsw4Ow6cIWHbBeyLZpKObT/+MmHjMYfLNfPNj 2WrXl8j37num9eWCN221FziXRPxoNS5Q25Hhto5Urpo6tZ0lEPs2KKGj3nWi4kasfR5s yq7buCf/8HMaAGfBys+iyr6/6HVO+aZnrZiv5Vxsvm3thE84HNNi45lcQPesfZyW/QLO M+zQ== 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=+72hqC9CJwo/HJv/dERzrbqiWQh1jGfkEiyYBAgNgqs=; b=bg7o1F2QmwDAixLfbwxQELLPxwUNd4h3tO5RYNEBreDMSpGMKrTkcdHW2bExw4CSJJ cuvd7UbSG81WWo+oVtNY3FwNdOXC+7gf6hXZ9RsoaeZ+3igP18aJ2s+zfUzCBbr3+Jo2 CyHIHhDWO6A4p9FkfVlN+HmsqK8eNdBiJ24IBlqs0bAxpklOCLvkaxCIyak1k39e2/e3 4yiFItAVhPOnHgk9RBnmoSh6sQBe+Zxgi+TeTv0+ajyiXtN4J2qXe3xbtaACl1gt1yU+ 6j7Ts4QqtokqdP0FPzwD5QWxg4BhB8OSYYN4qGdgTFnhHw4iWvOChFg3i+6xu3gglhht N3Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rVhts01U; 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 g11-20020a05620a40cb00b00763d326cf39si2275400qko.266.2023.06.26.13.27.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 13:27:06 -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=rVhts01U; 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 1qDsmI-0005za-0F; Mon, 26 Jun 2023 16:25: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 1qDsm5-0005dA-CW for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:25 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDsm2-00055s-Fy for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:25 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-313f58d6652so1159649f8f.2 for ; Mon, 26 Jun 2023 13:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687811119; x=1690403119; 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=rVhts01UgxFKWFD6Ed4/uRW1uKUHrgq1waUaAUJ8PfdUVhVgqj0Q+O29ZeoatrHHzU GTvAGqOIXa9E04Oc2E+7hYhS6SGrAHr4CGtKP/ZD9Ba2te6FcxLvqWwA89RC59gemeZy fvUJN5vb1K25J4O0o8Vp+KG4Fhy+/qdMf1fageBgCXmcY02ds5cKfemzuT+qs1lvD1JD WOuqkBcOgG+j47RjOntogoNo7nHYTvylQXlxm3QB/gEy05FQpsWwPiiZAwJTyfkNjp3v w+TTbIP9XhbnTXABqIMEjMat3q90y3FkKOzXK+of7I5rkZQjZKYIVgr5VhTErui/DAHQ rtxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687811119; x=1690403119; 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=iTf1Fra3/3OmIBJ7Yl9wmP2+/6D1GGDxDUQJQrAr2ULuV7H5yuRdKNlKFNwgfUkvM/ +75OUXaRS5bs7UryI/ZiFgshl98rnB+7KOufUxNJhC56i5dlBkzEHAWHtaLeGPJ4Iv7N pyTShvBt7JLw1/5v2stVKr1AFLkD+w9jCQ/qUT1gcChYvma4R+a0IlmpbuU5k0TadswU 8V3FIEIsCZPxmLU99E488vMMyBaQfPPOVdHZDPV6XQs7DW6E0TseUXAryy6VTMoQkyDI YUmPKB8zGgqHgihi9I9PCtxHoe+fZrpX05bzdHFDnERJyPMZW2ed0Cwm2o2GKvhhMdhw iBWA== X-Gm-Message-State: AC+VfDzZ5CYW5mx5JnBoh1yrWjtxDmdkZYVU1jns2fN91tNAT6G/9Sme E5aqwa+a2AYmVLVfn9Zs2KkYpA== X-Received: by 2002:adf:f752:0:b0:313:f54a:a842 with SMTP id z18-20020adff752000000b00313f54aa842mr2067793wrp.63.1687811119177; Mon, 26 Jun 2023 13:25:19 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t24-20020a1c7718000000b003f91e32b1ebsm11506372wmi.17.2023.06.26.13.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 13:25:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A447E1FFC0; Mon, 26 Jun 2023 21:25:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Qiuhao Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Juan Quintela , Marcin Juszkiewicz , =?utf-8?q?Daniel_P=2E_B?= =?utf-8?q?errang=C3=A9?= , Eduardo Habkost , Alexandre Iooss , Peter Xu , Yanan Wang , Mahmoud Mandour , Peter Maydell , Bin Meng , Marcel Apfelbaum , Beraldo Leal , Richard Henderson , Leif Lindholm , Paolo Bonzini , Thomas Huth , Riku Voipio , Cleber Rosa , Alexander Bulekov , =?utf-8?q?Alex_Benn=C3=A9e?= , Radoslaw Biernacki , Bandan Das , Leonardo Bras , qemu-arm@nongnu.org, Darren Kenny , Wainer dos Santos Moschetta , Laurent Vivier Subject: [PATCH v2 5/6] tests/tcg: add mechanism to handle plugin arguments Date: Mon, 26 Jun 2023 21:25:14 +0100 Message-Id: <20230626202516.2507915-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626202516.2507915-1-alex.bennee@linaro.org> References: <20230626202516.2507915-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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