[Buildroot] [PATCH 2/2] support/testing: replace x86-64 with aarch64 for ZFS tests

José Luis Salvador Rufo salvador.joseluis at gmail.com
Tue Jan 21 13:47:42 UTC 2025


Previously, ZFS tests were limited to x86-64 due to lack of cross-platform support.
However, upstream efforts have improved cross-platform compatibility.
Update the ZFS test platform from x86-64 to aarch64, aligning it with other tests.

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis at gmail.com>
---
 support/testing/tests/package/test_zfs.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py
index 967da098e1..1b907ac4de 100644
--- a/support/testing/tests/package/test_zfs.py
+++ b/support/testing/tests/package/test_zfs.py
@@ -7,15 +7,16 @@ class TestZfsBase(infra.basetest.BRTest):
     timeout = 60 * 3
     config = \
         """
-        BR2_x86_64=y
-        BR2_x86_corei7=y
+        BR2_aarch64=y
         BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
+        BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
         BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
         BR2_LINUX_KERNEL=y
         BR2_LINUX_KERNEL_CUSTOM_VERSION=y
         BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.9"
         BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-        BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config"
+        BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config"
         BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
         BR2_PACKAGE_ZFS=y
         BR2_PACKAGE_PYTHON3=y
@@ -28,13 +29,14 @@ class TestZfsBase(infra.basetest.BRTest):
         """
 
     def base_test_run(self):
-        kernel = os.path.join(self.builddir, "images", "bzImage")
+        kernel = os.path.join(self.builddir, "images", "Image")
         cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio")
         self.emulator.boot(
-            arch="x86_64",
+            arch="aarch64",
             kernel=kernel,
-            kernel_cmdline=["console=ttyS0"],
-            options=["-cpu", "Nehalem", "-m", "320", "-initrd", cpio_file],
+            kernel_cmdline=["console=ttyAMA0"],
+            options=["-M", "virt", "-cpu", "cortex-a57", "-m", "320M",
+                     "-initrd", cpio_file],
         )
         self.emulator.login()
 
@@ -64,7 +66,7 @@ class TestZfsBase(infra.basetest.BRTest):
 class TestZfsGlibc(TestZfsBase):
     config = TestZfsBase.config + \
         """
-        BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y
+        BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y
         """
 
     def test_run(self):
@@ -74,7 +76,7 @@ class TestZfsGlibc(TestZfsBase):
 class TestZfsUclibc(TestZfsBase):
     config = TestZfsBase.config + \
         """
-        BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE=y
+        BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE=y
         """
 
     def test_run(self):
@@ -84,7 +86,7 @@ class TestZfsUclibc(TestZfsBase):
 class TestZfsMusl(TestZfsBase):
     config = TestZfsBase.config + \
         """
-        BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y
+        BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE=y
         """
 
     def test_run(self):
-- 
2.48.1



More information about the buildroot mailing list