Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by: Pierrick Bouvier <[email protected]>
---
tests/tcg/meson.build | 1 +
tests/tcg/mips/Makefile.target | 19 -------------------
tests/tcg/mips/meson.build | 25 +++++++++++++++++++++++++
3 files changed, 26 insertions(+), 19 deletions(-)
delete mode 100644 tests/tcg/mips/Makefile.target
create mode 100644 tests/tcg/mips/meson.build
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
index 10c7b21e308..57532e2faa6 100644
--- a/tests/tcg/meson.build
+++ b/tests/tcg/meson.build
@@ -145,6 +145,7 @@ subdir('hppa')
subdir('i386')
subdir('loongarch64')
subdir('m68k')
+subdir('mips')
image_targets = {}
exe_targets = []
diff --git a/tests/tcg/mips/Makefile.target b/tests/tcg/mips/Makefile.target
deleted file mode 100644
index 5d17c1706e4..00000000000
--- a/tests/tcg/mips/Makefile.target
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# MIPS - included from tests/tcg/Makefile.target
-#
-
-MIPS_SRC=$(SRC_PATH)/tests/tcg/mips
-
-# Set search path for all sources
-VPATH += $(MIPS_SRC)
-
-# hello-mips is 32 bit only
-ifeq ($(findstring 64,$(TARGET_NAME)),)
-MIPS_TESTS=hello-mips
-
-TESTS += $(MIPS_TESTS)
-
-hello-mips: CFLAGS+=-mno-abicalls -fno-PIC -fno-stack-protector -mabi=32
-hello-mips: LDFLAGS+=-nostdlib
-endif
diff --git a/tests/tcg/mips/meson.build b/tests/tcg/mips/meson.build
new file mode 100644
index 00000000000..3c4f6ec482d
--- /dev/null
+++ b/tests/tcg/mips/meson.build
@@ -0,0 +1,25 @@
+tests = []
+
+tests += tcg_tests['multiarch-linux-user']['tests']
+
+tests += {
+ 'hello-mips.c': {
+ 'cflags': ['-mno-abicalls', '-fno-PIC', '-fno-stack-protector', '-mabi=32',
+ '-nostdlib']
+ }
+}
+
+if 'qemu-mips' in emulators
+ tcg_tests += {
+ 'mips-linux-user': {
+ 'cc': 'mips-linux-gnu-gcc',
+ 'cc_dockerfile': 'debian-all-test-cross',
+ 'cc_docker_host_arch': ['aarch64', 'x86_64'],
+ 'cc_feat_cflags': cc_feat_cflags,
+ 'folder': 'mips',
+ 'gdb_arch': 'mips',
+ 'qemu': emulators['qemu-mips'],
+ 'tests': tests,
+ }
+ }
+endif
--
2.47.3
