| Message ID | 20240729144414.830369-9-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Various fixes and tweaks for 9.1-rc0/1 | expand |
On 7/30/24 00:44, Alex Bennée wrote: > Since 4f8d886085 (tests/plugin/mem: migrate to new per_vcpu API) this > test was skipping due to not being able to run callback and inline > memory instrumentation at the same time. > > However b480f7a621 (tests/plugin: add test plugin for inline > operations) tests for all this matching up so we don't need the > additional complexity in avocado. > > Remove the test. > > Signed-off-by: Alex Bennée<alex.bennee@linaro.org> > Fixes: 4f8d886085 > --- > tests/avocado/tcg_plugins.py | 33 --------------------------------- > 1 file changed, 33 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 29/07/2024 16.44, Alex Bennée wrote: > Since 4f8d886085 (tests/plugin/mem: migrate to new per_vcpu API) this > test was skipping due to not being able to run callback and inline > memory instrumentation at the same time. > > However b480f7a621 (tests/plugin: add test plugin for inline > operations) tests for all this matching up so we don't need the > additional complexity in avocado. > > Remove the test. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Fixes: 4f8d886085 > --- > tests/avocado/tcg_plugins.py | 33 --------------------------------- > 1 file changed, 33 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/tests/avocado/tcg_plugins.py b/tests/avocado/tcg_plugins.py index 15fd87b2c1..a930fca2c0 100644 --- a/tests/avocado/tcg_plugins.py +++ b/tests/avocado/tcg_plugins.py @@ -120,36 +120,3 @@ def test_aarch64_virt_insn_icount(self): else: count = int(m.group("count")) self.log.info(f"Counted: {count} instructions") - - def test_aarch64_virt_mem_icount(self): - """ - :avocado: tags=accel:tcg - :avocado: tags=arch:aarch64 - :avocado: tags=machine:virt - :avocado: tags=cpu:cortex-a53 - """ - kernel_path = self._grab_aarch64_kernel() - kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + - 'console=ttyAMA0') - console_pattern = 'Kernel panic - not syncing: VFS:' - - plugin_log = tempfile.NamedTemporaryFile(mode="r+t", prefix="plugin", - suffix=".log") - - self.run_vm(kernel_path, kernel_command_line, - "tests/plugin/libmem.so,inline=true,callback=true", plugin_log.name, - console_pattern, - args=('-icount', 'shift=1')) - - with plugin_log as lf, \ - mmap.mmap(lf.fileno(), 0, access=mmap.ACCESS_READ) as s: - m = re.findall(br"mem accesses: (?P<count>\d+)", s) - if m is None or len(m) != 2: - self.fail("no memory access counts found") - else: - inline = int(m[0]) - callback = int(m[1]) - if inline != callback: - self.fail("mismatched access counts") - else: - self.log.info(f"Counted {inline} memory accesses")
Since 4f8d886085 (tests/plugin/mem: migrate to new per_vcpu API) this test was skipping due to not being able to run callback and inline memory instrumentation at the same time. However b480f7a621 (tests/plugin: add test plugin for inline operations) tests for all this matching up so we don't need the additional complexity in avocado. Remove the test. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Fixes: 4f8d886085 --- tests/avocado/tcg_plugins.py | 33 --------------------------------- 1 file changed, 33 deletions(-)