On 10/7/26 23:42, Pierrick Bouvier wrote:
Signed-off-by: Pierrick Bouvier <[email protected]>
---
tests/tcg/hppa/Makefile.target | 14 --------------
tests/tcg/hppa/meson.build | 22 ++++++++++++++++++++++
tests/tcg/meson.build | 1 +
3 files changed, 23 insertions(+), 14 deletions(-)
delete mode 100644 tests/tcg/hppa/Makefile.target
create mode 100644 tests/tcg/hppa/meson.build
diff --git a/tests/tcg/hppa/Makefile.target b/tests/tcg/hppa/Makefile.target
deleted file mode 100644
index ea5ae2186df..00000000000
--- a/tests/tcg/hppa/Makefile.target
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# HPPA specific tweaks - specifically masking out broken tests
-
-# This triggers failures for hppa-linux about 1% of the time
-# HPPA is the odd target that can't use the sigtramp page;
-# it requires the full vdso with dwarf2 unwind info.
-run-signals: signals
- $(call skip-test, $<, "BROKEN awaiting vdso support")
-
-VPATH += $(SRC_PATH)/tests/tcg/hppa
-TESTS += stby
-
-stby: CFLAGS += -pthread
diff --git a/tests/tcg/hppa/meson.build b/tests/tcg/hppa/meson.build
new file mode 100644
index 00000000000..9ca8f29fa93
--- /dev/null
+++ b/tests/tcg/hppa/meson.build
@@ -0,0 +1,22 @@
+tests = []
+
+tests += tcg_tests['multiarch-linux-user']['tests']
+
+tests += {
+ 'stby.c': {'cflags': ['-pthread']},
Should we mention the 'signals' test?
+}
+
+if 'qemu-hppa' in emulators
+ tcg_tests += {
+ 'hppa-linux-user': {
+ 'cc': 'hppa-linux-gnu-gcc',
+ 'cc_dockerfile': 'debian-all-test-cross',
+ 'cc_docker_host_arch': ['x86_64'],
+ 'cc_feat_cflags': cc_feat_cflags,
+ 'folder': 'hppa',
+ 'gdb_arch': 'hppa',
+ 'qemu': emulators['qemu-hppa'],
+ 'tests': tests,
+ }
+ }
+endif
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
index e6206ae670a..018bc480e18 100644
--- a/tests/tcg/meson.build
+++ b/tests/tcg/meson.build
@@ -138,6 +138,7 @@ subdir('aarch64_be')
subdir('alpha')
subdir('arm')
subdir('hexagon')
+subdir('hppa')
image_targets = {}
exe_targets = []
