Signed-off-by: Pierrick Bouvier <[email protected]>
---
tests/tcg/meson.build | 1 +
tests/tcg/mips64/Makefile.target | 20 --------------------
tests/tcg/mips64/meson.build | 27 +++++++++++++++++++++++++++
tests/tcg/mips64el/Makefile.target | 2 +-
4 files changed, 29 insertions(+), 21 deletions(-)
delete mode 100644 tests/tcg/mips64/Makefile.target
create mode 100644 tests/tcg/mips64/meson.build
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
index d8a96802d57..ab367896bf2 100644
--- a/tests/tcg/meson.build
+++ b/tests/tcg/meson.build
@@ -143,6 +143,7 @@ subdir('i386')
subdir('loongarch64')
subdir('m68k')
subdir('mips')
+subdir('mips64')
image_targets = {}
exe_targets = []
diff --git a/tests/tcg/mips64/Makefile.target b/tests/tcg/mips64/Makefile.target
deleted file mode 100644
index 042855844a8..00000000000
--- a/tests/tcg/mips64/Makefile.target
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# MIPS64 - included from tests/tcg/Makefile.target
-#
-
-MIPS64_SRC=$(SRC_PATH)/tests/tcg/mips64
-MIPS_OCTEON_SRC=$(SRC_PATH)/tests/tcg/mips/user/isa/octeon
-
-# Set search path for all sources
-VPATH += $(MIPS64_SRC) $(MIPS_OCTEON_SRC)
-
-MIPS64_TESTS=octeon-insns
-
-TESTS += $(MIPS64_TESTS)
-
-$(MIPS64_TESTS): CFLAGS+=-mabi=64
-
-run-octeon-insns: QEMU_OPTS+=-cpu Octeon68XX
diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build
new file mode 100644
index 00000000000..69391c23187
--- /dev/null
+++ b/tests/tcg/mips64/meson.build
@@ -0,0 +1,27 @@
+tests = []
+
+tests += tcg_tests['multiarch-linux-user']['tests']
+
+tests += {
+ '../mips/user/isa/octeon/octeon-insns.c': {
+ 'qemu_args': ['-cpu', 'Octeon68XX'],
+ },
+}
+
+# export tests for mips64el
+tcg_tests_mips64 = tests
+
+if 'qemu-mips64' in emulators
+ tcg_tests += {
+ 'mips64-linux-user': {
+ 'cc': 'mips64-linux-gnuabi64-gcc',
+ 'cc_dockerfile': 'debian-all-test-cross',
+ 'cc_docker_host_arch': ['aarch64', 'x86_64'],
+ 'cc_feat_cflags': cc_feat_cflags,
+ 'folder': 'mips64',
+ 'gdb_arch': 'mips64',
+ 'qemu': emulators['qemu-mips64'],
+ 'tests': tcg_tests_mips64,
+ }
+ }
+endif
diff --git a/tests/tcg/mips64el/Makefile.target
b/tests/tcg/mips64el/Makefile.target
index dbc5f8dc5fe..78c722a583d 100644
--- a/tests/tcg/mips64el/Makefile.target
+++ b/tests/tcg/mips64el/Makefile.target
@@ -5,4 +5,4 @@
# MIPS64 little-endian - included from tests/tcg/Makefile.target
#
-include $(SRC_PATH)/tests/tcg/mips64/Makefile.target
+#include $(SRC_PATH)/tests/tcg/mips64/Makefile.target
--
2.47.3
