From patchwork Fri Jun 23 12:20:39 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: 1798891 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=D73HOrWI; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qnbyl37Lvz20Xk for ; Fri, 23 Jun 2023 22:24:31 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfoU-0006an-7k; Fri, 23 Jun 2023 08:22: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 1qCfmo-0003kZ-Q1 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:12 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmi-0003gr-Ma for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:08 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3110ab7110aso620325f8f.3 for ; Fri, 23 Jun 2023 05:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522863; x=1690114863; 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=D73HOrWIhu2fC33oVmavdY6FdQfU+/K8O3x/sgrLpX75NeP8frQHts37plDdIVkd2r g2clhRovLNOt+yEWxGzMRc3O1sPT500lBJkcDbJmQ1RZkHgEC9GFYvdzhD3oKuo/efiT jZpDc87AlSwVEofLyIi40DYx1ZcJJKmNRX/ZFGWhb3iJ9kOPvckhl7E4+c7dxK2pp8Uz UexrErdhQvBOJm479WjTZOm1by+n+SQqnak5E0aDOnO0F8sqC61Z2aCSOmweBp/pWMQC phR91XCZODHtrImQ47Va3OdBiLPgQK51+N1PhC3lwSMQEA//nqkZahNSzq1RMCzXFPB8 YzMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522863; x=1690114863; 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=bUnj1Dwba6QTL2CbCnxcn5xv74dzcwMHflsiXGhwN5Vc1lv2cOcevU1QxzW6sNObqb 5ws5ldkdAxL5O1Smk7u5WuQWAPZEj2Z3kHzcB3ttrqW5EBALmzbnAptqVbfruj08G5ci CwZEhITzySGefF1XKmbfKhiGUKysBsS2VpYufnDBSAUJ14fxQXJsiwG0YRMyDUDcW7I6 NyOx+ubcf1Ndjg3hoWFdzdYLo3Rj4ki5GIxZpgPl/XB9wNcGDPxRLL7pjOz7Dr+uRBdE DObHceECskBijgv/T/UwlpwLS5Spls2ROcKCrNMVd8NUA7EcswBAK2t42hBcOqEVEWln ORKQ== X-Gm-Message-State: AC+VfDxMnWV4CYZy1WFitIU3oFrQrbcpI5kfSV+uG4W+9nkgRoMFTh1h 5+DntTnkZrYYu2DjMvULsj4VSw== X-Google-Smtp-Source: ACHHUZ78wHOFRDgFd8pur0oNNt9l2nIYhQ3p8/6zemG411mN/dWtSXsk60knAJha9XDMF8r9jgF4VQ== X-Received: by 2002:adf:f244:0:b0:309:4999:7549 with SMTP id b4-20020adff244000000b0030949997549mr16063793wrp.46.1687522863349; Fri, 23 Jun 2023 05:21:03 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y16-20020adfd090000000b003110dc7f408sm9389685wrh.41.2023.06.23.05.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1A50E1FFC0; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 05/26] tests/tcg: add mechanism to handle plugin arguments Date: Fri, 23 Jun 2023 13:20:39 +0100 Message-Id: <20230623122100.1640995-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.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