From patchwork Thu May 18 16:20:31 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: 683393 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp465147wrt; Thu, 18 May 2023 09:22:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ616/N6U4QLjnfZ2LqjjlMRaDZysFHG5yUa9gCa2So3F/1iqh+Clwf2jVsUjMwk47/SDzho X-Received: by 2002:ac8:5f87:0:b0:3f5:30fd:a2ca with SMTP id j7-20020ac85f87000000b003f530fda2camr429271qta.19.1684426942847; Thu, 18 May 2023 09:22:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684426942; cv=none; d=google.com; s=arc-20160816; b=eLDdhuHLpTFxkmUKKVg6lPsAd5nCE36Lv9glErrxNkB8liF9rZ8OGxK9ghEsYcwzJB e5cu1cLadhjpe7UR7TXwJjXF9jXzCiDcAJsAioBgiH5liva4oLZT4Ts21E1HdGF3ieUf nf7mlVMLqw+H1h1sYOjyIDMIEs0YIGw4DZzZd7haYa0k0JU4E569n82vzncjMqGKcWZ1 vRKD2DL2JjqPQo4+W4MTxl9Ipo6wF9h+2MmlNFyLwvTeSlJeQgIVsUVXIHrYHWmVGmHG jZfUCMGdfw+SB/iwijfKwJj4uyLMJxWv9cIPcw5tUn1WZLQYg9GczUG6k8goCKSmakN9 FAZg== 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=9WUqhetdgE59J23w7OMYoxJNBVAN+y7zryiCeyC7VBI=; b=CSeiW0DXOiM2m+0hgq20AiiHDUPsR5GAr/AtEXqSFOCQ/mCVg9zliZ66JD8nLwZhe6 VAAUcpDKoyrw3MHwCnjr+B1NzMxwCyoLyxEYstcPpNgKKXdtGeS6OeZ9X1cwnlFW8NrT yw1+ywFXwWjOnLCYhtXVoKlHnOymVVB08XtWbHwDtlm2c0+Z+1WKYs9gLaidHxSKojmb 5e2k/VMHDF/3Z7bUnNcF8hg9VtLgHvLgkS/zww2pOtkHhdLIBSVoZp2/K82eFPHompV6 k+Pqp8AOWAzMlKwbdyzjMhKXRQtWBa9sJvUtdK5E3/yG8wMN5IYXIEaXESsjKDAxbOYz D7Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qau3oOcj; 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 y10-20020ac85f4a000000b003e457751d2esi1247652qta.494.2023.05.18.09.22.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 09:22:22 -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=Qau3oOcj; 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 1pzgMz-0007dt-2K; Thu, 18 May 2023 12:20:49 -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 1pzgMq-0007Yu-Qa for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:41 -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 1pzgMo-0006OZ-MN for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:40 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f42d937d61so21650905e9.3 for ; Thu, 18 May 2023 09:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684426836; x=1687018836; 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=9WUqhetdgE59J23w7OMYoxJNBVAN+y7zryiCeyC7VBI=; b=Qau3oOcjErE/jFx+eo+rc5cuzF3WT7T8Df+bZQMtDy/Q3Q95S+POVsea/xwygBkx7+ EfcrVXiS4ZYrNhkbSYVwjJGZChFmOEqmaACJGH/+2EJM2Qcgvehr4C2JTQ4/jCj4WpRZ j6Qfm293ITNKu+67scqBsbXLh2RJYcmpzYiXuEy7abCP6ip7ZepJ33ityp6mEjF+3pba xJ7ZymEkENc9R8yjonEF0aMHjJia1/NIPuhe12mg3GEXD29rzia9tgq5W9utrtBDVz1I c0gUYsNdPuuXAVXWB0AGT4wZWNIT/XZ6FbXh3gYdlNkDAKUhQxTFNX0fCCQvGoxcngb/ 6S/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684426836; x=1687018836; 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=9WUqhetdgE59J23w7OMYoxJNBVAN+y7zryiCeyC7VBI=; b=kEGCAYl2YOTHuAtumKCfEEnpQEceLeWttG9IcWyo3cLrCqgzl5H8sGsAoimRlLPUoN cpuuDXKZnG16RsUMq9Gyc9fxla3hTpoN3H7fyhK8LO9iAvN2OJNIHeAwo83r8JpWpJx3 f8uHMrGWOcTUuuJ5vj58n+2DUZKitvsE3Y4TkqNtvr2zlQy13D18lnyN8+HKejkLRXO/ T4XPJVig0N6YwvTt6vYjNmKhhAfOhMSEVQJ5hXjE04pD7eFBvjaiAQ7GBLPReUcItdUZ 6eDRAw0goUXEvaxw48UvJuB3JTKkvLXmHLyhl90sRkCrT+EOUyvIjgyKAKjGBDVogo3G e9gg== X-Gm-Message-State: AC+VfDygSKL1PGW8x6D5RljIuZKIHauH7Ra+pYSPvenzw0dfx/vOZHk9 3pnaX0RtEVTB46LG7WnKnCbE1Ee+pepa8BHkdG0Nyg== X-Received: by 2002:a7b:c012:0:b0:3f3:468d:d017 with SMTP id c18-20020a7bc012000000b003f3468dd017mr2055206wmb.6.1684426836713; Thu, 18 May 2023 09:20:36 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k4-20020a7bc404000000b003f4e3ed98ffsm2469032wmi.35.2023.05.18.09.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 09:20:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BCCA31FFC0; Thu, 18 May 2023 17:20:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Richard Henderson , Peter Maydell , Thomas Huth , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Mark Cave-Ayland , Wainer dos Santos Moschetta , Cleber Rosa Subject: [PATCH 5/8] tests/tcg: add mechanism to handle plugin arguments Date: Thu, 18 May 2023 17:20:31 +0100 Message-Id: <20230518162034.1277885-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518162034.1277885-1-alex.bennee@linaro.org> References: <20230518162034.1277885-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. 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