From patchwork Thu May 18 15:27: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: 683385 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp437656wrt; Thu, 18 May 2023 08:28:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5F/Zb/97LSn01JAu3P7ptLSQBPa/Ihpr5oqPpTWfaJn8GIluA5AsucKRMFflPW4Oa5vUis X-Received: by 2002:ac8:5915:0:b0:3f5:36c4:5ed0 with SMTP id 21-20020ac85915000000b003f536c45ed0mr239773qty.12.1684423716336; Thu, 18 May 2023 08:28:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684423716; cv=none; d=google.com; s=arc-20160816; b=ylvADFMw+s+VUGJRNiEbYYAE2lateoe4KEoxYnbBuA0RLhO6kwHzKSRcg0YuUE5gFk zAa8FcHjK6d+lMvU5A/GS8/XtFYTH/0qPCzzMA4k4Hw6sgavMYxpXgVAMpkbm0AFp0WI 3lMPrGnuJhgLzf0B4WK7Eg475oWGFpoR3c38fzfBg6lqGq2PKFrm6T/0p/sEeyUtsZ1M 0K34rE8zn3Pp3ISko1/3BF1s5KZUfYc1F5fSiMt1MUDman7m9hCi9+1HiJXPX7T+6Di5 1teNW5gYxoe13TkBUplS/OHyXmwwe7RqmP3AqNaezcepB29rhOoSX50x1wOuL5Lv+VoY 0NYw== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=GFzwhGKzsH6ESQx03OZTxPi8kAZtQoM+LD4DVTxCe+Y=; b=cDxQA7gUB0GrAtbbN1d6ptsdoynTGQOtDWcap1MhWV5Rz7e9JxtGivnhMZLxLmmoyZ /Zj2sjeBr5zTS/Vi/D7M3aE0fLvpvasOaQnXB05zHc5/i6sRCRBL+c6r6PqMp8HAM4SX Zb5zPTvq1k7U1tALMNiQsSXobA+grXrKXbR+s3JUS/TZuJAHvFq3gBlN0A+i7EbfyixX dhzV9h0Xow3m3EYW+xfGzutP1Pp/e01bi79O82vQ4bu3jNNkiVRMW5mO1VxFB1rY2ACS ca9GitiUI/hbbeqxrpK3uLLI+BRNMwH3oPewcwEmFmzf6GpPT08xeXtHowJWwqtFp7yE py6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oq4Q8e1y; 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 p5-20020a05620a112500b007578f042ea4si1163215qkk.192.2023.05.18.08.28.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 08:28:36 -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=oq4Q8e1y; 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 1pzfXY-0001Cc-4Z; Thu, 18 May 2023 11:27:40 -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 1pzfXW-0001CJ-IF for qemu-devel@nongnu.org; Thu, 18 May 2023 11:27:38 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzfXU-0003wf-PK for qemu-devel@nongnu.org; Thu, 18 May 2023 11:27:38 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f4ec041fc3so13863345e9.1 for ; Thu, 18 May 2023 08:27:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684423655; x=1687015655; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GFzwhGKzsH6ESQx03OZTxPi8kAZtQoM+LD4DVTxCe+Y=; b=oq4Q8e1yaXOULJ+slHkGVGQIlGjAuagiNGJIObVXw2n2EAzBo8gmnqKPTFFrDVXfJZ JmB/OWnU/B+47qgtJi8nFhHeH2AfsPibyBt2j522U4hVGe7rSzdu2S3Ke4FHmZHxQzv3 hWvFlEMmsS4kUr/iiX+nfZsbIycrIXMy4K+zlX95phbQuPtJVO2uMKQTFH6J0Cqe4ZI5 Hzuh4OrAoyYpYq/AtRjXjgWX26xC88ElOwbzLayDUlf0bIg/WVr3rHjViccxLduR1jgT tYCiQilp7v50MF6NpoujB0VRYjykQUO5xrDRWIWulcGo7Gwqv6Bjdtdmzxl/9/bfFUK8 oAhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684423655; x=1687015655; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GFzwhGKzsH6ESQx03OZTxPi8kAZtQoM+LD4DVTxCe+Y=; b=VX3ZYz8nqI1Yw7s50+/shQ52e8AHJYMtjKAJohpagXRe+yQLadMDCuNXgkjA+MYTRA cf/r1VMU/wNwu5icuhouijW/ppr818vFmvw/ZcPfoGVCyoMlMsMKJqNyBHY38W2u2ReV wrHYEfqZjFl2CsW4LMYxQCu2EoqZbAmdEYyaUCn8L6I6bRKKw9Yc5AOKonjgKRUT6wXa Q2madnc0omcou7suXzGttdeF05AIal+lmdW8q9A0IGJw5tCi7E2KKsHpHoBdlDWw049g 3sUy5kfXMVj5rr9RWtrl5bAFOP+UuOYfL+Nasaqsa+/NGuGTv/deJczLcs4br412cEKt me4g== X-Gm-Message-State: AC+VfDymHWTBCPN2gB7vEmn0hVeLMBRe+po4q+ZCoyWltYF92L86KKt8 M139sEuJN05xLl2UuGKmmRLrUw== X-Received: by 2002:a1c:7c08:0:b0:3f4:2cc3:2623 with SMTP id x8-20020a1c7c08000000b003f42cc32623mr1759348wmc.22.1684423654666; Thu, 18 May 2023 08:27:34 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u8-20020a5d6ac8000000b003079ed1f0a0sm2478763wrw.44.2023.05.18.08.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 08:27:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7CEC61FFBB; Thu, 18 May 2023 16:27:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [RFC PATCH] tests/tcg: add mechanism to handle plugin arguments Date: Thu, 18 May 2023 16:27:29 +0100 Message-Id: <20230518152729.1247541-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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 Cc: Richard Henderson 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