From patchwork Tue Jul 30 16:22:32 2024 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: 815320 Delivered-To: patch@linaro.org Received: by 2002:a5d:4acf:0:b0:367:895a:4699 with SMTP id y15csp375056wrs; Tue, 30 Jul 2024 09:24:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXu0dAjdZri6XtRdaS64hrW+SWekc2aeD6K+VOlIeuwYdcTLM1QE4Qe8QM4O74rFiCyMj2d/pEEZXt1ht4bLsS9 X-Google-Smtp-Source: AGHT+IGBvEGxhzop1NhqcTyfO36EVw9dSnWPqgTcwVvEfkT9P7C9CvQvuZEOZrKIQqoVz4bkPQjA X-Received: by 2002:a05:6214:29ce:b0:6b7:a2c2:6121 with SMTP id 6a1803df08f44-6bb55a4a93amr146256436d6.30.1722356664821; Tue, 30 Jul 2024 09:24:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722356664; cv=none; d=google.com; s=arc-20160816; b=TAN9507rmz8iOuYWuuZQQub/Q8cuTf4dIszEopHsx8waCccvXD963dbbR7KC+jCIVm 92sHmleg/g1Esf35iwo3VwFEV/yNtToGb913JLfuXu6cB+h7/MRIcpri+LexegTY3KdL JgkygZ7IKHiMZOy5Qra/3qRhoba/914HjlsLU1WgYxIsNkcAu9Qp1p5opEhPIzVT4WWl fzf6j2+lFcGhMHPN409H5nl+0s70Pm9E51Qdl3Nr4q++EgWIbSMQ3sw/mUkHNZJvUdXq EOpZ/B3GwtyXlpnXD4tJYy4c9ZhPEK1LkWDqXcocEz1blVP5aRJFuKWoYZrYXxPB3rDn UFYg== 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=5fyYDcDv5KTze2j09O6ktgDBKd/K+i4jbbZxm6SZYgw=; fh=yCGIEotPw5IZZY3kqWlFYzGDwn+Z91b1MKsufbfXZB4=; b=gA04bVsYJBCkiFd2gHM77D2jBl3zBZqES3deXaBXmcB7xrIYBAVFpzk0pn1hbglJMi NJqGKrJnDJ92jKG3u395Mhju8LZB9KiOxWEMR54bwhQbKLhucPCTzWLq7v6jpR57JoQp hQC2QKFmgV8ZPdwySwT9LKMmrRggTnH+ybL55bWB+433mfzPqFnyNJ7AT7bEhanytFuY 5ygK2JrC3aK0lFCANEKbsWXJfeIN63PXygUL2qXBKLpXmy/5dYamv2L0yywvp186ht9Z 7vznCk/9bLGh8dgkmGL6JH6Bld8DghgYqMtoOOYdPOAJLb6niyTAzmWpEwuIqD19NjK9 4vZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Pt+uDukV; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6bb3faabb97si127330886d6.354.2024.07.30.09.24.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jul 2024 09:24:24 -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=Pt+uDukV; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYpck-0000Os-Tp; Tue, 30 Jul 2024 12: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 1sYpcj-0000Gp-7D for qemu-devel@nongnu.org; Tue, 30 Jul 2024 12:22:53 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sYpcg-0003ZI-Qb for qemu-devel@nongnu.org; Tue, 30 Jul 2024 12:22:52 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a7abf92f57bso624400466b.2 for ; Tue, 30 Jul 2024 09:22:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722356569; x=1722961369; darn=nongnu.org; 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=5fyYDcDv5KTze2j09O6ktgDBKd/K+i4jbbZxm6SZYgw=; b=Pt+uDukV6XzCkr4vg4hpZabtXJryBTUPsi7HPzhbappBGLSq3rjYUOaeSB1tA7z7ia HXNlYXXoXaheWKfbU4ICtlGByMJ/09z4+0nZsqq0ZAi0S9zhgr2an6HYyaYFI21u2JNo t37Y0ajHAxvfzwM4DLM6ODM3kbkwEQ9aYG24BsWcnWCsqlw8J9YPWJr5WhwvpJGgohnl TTs+bSTuC+7fVq3HM58j1QZyTLeHTwNnqcZ+x0sZSUPaVDqXRkqhsQbC/TXvTt3cmYKs 7dUEkH1aL6HdIk/ODIlHFKD9IiuutxDoYyO/jN1xaM5fb9C8Nf9omGmsu1E1Fx52BZ5O Gs7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722356569; x=1722961369; 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=5fyYDcDv5KTze2j09O6ktgDBKd/K+i4jbbZxm6SZYgw=; b=SLj36Rs5RnGpWDAntausOCb6U37C1f5fRmt2Ml3D0qIoFhvT4FCC6Ld+QLob0YJ3WQ xFaX/9V7OV0ffwO93ygvKGt3zBhxdHy9skqXcSy+m5cO7xJjGHp7h0vmjqYti9/CFCj1 5ZgB2tbp7gev/hCkBCSafiY2mQelSvxeckS88GX1urjpYomLtOyBT7K5M1WihSVNVeUw fY3yl163DZFj2+HYtp0SkNvyRRIST0YDGbS8DD7oPeiDcOPwM7LiD0UdRxIMSgnuin3A BWxH6mPv2PlVfBbFi6xirK5Xa1QcNGE/yiwEY+2RxYVoGa0H3PoUBAwGPr66lvjx6u+C ZGTw== X-Gm-Message-State: AOJu0YyQg0FNUmXUJWmI1msgpcCud3LxcVZcQCl8nY5ZO1JN7et6L5nX 1ccepMmqNtcU/S4eN9a+Cb7njryqLazy4u4k2MLBc249ta6jUhJhItNvd41u0aI= X-Received: by 2002:a17:906:d555:b0:a7d:3ab9:6a5d with SMTP id a640c23a62f3a-a7d40175219mr693454666b.69.1722356568939; Tue, 30 Jul 2024 09:22:48 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acad903f1sm663624766b.152.2024.07.30.09.22.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 09:22:45 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B05D45FA06; Tue, 30 Jul 2024 17:22:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 09/14] tests/tcg: move test plugins into tcg subdir Date: Tue, 30 Jul 2024 17:22:32 +0100 Message-Id: <20240730162237.1425515-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240730162237.1425515-1-alex.bennee@linaro.org> References: <20240730162237.1425515-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.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 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 You cannot use plugins without TCG enabled so it doesn't make sense to have them separated off in the test directory structure. While we are at it rename the directory to plugins to reflect the plural nature of the directory and match up with contrib/plugins. Suggested-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20240729144414.830369-10-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 98eddf7ae1..72b3c67360 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3751,7 +3751,7 @@ R: Pierrick Bouvier S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/ -F: tests/plugin/ +F: tests/tcg/plugins/ F: tests/avocado/tcg_plugins.py F: contrib/plugins/ diff --git a/tests/plugin/bb.c b/tests/tcg/plugins/bb.c similarity index 100% rename from tests/plugin/bb.c rename to tests/tcg/plugins/bb.c diff --git a/tests/plugin/empty.c b/tests/tcg/plugins/empty.c similarity index 100% rename from tests/plugin/empty.c rename to tests/tcg/plugins/empty.c diff --git a/tests/plugin/inline.c b/tests/tcg/plugins/inline.c similarity index 100% rename from tests/plugin/inline.c rename to tests/tcg/plugins/inline.c diff --git a/tests/plugin/insn.c b/tests/tcg/plugins/insn.c similarity index 100% rename from tests/plugin/insn.c rename to tests/tcg/plugins/insn.c diff --git a/tests/plugin/mem.c b/tests/tcg/plugins/mem.c similarity index 100% rename from tests/plugin/mem.c rename to tests/tcg/plugins/mem.c diff --git a/tests/plugin/syscall.c b/tests/tcg/plugins/syscall.c similarity index 100% rename from tests/plugin/syscall.c rename to tests/tcg/plugins/syscall.c diff --git a/tests/avocado/tcg_plugins.py b/tests/avocado/tcg_plugins.py index a930fca2c0..a6ff457e27 100644 --- a/tests/avocado/tcg_plugins.py +++ b/tests/avocado/tcg_plugins.py @@ -77,7 +77,7 @@ def test_aarch64_virt_insn(self): suffix=".log") self.run_vm(kernel_path, kernel_command_line, - "tests/plugin/libinsn.so", plugin_log.name, + "tests/tcg/plugins/libinsn.so", plugin_log.name, console_pattern) with plugin_log as lf, \ @@ -107,7 +107,7 @@ def test_aarch64_virt_insn_icount(self): suffix=".log") self.run_vm(kernel_path, kernel_command_line, - "tests/plugin/libinsn.so", plugin_log.name, + "tests/tcg/plugins/libinsn.so", plugin_log.name, console_pattern, args=('-icount', 'shift=1')) diff --git a/tests/meson.build b/tests/meson.build index acb6807094..80dd3029cf 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -78,7 +78,7 @@ subdir('decode') if 'CONFIG_TCG' in config_all_accel subdir('fp') - subdir('plugin') + subdir('tcg/plugins') endif subdir('unit') diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 1f8e5b3d30..452a2cde65 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -142,8 +142,8 @@ RUN_TESTS=$(patsubst %,run-%, $(TESTS)) # If plugins exist also include those in the tests ifeq ($(CONFIG_PLUGIN),y) -PLUGIN_SRC=$(SRC_PATH)/tests/plugin -PLUGIN_LIB=../../plugin +PLUGIN_SRC=$(SRC_PATH)/tests/tcg/plugins +PLUGIN_LIB=../plugins VPATH+=$(PLUGIN_LIB) PLUGINS=$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c))) diff --git a/tests/plugin/meson.build b/tests/tcg/plugins/meson.build similarity index 70% rename from tests/plugin/meson.build rename to tests/tcg/plugins/meson.build index 9eece5bab5..f847849b1b 100644 --- a/tests/plugin/meson.build +++ b/tests/tcg/plugins/meson.build @@ -2,15 +2,15 @@ t = [] if get_option('plugins') foreach i : ['bb', 'empty', 'inline', 'insn', 'mem', 'syscall'] if host_os == 'windows' - t += shared_module(i, files(i + '.c') + '../../contrib/plugins/win32_linker.c', - include_directories: '../../include/qemu', + t += shared_module(i, files(i + '.c') + '../../../contrib/plugins/win32_linker.c', + include_directories: '../../../include/qemu', link_depends: [win32_qemu_plugin_api_lib], link_args: ['-Lplugins', '-lqemu_plugin_api'], dependencies: glib) else t += shared_module(i, files(i + '.c'), - include_directories: '../../include/qemu', + include_directories: '../../../include/qemu', dependencies: glib) endif endforeach