Re: [PATCH 2/2] tests/functional: Allow running TCG plugins tests on non-Linux/BSD hosts

[Pierrick Bouvier]

On 2/19/25 11:23, Philippe Mathieu-Daudé wrote:

Not all platforms use the '.so' suffix for shared libraries,
which is how plugins are built. Use the recently introduced
dso_suffix() helper to get the proper host suffix.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2804
Suggested-by: Pierrick Bouvier <pierrick.bouv...@linaro.org>
Suggested-by: Daniel P. Berrangé <berra...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
  tests/functional/test_aarch64_tcg_plugins.py | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/functional/test_aarch64_tcg_plugins.py 
b/tests/functional/test_aarch64_tcg_plugins.py
index 7e8beacc833..306e46c7972 100755
--- a/tests/functional/test_aarch64_tcg_plugins.py
+++ b/tests/functional/test_aarch64_tcg_plugins.py
@@ -16,7 +16,7 @@
  import re

from qemu.machine.machine import VMLaunchFailure

-from qemu_test import LinuxKernelTest, Asset
+from qemu_test import LinuxKernelTest, Asset, dso_suffix

class PluginKernelBase(LinuxKernelTest):

@@ -62,6 +62,10 @@ class PluginKernelNormal(PluginKernelBase):
          ('https://storage.tuxboot.com/20230331/arm64/Image'),
          'ce95a7101a5fecebe0fe630deee6bd97b32ba41bc8754090e9ad8961ea8674c7')

+ def plugin_file(self, plugin_name):

+        suffix = dso_suffix()
+        return f'tests/tcg/plugins/{plugin_name}.{suffix}'
+
      def test_aarch64_virt_insn(self):
          self.set_machine('virt')
          self.cpu='cortex-a53'
@@ -74,7 +78,7 @@ def test_aarch64_virt_insn(self):
                                                   suffix=".log")

self.run_vm(kernel_path, kernel_command_line,

-                    "tests/tcg/plugins/libinsn.so", plugin_log.name,
+                    self.plugin_file('libinsn'), plugin_log.name,
                      console_pattern)

with plugin_log as lf, \

@@ -100,7 +104,7 @@ def test_aarch64_virt_insn_icount(self):
                                                   suffix=".log")

self.run_vm(kernel_path, kernel_command_line,

-                    "tests/tcg/plugins/libinsn.so", plugin_log.name,
+                    self.plugin_file('libinsn'), plugin_log.name,
                      console_pattern,
                      args=('-icount', 'shift=1'))

Reviewed-by: Pierrick Bouvier <pierrick.bouv...@linaro.org>