Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] support/testing: add usbutils runtime test
@ 2024-01-24 22:25 Julien Olivain
  2024-02-05 22:19 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: Julien Olivain @ 2024-01-24 22:25 UTC (permalink / raw)
  To: buildroot; +Cc: Julien Olivain

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
Patch tested on branch master at commit 7a59c3a with commands:

    make check-package
    ...
    0 warnings generated

    support/testing/run-tests \
        -d dl -o output_folder \
        tests.package.test_usbutils
    ...
    OK
---
 DEVELOPERS                                    |  2 +
 .../testing/tests/package/test_usbutils.py    | 60 +++++++++++++++++++
 .../test_usbutils/linux-usbutils.fragment     |  2 +
 3 files changed, 64 insertions(+)
 create mode 100644 support/testing/tests/package/test_usbutils.py
 create mode 100644 support/testing/tests/package/test_usbutils/linux-usbutils.fragment

diff --git a/DEVELOPERS b/DEVELOPERS
index f5b04937b6..5a5ce47d73 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1814,6 +1814,8 @@ F:	support/testing/tests/package/test_screen.py
 F:	support/testing/tests/package/test_stress_ng.py
 F:	support/testing/tests/package/test_tcl.py
 F:	support/testing/tests/package/test_tcl/
+F:	support/testing/tests/package/test_usbutils.py
+F:	support/testing/tests/package/test_usbutils/
 F:	support/testing/tests/package/test_weston.py
 F:	support/testing/tests/package/test_weston/
 F:	support/testing/tests/package/test_xz.py
diff --git a/support/testing/tests/package/test_usbutils.py b/support/testing/tests/package/test_usbutils.py
new file mode 100644
index 0000000000..9a5484d5e6
--- /dev/null
+++ b/support/testing/tests/package/test_usbutils.py
@@ -0,0 +1,60 @@
+import os
+
+import infra.basetest
+
+
+class TestUsbUtils(infra.basetest.BRTest):
+    # A specific configuration is needed for testing usbutils, to
+    # enable USB 2.0 support in the Kernel.
+    linux_fragment = \
+        infra.filepath("tests/package/test_usbutils/linux-usbutils.fragment")
+    config = \
+        f"""
+        BR2_aarch64=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+        BR2_LINUX_KERNEL=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.73"
+        BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+        BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config"
+        BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{linux_fragment}"
+        BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+        BR2_PACKAGE_EUDEV=y
+        BR2_PACKAGE_USBUTILS=y
+        BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+        BR2_TARGET_ROOTFS_CPIO=y
+        BR2_TARGET_ROOTFS_CPIO_GZIP=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        img = os.path.join(self.builddir, "images", "rootfs.cpio.gz")
+        kern = os.path.join(self.builddir, "images", "Image")
+        # We add a USB keyboard and mouse devices for the test.
+        self.emulator.boot(arch="aarch64",
+                           kernel=kern,
+                           kernel_cmdline=["console=ttyAMA0"],
+                           options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M",
+                                    "-initrd", img,
+                                    "-device", "usb-ehci,id=ehci",
+                                    "-device", "usb-kbd,bus=ehci.0",
+                                    "-device", "usb-mouse,bus=ehci.0"])
+        self.emulator.login()
+
+        # Check the program can execute. We also check the version
+        # string to make sure we have the usbutils version. The
+        # BusyBox lsusb ignores arguments.
+        output, exit_code = self.emulator.run("lsusb --version")
+        self.assertEqual(exit_code, 0)
+        self.assertTrue(output[0].startswith("lsusb (usbutils)"))
+
+        # Test few simple and common invocations
+        self.assertRunOk("lsusb")
+        self.assertRunOk("lsusb --tree")
+        self.assertRunOk("lsusb --verbose")
+        # 1d6b:0002 is Linux Foundation 2.0 root hub
+        # it should be present. lsusb return an error if no device
+        # is found.
+        self.assertRunOk("lsusb -d 1d6b:0002")
+        self.assertRunOk("usbhid-dump")
diff --git a/support/testing/tests/package/test_usbutils/linux-usbutils.fragment b/support/testing/tests/package/test_usbutils/linux-usbutils.fragment
new file mode 100644
index 0000000000..d9abd2821e
--- /dev/null
+++ b/support/testing/tests/package/test_usbutils/linux-usbutils.fragment
@@ -0,0 +1,2 @@
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] support/testing: add usbutils runtime test
  2024-01-24 22:25 [Buildroot] [PATCH 1/1] support/testing: add usbutils runtime test Julien Olivain
@ 2024-02-05 22:19 ` Peter Korsgaard
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2024-02-05 22:19 UTC (permalink / raw)
  To: Julien Olivain; +Cc: buildroot

>>>>> "Julien" == Julien Olivain <ju.o@free.fr> writes:

 > Signed-off-by: Julien Olivain <ju.o@free.fr>
 > ---
 > Patch tested on branch master at commit 7a59c3a with commands:

 >     make check-package
 >     ...
 >     0 warnings generated

 >     support/testing/run-tests \
 >         -d dl -o output_folder \
 >         tests.package.test_usbutils
 >     ...
 >     OK
 > ---
 >  DEVELOPERS                                    |  2 +
 >  .../testing/tests/package/test_usbutils.py    | 60 +++++++++++++++++++
 >  .../test_usbutils/linux-usbutils.fragment     |  2 +
 >  3 files changed, 64 insertions(+)
 >  create mode 100644 support/testing/tests/package/test_usbutils.py
 >  create mode 100644 support/testing/tests/package/test_usbutils/linux-usbutils.fragment

 > diff --git a/DEVELOPERS b/DEVELOPERS
 > index f5b04937b6..5a5ce47d73 100644
 > --- a/DEVELOPERS
 > +++ b/DEVELOPERS
 > @@ -1814,6 +1814,8 @@ F:	support/testing/tests/package/test_screen.py
 >  F:	support/testing/tests/package/test_stress_ng.py
 >  F:	support/testing/tests/package/test_tcl.py
 >  F:	support/testing/tests/package/test_tcl/
 > +F:	support/testing/tests/package/test_usbutils.py
 > +F:	support/testing/tests/package/test_usbutils/
 >  F:	support/testing/tests/package/test_weston.py
 >  F:	support/testing/tests/package/test_weston/
 >  F:	support/testing/tests/package/test_xz.py
 > diff --git a/support/testing/tests/package/test_usbutils.py b/support/testing/tests/package/test_usbutils.py
 > new file mode 100644
 > index 0000000000..9a5484d5e6
 > --- /dev/null
 > +++ b/support/testing/tests/package/test_usbutils.py
 > @@ -0,0 +1,60 @@
 > +import os
 > +
 > +import infra.basetest
 > +
 > +
 > +class TestUsbUtils(infra.basetest.BRTest):
 > +    # A specific configuration is needed for testing usbutils, to
 > +    # enable USB 2.0 support in the Kernel.
 > +    linux_fragment = \
 > +        infra.filepath("tests/package/test_usbutils/linux-usbutils.fragment")
 > +    config = \
 > +        f"""
 > +        BR2_aarch64=y
 > +        BR2_TOOLCHAIN_EXTERNAL=y
 > +        BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 > +        BR2_LINUX_KERNEL=y
 > +        BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 > +        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.73"
 > +        BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 > +        BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config"
 > +        BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{linux_fragment}"
 > +        BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 > +        BR2_PACKAGE_EUDEV=y
 > +        BR2_PACKAGE_USBUTILS=y
 > +        BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 > +        BR2_TARGET_ROOTFS_CPIO=y
 > +        BR2_TARGET_ROOTFS_CPIO_GZIP=y
 > +        # BR2_TARGET_ROOTFS_TAR is not set
 > +        """
 > +
 > +    def test_run(self):
 > +        img = os.path.join(self.builddir, "images", "rootfs.cpio.gz")
 > +        kern = os.path.join(self.builddir, "images", "Image")
 > +        # We add a USB keyboard and mouse devices for the test.
 > +        self.emulator.boot(arch="aarch64",
 > +                           kernel=kern,
 > +                           kernel_cmdline=["console=ttyAMA0"],
 > +                           options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M",
 > +                                    "-initrd", img,
 > +                                    "-device", "usb-ehci,id=ehci",
 > +                                    "-device", "usb-kbd,bus=ehci.0",
 > +                                    "-device", "usb-mouse,bus=ehci.0"])
 > +        self.emulator.login()
 > +
 > +        # Check the program can execute. We also check the version
 > +        # string to make sure we have the usbutils version. The
 > +        # BusyBox lsusb ignores arguments.
 > +        output, exit_code = self.emulator.run("lsusb --version")
 > +        self.assertEqual(exit_code, 0)
 > +        self.assertTrue(output[0].startswith("lsusb (usbutils)"))
 > +
 > +        # Test few simple and common invocations
 > +        self.assertRunOk("lsusb")
 > +        self.assertRunOk("lsusb --tree")
 > +        self.assertRunOk("lsusb --verbose")
 > +        # 1d6b:0002 is Linux Foundation 2.0 root hub
 > +        # it should be present. lsusb return an error if no device
 > +        # is found.
 > +        self.assertRunOk("lsusb -d 1d6b:0002")
 > +        self.assertRunOk("usbhid-dump")

It was not directly obvious why this would not fail until I noticed that
you configure qemu to emulate a USB keyboard and a mouse, so I added a
comment about this and applied - Thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-05 22:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-24 22:25 [Buildroot] [PATCH 1/1] support/testing: add usbutils runtime test Julien Olivain
2024-02-05 22:19 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox