Signed-off-by: Pierrick Bouvier <[email protected]>
---
tests/tcg/m68k/Makefile.target | 7 -------
tests/tcg/m68k/meson.build | 23 +++++++++++++++++++++++
tests/tcg/meson.build | 1 +
3 files changed, 24 insertions(+), 7 deletions(-)
delete mode 100644 tests/tcg/m68k/Makefile.target
create mode 100644 tests/tcg/m68k/meson.build
diff --git a/tests/tcg/m68k/Makefile.target b/tests/tcg/m68k/Makefile.target
deleted file mode 100644
index 33f7b1b1275..00000000000
--- a/tests/tcg/m68k/Makefile.target
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# m68k specific tweaks - specifically masking out broken tests
-#
-
-VPATH += $(SRC_PATH)/tests/tcg/m68k
-TESTS += trap denormal
diff --git a/tests/tcg/m68k/meson.build b/tests/tcg/m68k/meson.build
new file mode 100644
index 00000000000..8ecf450ac68
--- /dev/null
+++ b/tests/tcg/m68k/meson.build
@@ -0,0 +1,23 @@
+tests = []
+
+tests += tcg_tests['multiarch-linux-user']['tests']
+
+tests += {
+ 'denormal.c': {},
+ 'trap.c': {},
+}
+
+if 'qemu-m68k' in emulators
+ tcg_tests += {
+ 'm68k-linux-user': {
+ 'cc': 'm68k-linux-gnu-gcc',
+ 'cc_dockerfile': 'debian-all-test-cross',
+ 'cc_docker_host_arch': ['x86_64'],
+ 'cc_feat_cflags': cc_feat_cflags,
+ 'folder': 'm68k',
+ 'gdb_arch': 'm68k',
+ 'qemu': emulators['qemu-m68k'],
+ 'tests': tests,
+ }
+ }
+endif
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
index 451fe349a3e..48895c7619c 100644
--- a/tests/tcg/meson.build
+++ b/tests/tcg/meson.build
@@ -141,6 +141,7 @@ subdir('hexagon')
subdir('hppa')
subdir('i386')
subdir('loongarch64')
+subdir('m68k')
image_targets = {}
exe_targets = []
--
2.47.3
