Skip to contentSkip to conversation

support/testing: test_zfs: don't run TestZfsBase as a test

PATCH Applied Romain Naour 2 participants 3 messages May 12, 2022 – May 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 support/testing: test_zfs: don't run TestZfsBase as a test

The commit [1] introcuded TestZfsBase as a common function between all Zfs tests. But TestZfsBase test is executed as a test itself.

Rename test_run() to base_test_run() to avoid this issue.

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2429014006

[1] 593e8cb71f8f2ac69889424bbef5ab09c0dbb06e

Cc José Luis Salvador Rufo <[email protected]>
---
 support/testing/tests/package/test_zfs.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
support/testing/tests/package/test_zfs.py +10 -1
index 8911dcfd9e..e3784f7d7d 100644
@@ -25,7 +25,7 @@ class TestZfsBase(infra.basetest.BRTest):
         # BR2_TARGET_ROOTFS_TAR is not set
         """
 
-    def test_run(self):
+    def base_test_run(self):
         kernel = os.path.join(self.builddir, "images", "bzImage")
         cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio")
         self.emulator.boot(
@@ -65,6 +65,9 @@ class TestZfsGlibc(TestZfsBase):
         BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y
         """
 
+    def test_run(self):
+        TestZfsBase.base_test_run(self)
+
 
 class TestZfsUclibc(TestZfsBase):
     config = TestZfsBase.config + \
@@ -72,9 +75,15 @@ class TestZfsUclibc(TestZfsBase):
         BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE=y
         """
 
+    def test_run(self):
+        TestZfsBase.base_test_run(self)
+
 
 class TestZfsMusl(TestZfsBase):
     config = TestZfsBase.config + \
         """
         BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y
         """
+
+    def test_run(self):
+        TestZfsBase.base_test_run(self)
Signature · 6 lines
2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 support/testing: test_zfs: add missing libelf dependency

While building the kernel tools, libelf header is missing:

output/TestZfsGlibc/build/linux-5.15.35/tools/objtool/include/objtool/elf.h:10:10: fatal error: gelf.h: No such file or directory
10 | #include <gelf.h>

Select BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF to build host-libelf.

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2429014008

Cc José Luis Salvador Rufo <[email protected]>
---
 support/testing/tests/package/test_zfs.py | 1 +
 1 file changed, 1 insertion(+)
support/testing/tests/package/test_zfs.py +1 -0
index e3784f7d7d..688b60d7c4 100644
@@ -15,6 +15,7 @@ class TestZfsBase(infra.basetest.BRTest):
         BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.35"
         BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
         BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config"
+        BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
         BR2_PACKAGE_ZFS=y
         BR2_PACKAGE_PYTHON3=y
         BR2_PACKAGE_PYTHON_CFFI=y
Signature · 6 lines
2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Romain Naour
Quoted 6 lines · Romain Naour

The commit [1] introcuded TestZfsBase as a common function between all Zfs tests. But TestZfsBase test is executed as a test itself.

Rename test_run() to base_test_run() to avoid this issue.

Quoted 7 lines

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2429014006

[1] 593e8cb71f8f2ac69889424bbef5ab09c0dbb06e

Cc José Luis Salvador Rufo <[email protected]>

Applied both to master, thanks.

Regards,
Arnout

Quoted 33 lines
---
  support/testing/tests/package/test_zfs.py | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
support/testing/tests/package/test_zfs.py +6 -1
index 8911dcfd9e..e3784f7d7d 100644
@@ -25,7 +25,7 @@ class TestZfsBase(infra.basetest.BRTest):
          # BR2_TARGET_ROOTFS_TAR is not set
          """
 
-    def test_run(self):
+    def base_test_run(self):
          kernel = os.path.join(self.builddir, "images", "bzImage")
          cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio")
          self.emulator.boot(
@@ -65,6 +65,9 @@ class TestZfsGlibc(TestZfsBase):
          BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y
          """
 
+    def test_run(self):
+        TestZfsBase.base_test_run(self)
+
 
  class TestZfsUclibc(TestZfsBase):
      config = TestZfsBase.config + \
@@ -72,9 +75,15 @@ class TestZfsUclibc(TestZfsBase):
          BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE=y
          """
 
+    def test_run(self):
+        TestZfsBase.base_test_run(self)

support/testing/tests/package/test_zfs.py class TestZfsUclibc(TestZfsBase): · line 89

Quoted 10 lines
support/testing/tests/package/test_zfs.py +4 -0
+
 
  class TestZfsMusl(TestZfsBase):
      config = TestZfsBase.config + \
          """
          BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y
          """
+
+    def test_run(self):
+        TestZfsBase.base_test_run(self)

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot