qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
	qemu-devel@nongnu.org, Cleber Rosa <crosa@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [Qemu-devel] [PULL 13/19] tests/boot_linux_console: add a test for mips + malta
Date: Thu,  2 May 2019 21:41:24 -0300	[thread overview]
Message-ID: <20190503004130.8285-14-ehabkost@redhat.com> (raw)
In-Reply-To: <20190503004130.8285-1-ehabkost@redhat.com>

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Similar to the x86_64 + pc test, it boots a Linux kernel on a Malta
board and verify the serial is working.  Also, it relies on the serial
device set by the machine itself.

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

Alternatively, this test can be run using:

    $ avocado run -t arch:mips tests/acceptance
    $ avocado run -t machine:malta tests/acceptance
    $ avocado run -t endian:big tests/acceptance

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190312171824.5134-14-crosa@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 .travis.yml                            |  2 +-
 tests/acceptance/boot_linux_console.py | 41 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e6f951e01a..f6f5d39aca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -223,7 +223,7 @@ matrix:
 
     # Acceptance (Functional) tests
     - env:
-        - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu"
+        - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu"
         - TEST_CMD="make check-acceptance"
       addons:
         apt:
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index 32f1d4d0bf..028fefd7ee 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -8,9 +8,12 @@
 # This work is licensed under the terms of the GNU GPL, version 2 or
 # later.  See the COPYING file in the top-level directory.
 
+import os
 import logging
 
 from avocado_qemu import Test
+from avocado.utils import process
+from avocado.utils import archive
 
 
 class BootLinuxConsole(Test):
@@ -42,6 +45,21 @@ class BootLinuxConsole(Test):
                 fail = 'Failure message found in console: %s' % failure_message
                 self.fail(fail)
 
+    def extract_from_deb(self, deb, path):
+        """
+        Extracts a file from a deb package into the test workdir
+
+        :param deb: path to the deb archive
+        :param file: path within the deb archive of the file to be extracted
+        :returns: path of the extracted file
+        """
+        cwd = os.getcwd()
+        os.chdir(self.workdir)
+        process.run("ar x %s data.tar.gz" % deb)
+        archive.extract("data.tar.gz", self.workdir)
+        os.chdir(cwd)
+        return self.workdir + path
+
     def test_x86_64_pc(self):
         """
         :avocado: tags=arch:x86_64
@@ -60,3 +78,26 @@ class BootLinuxConsole(Test):
         self.vm.launch()
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)
+
+    def test_mips_malta(self):
+        """
+        :avocado: tags=arch:mips
+        :avocado: tags=machine:malta
+        :avocado: tags=endian:big
+        """
+        deb_url = ('http://snapshot.debian.org/archive/debian/'
+                   '20130217T032700Z/pool/main/l/linux-2.6/'
+                   'linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb')
+        deb_hash = 'a8cfc28ad8f45f54811fc6cf74fc43ffcfe0ba04'
+        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
+        kernel_path = self.extract_from_deb(deb_path,
+                                            '/boot/vmlinux-2.6.32-5-4kc-malta')
+
+        self.vm.set_machine('malta')
+        self.vm.set_console()
+        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0'
+        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)
-- 
2.18.0.rc1.1.g3f1ff2140

  parent reply	other threads:[~2019-05-03  0:42 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-03  0:41 [Qemu-devel] [PULL 00/19] Python queue, 2019-05-02 Eduardo Habkost
2019-05-03  0:41 ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 01/19] tests/acceptance: show avocado test execution by default Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 02/19] tests/acceptance: improve docstring on pick_default_qemu_bin() Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 03/19] tests/acceptance: fix doc reference to avocado_qemu directory Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 04/19] tests/acceptance: introduce arch parameter and attribute Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 05/19] tests/acceptance: use "arch:" tag to filter target specific tests Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 06/19] tests/acceptance: look for target architecture in test tags first Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 07/19] tests/boot_linux_console: rename the x86_64 after the arch and machine Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 08/19] tests/boot_linux_console: update the x86_64 kernel Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 09/19] tests/boot_linux_console: add common kernel command line options Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 10/19] tests/boot_linux_console: increase timeout Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-08 10:28   ` Gerd Hoffmann
2019-05-08 14:39     ` Cleber Rosa
2019-05-09  4:40       ` Gerd Hoffmann
2019-05-09 18:12         ` Cleber Rosa
2019-05-10  6:06           ` Gerd Hoffmann
2019-05-03  0:41 ` [Qemu-devel] [PULL 11/19] tests/boot_linux_console: refactor the console watcher into utility method Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 12/19] scripts/qemu.py: support adding a console with the default serial device Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` Eduardo Habkost [this message]
2019-05-03  0:41   ` [Qemu-devel] [PULL 13/19] tests/boot_linux_console: add a test for mips + malta Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 14/19] tests/boot_linux_console: add a test for mips64el " Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 15/19] tests/boot_linux_console: add a test for aarch64 + virt Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 16/19] tests/boot_linux_console: add a test for arm " Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 17/19] tests/boot_linux_console: add a test for s390x + s390-ccw-virtio Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 18/19] tests/boot_linux_console: add a test for alpha + clipper Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03  0:41 ` [Qemu-devel] [PULL 19/19] configure: automatically pick python3 is available Eduardo Habkost
2019-05-03  0:41   ` Eduardo Habkost
2019-05-03 16:41   ` Thomas Huth
2019-05-03 16:41     ` Thomas Huth
2019-05-03 16:54     ` Daniel P. Berrangé
2019-05-03 16:54       ` Daniel P. Berrangé
2019-05-03 16:56       ` Daniel P. Berrangé
2019-05-03 16:56         ` Daniel P. Berrangé
2019-05-03 17:04     ` Philippe Mathieu-Daudé
2019-05-03 17:04       ` Philippe Mathieu-Daudé
2019-05-04  6:41       ` Thomas Huth
2019-05-04  6:41         ` Thomas Huth
2019-05-03 21:00     ` Eduardo Habkost
2019-05-03 21:00       ` Eduardo Habkost
2019-05-03 21:34       ` Eduardo Habkost
2019-05-03 21:34         ` Eduardo Habkost
2019-05-04  7:17         ` Thomas Huth
2019-05-04  7:17           ` Thomas Huth
2019-05-03 15:02 ` [Qemu-devel] [PULL 00/19] Python queue, 2019-05-02 Peter Maydell
2019-05-03 15:02   ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190503004130.8285-14-ehabkost@redhat.com \
    --to=ehabkost@redhat.com \
    --cc=crosa@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).