Skip to contentSkip to conversation

Acceptance tests for mpc8544ds & virtex-ml507 ppc machines

PATCH In review Thomas Huth 6 participants 19 messages Jan 12, 2021 – Feb 8, 2021

lore
Share & tools
lore
#0 lore raw

cover Acceptance tests for mpc8544ds & virtex-ml507 ppc machines

Let's use the two new images from the QEMU advent calendar 2020 to test the mpc8544ds & virtex-ml507 ppc machines.

Thomas Huth (3):
tests/acceptance: Move the pseries test to a separate file tests/acceptance: Test the mpc8544ds machine tests/acceptance: Add a test for the virtex-ml507 ppc machine

 MAINTAINERS                            |  1 +
 tests/acceptance/boot_linux_console.py | 19 -------
 tests/acceptance/machine_ppc.py        | 69 ++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 19 deletions(-)
 create mode 100644 tests/acceptance/machine_ppc.py
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/3 tests/acceptance: Move the pseries test to a separate file

Let's gather the POWER-related tests in a separate file.

---
 MAINTAINERS                            |  1 +
 tests/acceptance/boot_linux_console.py | 19 --------------
 tests/acceptance/machine_ppc.py        | 34 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 tests/acceptance/machine_ppc.py
MAINTAINERS +1 -0
index 4be087b88e..189776a036 100644
@@ -280,6 +280,7 @@ F: target/ppc/
 F: hw/ppc/
 F: include/hw/ppc/
 F: disas/ppc.c
+F: tests/acceptance/machine_ppc.py
 
 RISC-V TCG CPUs
 M: Palmer Dabbelt <[email protected]>
tests/acceptance/boot_linux_console.py +0 -19
index fb41bb7144..41d2c86e98 100644
@@ -976,25 +976,6 @@ class BootLinuxConsole(LinuxKernelTest):
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)
 
-    def test_ppc64_pseries(self):
-        """
-        :avocado: tags=arch:ppc64
-        :avocado: tags=machine:pseries
-        """
-        kernel_url = ('https://archives.fedoraproject.org/pub/archive'
-                      '/fedora-secondary/releases/29/Everything/ppc64le/os'
-                      '/ppc/ppc64/vmlinuz')
-        kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
-        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
-
-        self.vm.set_console()
-        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
-        self.vm.add_args('-kernel', kernel_path,
-                         '-append', kernel_command_line)
-        self.vm.launch()
-        console_pattern = 'Kernel command line: %s' % kernel_command_line
-        self.wait_for_console_pattern(console_pattern)
-
     def test_m68k_q800(self):
         """
         :avocado: tags=arch:m68k
tests/acceptance/machine_ppc.py new file +34 -0
new file mode 100644
index 0000000000..51bbfd411c
@@ -0,0 +1,34 @@
+# Test that Linux kernel boots on ppc machines and check the console
+#
+# Copyright (c) 2018, 2020 Red Hat, Inc.
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
+
+from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
+
+class PpcMachine(Test):
+
+    timeout = 90
+    KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+    panic_message = 'Kernel panic - not syncing'
+
+    def test_ppc64_pseries(self):
+        """
+        :avocado: tags=arch:ppc64
+        :avocado: tags=machine:pseries
+        """
+        kernel_url = ('https://archives.fedoraproject.org/pub/archive'
+                      '/fedora-secondary/releases/29/Everything/ppc64le/os'
+                      '/ppc/ppc64/vmlinuz')
+        kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+        self.vm.set_console()
+        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
+        self.vm.add_args('-kernel', kernel_path,
+                         '-append', kernel_command_line)
+        self.vm.launch()
+        console_pattern = 'Kernel command line: %s' % kernel_command_line
+        wait_for_console_pattern(self, console_pattern, self.panic_message)
Signature · 1 line
2.27.0
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file

Hi,

Quoted 1 line · Thomas Huth

Let's gather the POWER-related tests in a separate file.

Did you consider having others ppc/ppc64 boot tests together too?

Some candidates:

tests/acceptance/boot_linux.py:BootLinuxPPC64.test_pseries_tcg tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc64_e500 tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_g3beige tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_mac99 tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_factory_firmware_and_netbsd tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_192m tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_and_netbsd

Quoted 8 lines
---
  MAINTAINERS                            |  1 +
  tests/acceptance/boot_linux_console.py | 19 --------------
  tests/acceptance/machine_ppc.py        | 34 ++++++++++++++++++++++++++
  3 files changed, 35 insertions(+), 19 deletions(-)

create mode 100644 tests/acceptance/machine_ppc.py

Quoted 83 lines
MAINTAINERS +1 -0
index 4be087b88e..189776a036 100644
@@ -280,6 +280,7 @@ F: target/ppc/
  F: hw/ppc/
  F: include/hw/ppc/
  F: disas/ppc.c
+F: tests/acceptance/machine_ppc.py
 
  RISC-V TCG CPUs
  M: Palmer Dabbelt <[email protected]>
tests/acceptance/boot_linux_console.py +0 -19
index fb41bb7144..41d2c86e98 100644
@@ -976,25 +976,6 @@ class BootLinuxConsole(LinuxKernelTest):
          console_pattern = 'Kernel command line: %s' % kernel_command_line
          self.wait_for_console_pattern(console_pattern)
 
-    def test_ppc64_pseries(self):
-        """
-        :avocado: tags=arch:ppc64
-        :avocado: tags=machine:pseries
-        """
-        kernel_url = ('https://archives.fedoraproject.org/pub/archive'
-                      '/fedora-secondary/releases/29/Everything/ppc64le/os'
-                      '/ppc/ppc64/vmlinuz')
-        kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
-        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
-
-        self.vm.set_console()
-        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
-        self.vm.add_args('-kernel', kernel_path,
-                         '-append', kernel_command_line)
-        self.vm.launch()
-        console_pattern = 'Kernel command line: %s' % kernel_command_line
-        self.wait_for_console_pattern(console_pattern)
-
      def test_m68k_q800(self):
          """
          :avocado: tags=arch:m68k
tests/acceptance/machine_ppc.py new file +34 -0
new file mode 100644
index 0000000000..51bbfd411c
@@ -0,0 +1,34 @@
+# Test that Linux kernel boots on ppc machines and check the console
+#
+# Copyright (c) 2018, 2020 Red Hat, Inc.
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
+
+from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
+
+class PpcMachine(Test):
+
+    timeout = 90
+    KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+    panic_message = 'Kernel panic - not syncing'
+
+    def test_ppc64_pseries(self):
+        """
+        :avocado: tags=arch:ppc64
+        :avocado: tags=machine:pseries
+        """
+        kernel_url = ('https://archives.fedoraproject.org/pub/archive'
+                      '/fedora-secondary/releases/29/Everything/ppc64le/os'
+                      '/ppc/ppc64/vmlinuz')
+        kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+        self.vm.set_console()
+        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
+        self.vm.add_args('-kernel', kernel_path,
+                         '-append', kernel_command_line)
+        self.vm.launch()
+        console_pattern = 'Kernel command line: %s' % kernel_command_line
+        wait_for_console_pattern(self, console_pattern, self.panic_message)
#3 lore raw

Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file

Quoted 6 lines · Wainer dos Santos Moschetta

Hi,

Quoted 1 line · Thomas Huth

Let's gather the POWER-related tests in a separate file.

Quoted 8 lines

Did you consider having others ppc/ppc64 boot tests together too?

Some candidates:

tests/acceptance/boot_linux.py:BootLinuxPPC64.test_pseries_tcg tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc64_e500 tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_g3beige tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_mac99

The e500, g3beige and mac99 tests are depending on the do_test_advcal_2018() function in that file, so I think they should rather stay there.

Quoted 2 lines

tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_factory_firmware_and_netbsd tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_192m tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_and_netbsd

That's a good point, I did not notice that file when writing my patches. Philippe, since you've created this ppc_prep_40p.py file, what do you think, should it be merged with the other ppc tests, or shall we rather keep this separate?

Thomas

#4 lore raw

Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file

Hi Thomas,

Quoted 25 lines · Thomas Huth
Quoted 6 lines · Wainer dos Santos Moschetta

Hi,

Quoted 1 line · Thomas Huth

Let's gather the POWER-related tests in a separate file.

Quoted 8 lines

Did you consider having others ppc/ppc64 boot tests together too?

Some candidates:

tests/acceptance/boot_linux.py:BootLinuxPPC64.test_pseries_tcg tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc64_e500 tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_g3beige tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_mac99

The e500, g3beige and mac99 tests are depending on the do_test_advcal_2018() function in that file, so I think they should rather stay there.

Quoted 4 lines

tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_factory_firmware_and_netbsd tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_192m tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_and_netbsd

Quoted 4 lines

That's a good point, I did not notice that file when writing my patches. Philippe, since you've created this ppc_prep_40p.py file, what do you think, should it be merged with the other ppc tests, or shall we rather keep this separate?

The choice was deliberate: the PReP machine has a different set of maintainers. If possible when we have a particular section in MAINTAINERS I'd like to use it as separation, to let the maintainers track changes in tests.

In this example, Hervé is interested to look for PReP related files, but doesn't have bandwidth to look at all PPC patches.

If this doesn't scale, I suggested (was it on the list or directly to Willian?) to add a Python script to map Avocado test tags to MAINTAINERS entry, so 1/ maintainers could run all tests linked to their subsystem by naming the subsystem, and 2/ when a test fails we know which maintainer to contact.

Regards,

Phil.

#5 lore raw

Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file

Quoted 33 lines · Philippe Mathieu-Daudé

Hi Thomas,

Quoted 25 lines · Thomas Huth
Quoted 6 lines · Wainer dos Santos Moschetta

Hi,

Quoted 1 line · Thomas Huth

Let's gather the POWER-related tests in a separate file.

Quoted 8 lines

Did you consider having others ppc/ppc64 boot tests together too?

Some candidates:

tests/acceptance/boot_linux.py:BootLinuxPPC64.test_pseries_tcg tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc64_e500 tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_g3beige tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_mac99

The e500, g3beige and mac99 tests are depending on the do_test_advcal_2018() function in that file, so I think they should rather stay there.

Quoted 4 lines

tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_factory_firmware_and_netbsd tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_192m tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_and_netbsd

Quoted 4 lines

That's a good point, I did not notice that file when writing my patches. Philippe, since you've created this ppc_prep_40p.py file, what do you think, should it be merged with the other ppc tests, or shall we rather keep this separate?

Quoted 4 lines

The choice was deliberate: the PReP machine has a different set of maintainers. If possible when we have a particular section in MAINTAINERS I'd like to use it as separation, to let the maintainers track changes in tests.

Ok, fair point, let's keep it separate then!

Thomas

#6 lore raw

Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file

In reply to Philippe Mathieu-Daudé
Quoted 38 lines · Philippe Mathieu-Daudé

Hi Thomas,

Quoted 25 lines · Thomas Huth
Quoted 6 lines · Wainer dos Santos Moschetta

Hi,

Quoted 1 line · Thomas Huth

Let's gather the POWER-related tests in a separate file.

Quoted 8 lines

Did you consider having others ppc/ppc64 boot tests together too?

Some candidates:

tests/acceptance/boot_linux.py:BootLinuxPPC64.test_pseries_tcg tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc64_e500 tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_g3beige tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_mac99

The e500, g3beige and mac99 tests are depending on the do_test_advcal_2018() function in that file, so I think they should rather stay there.

Quoted 4 lines

tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_factory_firmware_and_netbsd tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_192m tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_and_netbsd

Quoted 4 lines

That's a good point, I did not notice that file when writing my patches. Philippe, since you've created this ppc_prep_40p.py file, what do you think, should it be merged with the other ppc tests, or shall we rather keep this separate?

The choice was deliberate: the PReP machine has a different set of maintainers. If possible when we have a particular section in MAINTAINERS I'd like to use it as separation, to let the maintainers track changes in tests.

Quoted 5 lines

In this example, Hervé is interested to look for PReP related files, but doesn't have bandwidth to look at all PPC patches.

If this doesn't scale, I suggested (was it on the list or directly to Willian?)

I remember we had this conversation some time ago, so, I'm sure you suggested to me, not sure if you mentioned that to the list.

Quoted 4 lines

to add a Python script to map Avocado test tags to MAINTAINERS entry, so 1/ maintainers could run all tests linked to their subsystem by naming the subsystem, and 2/ when a test fails we know which maintainer to contact.

And I agree that is an interesting idea.

Quoted 5 lines

Regards,

Phil.

Reviewed-by on v1 1/3
#7 lore raw

Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file

In reply to Thomas Huth
Quoted 9 lines · Thomas Huth

Let's gather the POWER-related tests in a separate file.

---
 MAINTAINERS                            |  1 +
 tests/acceptance/boot_linux_console.py | 19 --------------
 tests/acceptance/machine_ppc.py        | 34 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 tests/acceptance/machine_ppc.py
Acked-by on v1 1/3
#8 lore raw

Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file

In reply to Thomas Huth
Quoted 3 lines · Thomas Huth

Let's gather the POWER-related tests in a separate file.

Quoted 89 lines
---
 MAINTAINERS                            |  1 +
 tests/acceptance/boot_linux_console.py | 19 --------------
 tests/acceptance/machine_ppc.py        | 34 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 tests/acceptance/machine_ppc.py
MAINTAINERS +1 -0
index 4be087b88e..189776a036 100644
@@ -280,6 +280,7 @@ F: target/ppc/
 F: hw/ppc/
 F: include/hw/ppc/
 F: disas/ppc.c
+F: tests/acceptance/machine_ppc.py
 
 RISC-V TCG CPUs
 M: Palmer Dabbelt <[email protected]>
tests/acceptance/boot_linux_console.py +0 -19
index fb41bb7144..41d2c86e98 100644
@@ -976,25 +976,6 @@ class BootLinuxConsole(LinuxKernelTest):
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)
 
-    def test_ppc64_pseries(self):
-        """
-        :avocado: tags=arch:ppc64
-        :avocado: tags=machine:pseries
-        """
-        kernel_url = ('https://archives.fedoraproject.org/pub/archive'
-                      '/fedora-secondary/releases/29/Everything/ppc64le/os'
-                      '/ppc/ppc64/vmlinuz')
-        kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
-        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
-
-        self.vm.set_console()
-        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
-        self.vm.add_args('-kernel', kernel_path,
-                         '-append', kernel_command_line)
-        self.vm.launch()
-        console_pattern = 'Kernel command line: %s' % kernel_command_line
-        self.wait_for_console_pattern(console_pattern)
-
     def test_m68k_q800(self):
         """
         :avocado: tags=arch:m68k
tests/acceptance/machine_ppc.py new file +34 -0
new file mode 100644
index 0000000000..51bbfd411c
@@ -0,0 +1,34 @@
+# Test that Linux kernel boots on ppc machines and check the console
+#
+# Copyright (c) 2018, 2020 Red Hat, Inc.
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
+
+from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
+
+class PpcMachine(Test):
+
+    timeout = 90
+    KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+    panic_message = 'Kernel panic - not syncing'
+
+    def test_ppc64_pseries(self):
+        """
+        :avocado: tags=arch:ppc64
+        :avocado: tags=machine:pseries
+        """
+        kernel_url = ('https://archives.fedoraproject.org/pub/archive'
+                      '/fedora-secondary/releases/29/Everything/ppc64le/os'
+                      '/ppc/ppc64/vmlinuz')
+        kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+        self.vm.set_console()
+        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
+        self.vm.add_args('-kernel', kernel_path,
+                         '-append', kernel_command_line)
+        self.vm.launch()
+        console_pattern = 'Kernel command line: %s' % kernel_command_line
+        wait_for_console_pattern(self, console_pattern, self.panic_message)
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Reviewed-by on v1 1/3
#9 lore raw

Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file

In reply to Thomas Huth
Quoted 11 lines · Thomas Huth

Let's gather the POWER-related tests in a separate file.

---
 MAINTAINERS                            |  1 +
 tests/acceptance/boot_linux_console.py | 19 --------------
 tests/acceptance/machine_ppc.py        | 34 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 tests/acceptance/machine_ppc.py

We can have other tests moved to this file later. For now,

#10 lore raw

PATCH 2/3 tests/acceptance: Test the mpc8544ds machine

In reply to Thomas Huth

We can use the "Stupid creek" image to test the mpc8544ds ppc machine.

---
 tests/acceptance/machine_ppc.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
tests/acceptance/machine_ppc.py +17 -0
index 51bbfd411c..71025d296c 100644
@@ -5,6 +5,7 @@
 # This work is licensed under the terms of the GNU GPL, version 2 or
 # later.  See the COPYING file in the top-level directory.
 
+from avocado.utils import archive
 from avocado_qemu import Test
 from avocado_qemu import wait_for_console_pattern
 
@@ -32,3 +33,19 @@ class PpcMachine(Test):
         self.vm.launch()
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         wait_for_console_pattern(self, console_pattern, self.panic_message)
+
+    def test_ppc_mpc8544ds(self):
+        """
+        :avocado: tags=arch:ppc
+        :avocado: tags=machine:mpc8544ds
+        """
+        tar_url = ('https://www.qemu-advent-calendar.org'
+                   '/2020/download/day17.tar.gz')
+        tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
+        file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+        archive.extract(file_path, self.workdir)
+        self.vm.set_console()
+        self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin')
+        self.vm.launch()
+        wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+                                 self.panic_message)
Signature · 1 line
2.27.0
Reviewed-by on v1 2/3
#11 lore raw

Re: [PATCH 2/3] tests/acceptance: Test the mpc8544ds machine

Quoted 6 lines · Thomas Huth

We can use the "Stupid creek" image to test the mpc8544ds ppc machine.

---
  tests/acceptance/machine_ppc.py | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
Quoted 33 lines
tests/acceptance/machine_ppc.py +17 -0
index 51bbfd411c..71025d296c 100644
@@ -5,6 +5,7 @@
  # This work is licensed under the terms of the GNU GPL, version 2 or
  # later.  See the COPYING file in the top-level directory.
 
+from avocado.utils import archive
  from avocado_qemu import Test
  from avocado_qemu import wait_for_console_pattern
 
@@ -32,3 +33,19 @@ class PpcMachine(Test):
          self.vm.launch()
          console_pattern = 'Kernel command line: %s' % kernel_command_line
          wait_for_console_pattern(self, console_pattern, self.panic_message)
+
+    def test_ppc_mpc8544ds(self):
+        """
+        :avocado: tags=arch:ppc
+        :avocado: tags=machine:mpc8544ds
+        """
+        tar_url = ('https://www.qemu-advent-calendar.org'
+                   '/2020/download/day17.tar.gz')
+        tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
+        file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+        archive.extract(file_path, self.workdir)
+        self.vm.set_console()
+        self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin')
+        self.vm.launch()
+        wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+                                 self.panic_message)
Acked-by on v1 2/3
#12 lore raw

Re: [PATCH 2/3] tests/acceptance: Test the mpc8544ds machine

In reply to Thomas Huth
Quoted 3 lines · Thomas Huth

We can use the "Stupid creek" image to test the mpc8544ds ppc machine.

Quoted 36 lines
---
 tests/acceptance/machine_ppc.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
tests/acceptance/machine_ppc.py +17 -0
index 51bbfd411c..71025d296c 100644
@@ -5,6 +5,7 @@
 # This work is licensed under the terms of the GNU GPL, version 2 or
 # later.  See the COPYING file in the top-level directory.
 
+from avocado.utils import archive
 from avocado_qemu import Test
 from avocado_qemu import wait_for_console_pattern
 
@@ -32,3 +33,19 @@ class PpcMachine(Test):
         self.vm.launch()
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         wait_for_console_pattern(self, console_pattern, self.panic_message)
+
+    def test_ppc_mpc8544ds(self):
+        """
+        :avocado: tags=arch:ppc
+        :avocado: tags=machine:mpc8544ds
+        """
+        tar_url = ('https://www.qemu-advent-calendar.org'
+                   '/2020/download/day17.tar.gz')
+        tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
+        file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+        archive.extract(file_path, self.workdir)
+        self.vm.set_console()
+        self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin')
+        self.vm.launch()
+        wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+                                 self.panic_message)
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
#14 lore raw

PATCH 3/3 tests/acceptance: Add a test for the virtex-ml507 ppc machine

In reply to Thomas Huth

The "And a hippo new year" image from the QEMU advent calendar 2020 can be used to test the virtex-ml507 ppc machine.

---
 tests/acceptance/machine_ppc.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
tests/acceptance/machine_ppc.py +18 -0
index 71025d296c..a836e2496f 100644
@@ -49,3 +49,21 @@ class PpcMachine(Test):
         self.vm.launch()
         wait_for_console_pattern(self, 'QEMU advent calendar 2020',
                                  self.panic_message)
+
+    def test_ppc_virtex_ml507(self):
+        """
+        :avocado: tags=arch:ppc
+        :avocado: tags=machine:virtex-ml507
+        """
+        tar_url = ('https://www.qemu-advent-calendar.org'
+                   '/2020/download/hippo.tar.gz')
+        tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
+        file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+        archive.extract(file_path, self.workdir)
+        self.vm.set_console()
+        self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux',
+                         '-dtb', self.workdir + '/hippo/virtex440-ml507.dtb',
+                         '-m', '512')
+        self.vm.launch()
+        wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+                                 self.panic_message)
Signature · 1 line
2.27.0
Reviewed-by on v1 3/3
#15 lore raw

Re: [PATCH 3/3] tests/acceptance: Add a test for the virtex-ml507 ppc machine

Quoted 7 lines · Thomas Huth

The "And a hippo new year" image from the QEMU advent calendar 2020 can be used to test the virtex-ml507 ppc machine.

---
  tests/acceptance/machine_ppc.py | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
Quoted 27 lines
tests/acceptance/machine_ppc.py +18 -0
index 71025d296c..a836e2496f 100644
@@ -49,3 +49,21 @@ class PpcMachine(Test):
          self.vm.launch()
          wait_for_console_pattern(self, 'QEMU advent calendar 2020',
                                   self.panic_message)
+
+    def test_ppc_virtex_ml507(self):
+        """
+        :avocado: tags=arch:ppc
+        :avocado: tags=machine:virtex-ml507
+        """
+        tar_url = ('https://www.qemu-advent-calendar.org'
+                   '/2020/download/hippo.tar.gz')
+        tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
+        file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+        archive.extract(file_path, self.workdir)
+        self.vm.set_console()
+        self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux',
+                         '-dtb', self.workdir + '/hippo/virtex440-ml507.dtb',
+                         '-m', '512')
+        self.vm.launch()
+        wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+                                 self.panic_message)
Acked-by on v1 3/3
#16 lore raw

Re: [PATCH 3/3] tests/acceptance: Add a test for the virtex-ml507 ppc machine

In reply to Thomas Huth
Quoted 4 lines · Thomas Huth

The "And a hippo new year" image from the QEMU advent calendar 2020 can be used to test the virtex-ml507 ppc machine.

Quoted 30 lines
---
 tests/acceptance/machine_ppc.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
tests/acceptance/machine_ppc.py +18 -0
index 71025d296c..a836e2496f 100644
@@ -49,3 +49,21 @@ class PpcMachine(Test):
         self.vm.launch()
         wait_for_console_pattern(self, 'QEMU advent calendar 2020',
                                  self.panic_message)
+
+    def test_ppc_virtex_ml507(self):
+        """
+        :avocado: tags=arch:ppc
+        :avocado: tags=machine:virtex-ml507
+        """
+        tar_url = ('https://www.qemu-advent-calendar.org'
+                   '/2020/download/hippo.tar.gz')
+        tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
+        file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+        archive.extract(file_path, self.workdir)
+        self.vm.set_console()
+        self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux',
+                         '-dtb', self.workdir + '/hippo/virtex440-ml507.dtb',
+                         '-m', '512')
+        self.vm.launch()
+        wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+                                 self.panic_message)
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Reviewed-by on v1 3/3
#17 lore raw

Re: [PATCH 3/3] tests/acceptance: Add a test for the virtex-ml507 ppc machine

In reply to Thomas Huth
Quoted 8 lines · Thomas Huth

The "And a hippo new year" image from the QEMU advent calendar 2020 can be used to test the virtex-ml507 ppc machine.

---
 tests/acceptance/machine_ppc.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
#18 lore raw
In reply to Thomas Huth
Quoted 8 lines · Thomas Huth

Let's use the two new images from the QEMU advent calendar 2020 to test the mpc8544ds & virtex-ml507 ppc machines.

Thomas Huth (3):
tests/acceptance: Move the pseries test to a separate file tests/acceptance: Test the mpc8544ds machine tests/acceptance: Add a test for the virtex-ml507 ppc machine

Quoted 5 lines
 MAINTAINERS                            |  1 +
 tests/acceptance/boot_linux_console.py | 19 -------
 tests/acceptance/machine_ppc.py        | 69 ++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 19 deletions(-)
 create mode 100644 tests/acceptance/machine_ppc.py

Thanks, series applied to my acceptance-testing tree.