Skip to contentSkip to conversation

tests: Avocado-test for the SmartFusion2 board

PATCH In review Philippe Mathieu-Daudé 2 participants 4 messages Jun 6, 2019

lore
Share & tools
lore
#0 lore raw

v2 cover tests: Avocado-test for the SmartFusion2 board

Hi,

I added test guide lines from Subbaraya Sundeep [*] to avoid this board to bitrot.

v2: Addressed issues reported by Cleber

Regards,

Phil.

[*] https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg03810.html

Philippe Mathieu-Daudé (2):
BootLinuxConsoleTest: Do not log empty lines
BootLinuxConsoleTest: Test the SmartFusion2 board

 tests/acceptance/boot_linux_console.py | 32 ++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/2 BootLinuxConsoleTest: Do not log empty lines

From: Philippe Mathieu-Daudé <[email protected]>

Avoid to log empty lines in console debug logs.

---
v2: no change

---
 tests/acceptance/boot_linux_console.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tests/acceptance/boot_linux_console.py +4 -2
index d5c500ea30..f593f3858e 100644
@@ -37,8 +37,10 @@ class BootLinuxConsole(Test):
         console = self.vm.console_socket.makefile()
         console_logger = logging.getLogger('console')
         while True:
-            msg = console.readline()
-            console_logger.debug(msg.strip())
+            msg = console.readline().strip()
+            if not msg:
+                continue
+            console_logger.debug(msg)
             if success_message in msg:
                 break
             if failure_message in msg:
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 2/2 BootLinuxConsoleTest: Test the SmartFusion2 board

In reply to Philippe Mathieu-Daudé

From: Philippe Mathieu-Daudé <[email protected]>

Similar to the x86_64/pc test, it boots a Linux kernel on an Emcraft board and verify the serial is working.

If ARM is a target being built, "make check-acceptance" will automatically include this test by the use of the "arch:arm" tags.

Alternatively, this test can be run using:

  $ avocado run -t arch:arm tests/acceptance
  $ avocado run -t machine:emcraft-sf2 tests/acceptance

Based on the recommended test setup from Subbaraya Sundeep:
https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg03810.html

---
v2: (Cleber)
- drop 'kernel_command_line'
- do no concat string, use format
- replace '-' by '_' in Avocado tags

---
 tests/acceptance/boot_linux_console.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
tests/acceptance/boot_linux_console.py +26 -0
index f593f3858e..34527d4b38 100644
@@ -178,6 +178,32 @@ class BootLinuxConsole(Test):
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)
 
+    def test_arm_emcraft_sf2(self):
+        """
+        :avocado: tags=arch:arm
+        :avocado: tags=machine:emcraft_sf2
+        :avocado: tags=endian:little
+        """
+        uboot_url = ('https://raw.githubusercontent.com/'
+                     'Subbaraya-Sundeep/qemu-test-binaries/'
+                     'fa030bd77a014a0b8e360d3b7011df89283a2f0b/u-boot')
+        uboot_hash = 'abba5d9c24cdd2d49cdc2a8aa92976cf20737eff'
+        uboot_path = self.fetch_asset(uboot_url, asset_hash=uboot_hash)
+        spi_url = ('https://raw.githubusercontent.com/'
+                   'Subbaraya-Sundeep/qemu-test-binaries/'
+                   'fa030bd77a014a0b8e360d3b7011df89283a2f0b/spi.bin')
+        spi_hash = '85f698329d38de63aea6e884a86fbde70890a78a'
+        spi_path = self.fetch_asset(spi_url, asset_hash=spi_hash)
+
+        self.vm.set_machine('emcraft-sf2')
+        self.vm.set_console()
+        self.vm.add_args('-kernel', uboot_path,
+                         '-append', self.KERNEL_COMMON_COMMAND_LINE,
+                         '-drive', 'file=%s,if=mtd,format=raw' % spi_path,
+                         '-no-reboot')
+        self.vm.launch()
+        self.wait_for_console_pattern('init started: BusyBox')
+
     def test_s390x_s390_ccw_virtio(self):
         """
         :avocado: tags=arch:s390x
Signature · 1 line
2.20.1
Reviewed-by on v2 2/2
#3 lore raw

Re: [Qemu-arm] [PATCH v2 2/2] BootLinuxConsoleTest: Test the SmartFusion2 board

Quoted 68 lines · Philippe Mathieu-Daudé

From: Philippe Mathieu-Daudé <[email protected]>

Similar to the x86_64/pc test, it boots a Linux kernel on an Emcraft board and verify the serial is working.

If ARM is a target being built, "make check-acceptance" will automatically include this test by the use of the "arch:arm" tags.

Alternatively, this test can be run using:

  $ avocado run -t arch:arm tests/acceptance
  $ avocado run -t machine:emcraft-sf2 tests/acceptance

Based on the recommended test setup from Subbaraya Sundeep:
https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg03810.html

---
v2: (Cleber)
- drop 'kernel_command_line'
- do no concat string, use format
- replace '-' by '_' in Avocado tags

---
 tests/acceptance/boot_linux_console.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
tests/acceptance/boot_linux_console.py +26 -0
index f593f3858e..34527d4b38 100644
@@ -178,6 +178,32 @@ class BootLinuxConsole(Test):
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)
 
+    def test_arm_emcraft_sf2(self):
+        """
+        :avocado: tags=arch:arm
+        :avocado: tags=machine:emcraft_sf2
+        :avocado: tags=endian:little
+        """
+        uboot_url = ('https://raw.githubusercontent.com/'
+                     'Subbaraya-Sundeep/qemu-test-binaries/'
+                     'fa030bd77a014a0b8e360d3b7011df89283a2f0b/u-boot')
+        uboot_hash = 'abba5d9c24cdd2d49cdc2a8aa92976cf20737eff'
+        uboot_path = self.fetch_asset(uboot_url, asset_hash=uboot_hash)
+        spi_url = ('https://raw.githubusercontent.com/'
+                   'Subbaraya-Sundeep/qemu-test-binaries/'
+                   'fa030bd77a014a0b8e360d3b7011df89283a2f0b/spi.bin')
+        spi_hash = '85f698329d38de63aea6e884a86fbde70890a78a'
+        spi_path = self.fetch_asset(spi_url, asset_hash=spi_hash)
+
+        self.vm.set_machine('emcraft-sf2')
+        self.vm.set_console()
+        self.vm.add_args('-kernel', uboot_path,
+                         '-append', self.KERNEL_COMMON_COMMAND_LINE,
+                         '-drive', 'file=%s,if=mtd,format=raw' % spi_path,
+                         '-no-reboot')
+        self.vm.launch()
+        self.wait_for_console_pattern('init started: BusyBox')
+
     def test_s390x_s390_ccw_virtio(self):
         """
         :avocado: tags=arch:s390x
Signature · 1 line
2.20.1