mirror of https://github.com/xemu-project/xemu.git
Python queue, 2019-06-11
* New boot_linux_console test cases (Philippe Mathieu-Daudé) * Make check-acceptance Travis job more verbose (Eduardo Habkost) -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJc/+E/AAoJECgHk2+YTcWmzHoP/ih/NBR4C8qguyJTcsuRTkRf ESpX7YUDqZz3YHl+3Tz3trys8SlkkChVZsfzk7DBJbnnucJlJQzep9Y2nztZRslk v0HAPSM8oV4tBnRfsrkndekc/Y9tYTa38VJmdMmkgWYmf/JiU1p0YbCDtxDzY49X Vy1zAPJzCoUfZcrYz6jFKjBbqp+SAjg6TSEAueCWV+uKw3av4eDCfH/cW1oYFD17 FE5TaSl/iD9ojS339pc9SeZU6PJugblu7d72gDdYn3g69UE6Yczk5NaStkqp2rsQ qBS9se4AKGMCD3WOwN3XRjtCuFjMtsZQE9bptxJlvCycIQynVeonD22dNZdD+TYC d8HF6DBOOfiecUbdNlgAbk6/p5m07tJoAt1gzVov2Ch2v7mQ9zisk1iP4MV3v2u/ PMsc7XMzAGz0JSw2Kr84RnZH6S1TQ3UzfwiK/eJCS6t+YME/RFAd7foLQ9ti3v6A +xPnwlIvjBTK/XG3z+8FmhDWW1x9gv8YMjTMelLzyViaQYnIg8CIWD3ivH9WvLyA OLMVQsh+UbKDNBGUMQ2godljTLMwQ+IbuGmWFHuE8hXRyMiOo7BeWYLwdnpUx+8D xsCKQpyu1xmOwwS7JkhHh1yXgAc3PpxGfzAi2/cbktJzT9EyjOcmuHrtquVkeg/j FlQY/0qo3uH15yHqaA0S =5fgS -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging Python queue, 2019-06-11 * New boot_linux_console test cases (Philippe Mathieu-Daudé) * Make check-acceptance Travis job more verbose (Eduardo Habkost) # gpg: Signature made Tue 11 Jun 2019 18:13:35 BST # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full] # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/python-next-pull-request: travis: Make check-acceptance job more verbose BootLinuxConsoleTest: Run kerneltests BusyBox on Malta BootLinuxConsoleTest: Test nanoMIPS kernels on the I7200 CPU BootLinuxConsoleTest: Test the SmartFusion2 board BootLinuxConsoleTest: Do not log empty lines tests/boot_linux_console: Let extract_from_deb handle various compressions Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
d3e3413bd6
|
|
@ -225,7 +225,7 @@ matrix:
|
|||
# Acceptance (Functional) tests
|
||||
- env:
|
||||
- CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu"
|
||||
- TEST_CMD="make check-acceptance"
|
||||
- TEST_CMD="make AVOCADO_SHOW=test check-acceptance"
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@
|
|||
|
||||
import os
|
||||
import logging
|
||||
import lzma
|
||||
import gzip
|
||||
import shutil
|
||||
|
||||
from avocado_qemu import Test
|
||||
from avocado.utils import process
|
||||
|
|
@ -37,14 +40,21 @@ 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:
|
||||
fail = 'Failure message found in console: %s' % failure_message
|
||||
self.fail(fail)
|
||||
|
||||
def exec_command_and_wait_for_pattern(self, command, success_message):
|
||||
command += '\n'
|
||||
self.vm.console_socket.sendall(command.encode())
|
||||
self.wait_for_console_pattern(success_message)
|
||||
|
||||
def extract_from_deb(self, deb, path):
|
||||
"""
|
||||
Extracts a file from a deb package into the test workdir
|
||||
|
|
@ -55,8 +65,9 @@ class BootLinuxConsole(Test):
|
|||
"""
|
||||
cwd = os.getcwd()
|
||||
os.chdir(self.workdir)
|
||||
process.run("ar x %s data.tar.gz" % deb)
|
||||
archive.extract("data.tar.gz", self.workdir)
|
||||
file_path = process.run("ar t %s" % deb).stdout_text.split()[2]
|
||||
process.run("ar x %s %s" % (deb, file_path))
|
||||
archive.extract(file_path, self.workdir)
|
||||
os.chdir(cwd)
|
||||
return self.workdir + path
|
||||
|
||||
|
|
@ -135,6 +146,105 @@ class BootLinuxConsole(Test):
|
|||
console_pattern = 'Kernel command line: %s' % kernel_command_line
|
||||
self.wait_for_console_pattern(console_pattern)
|
||||
|
||||
def test_mips_malta_cpio(self):
|
||||
"""
|
||||
:avocado: tags=arch:mips
|
||||
:avocado: tags=machine:malta
|
||||
:avocado: tags=endian:big
|
||||
"""
|
||||
deb_url = ('http://snapshot.debian.org/archive/debian/'
|
||||
'20160601T041800Z/pool/main/l/linux/'
|
||||
'linux-image-4.5.0-2-4kc-malta_4.5.5-1_mips.deb')
|
||||
deb_hash = 'a3c84f3e88b54e06107d65a410d1d1e8e0f340f8'
|
||||
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
|
||||
kernel_path = self.extract_from_deb(deb_path,
|
||||
'/boot/vmlinux-4.5.0-2-4kc-malta')
|
||||
initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
|
||||
'8584a59ed9e5eb5ee7ca91f6d74bbb06619205b8/rootfs/'
|
||||
'mips/rootfs.cpio.gz')
|
||||
initrd_hash = 'bf806e17009360a866bf537f6de66590de349a99'
|
||||
initrd_path_gz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
|
||||
initrd_path = self.workdir + "rootfs.cpio"
|
||||
|
||||
with gzip.open(initrd_path_gz, 'rb') as f_in:
|
||||
with open(initrd_path, 'wb') as f_out:
|
||||
shutil.copyfileobj(f_in, f_out)
|
||||
|
||||
self.vm.set_machine('malta')
|
||||
self.vm.set_console()
|
||||
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE
|
||||
+ 'console=ttyS0 console=tty '
|
||||
+ 'rdinit=/sbin/init noreboot')
|
||||
self.vm.add_args('-kernel', kernel_path,
|
||||
'-initrd', initrd_path,
|
||||
'-append', kernel_command_line,
|
||||
'-no-reboot')
|
||||
self.vm.launch()
|
||||
self.wait_for_console_pattern('Boot successful.')
|
||||
|
||||
self.exec_command_and_wait_for_pattern('cat /proc/cpuinfo',
|
||||
'BogoMIPS')
|
||||
self.exec_command_and_wait_for_pattern('uname -a',
|
||||
'Debian')
|
||||
self.exec_command_and_wait_for_pattern('reboot',
|
||||
'reboot: Restarting system')
|
||||
|
||||
def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash):
|
||||
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
||||
kernel_path = self.workdir + "kernel"
|
||||
with lzma.open(kernel_path_xz, 'rb') as f_in:
|
||||
with open(kernel_path, 'wb') as f_out:
|
||||
shutil.copyfileobj(f_in, f_out)
|
||||
|
||||
self.vm.set_machine('malta')
|
||||
self.vm.set_console()
|
||||
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE
|
||||
+ 'mem=256m@@0x0 '
|
||||
+ 'console=ttyS0')
|
||||
self.vm.add_args('-no-reboot',
|
||||
'-cpu', 'I7200',
|
||||
'-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_mips_malta32el_nanomips_4k(self):
|
||||
"""
|
||||
:avocado: tags=arch:mipsel
|
||||
:avocado: tags=machine:malta
|
||||
:avocado: tags=endian:little
|
||||
"""
|
||||
kernel_url = ('https://mipsdistros.mips.com/LinuxDistro/nanomips/'
|
||||
'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/'
|
||||
'generic_nano32r6el_page4k.xz')
|
||||
kernel_hash = '477456aafd2a0f1ddc9482727f20fe9575565dd6'
|
||||
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
|
||||
|
||||
def test_mips_malta32el_nanomips_16k_up(self):
|
||||
"""
|
||||
:avocado: tags=arch:mipsel
|
||||
:avocado: tags=machine:malta
|
||||
:avocado: tags=endian:little
|
||||
"""
|
||||
kernel_url = ('https://mipsdistros.mips.com/LinuxDistro/nanomips/'
|
||||
'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/'
|
||||
'generic_nano32r6el_page16k_up.xz')
|
||||
kernel_hash = 'e882868f944c71c816e832e2303b7874d044a7bc'
|
||||
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
|
||||
|
||||
def test_mips_malta32el_nanomips_64k_dbg(self):
|
||||
"""
|
||||
:avocado: tags=arch:mipsel
|
||||
:avocado: tags=machine:malta
|
||||
:avocado: tags=endian:little
|
||||
"""
|
||||
kernel_url = ('https://mipsdistros.mips.com/LinuxDistro/nanomips/'
|
||||
'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/'
|
||||
'generic_nano32r6el_page64k_dbg.xz')
|
||||
kernel_hash = '18d1c68f2e23429e266ca39ba5349ccd0aeb7180'
|
||||
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
|
||||
|
||||
def test_aarch64_virt(self):
|
||||
"""
|
||||
:avocado: tags=arch:aarch64
|
||||
|
|
@ -176,6 +286,33 @@ 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()
|
||||
kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE
|
||||
self.vm.add_args('-kernel', uboot_path,
|
||||
'-append', kernel_command_line,
|
||||
'-drive', 'file=' + spi_path + ',if=mtd,format=raw',
|
||||
'-no-reboot')
|
||||
self.vm.launch()
|
||||
self.wait_for_console_pattern('init started: BusyBox')
|
||||
|
||||
def test_s390x_s390_ccw_virtio(self):
|
||||
"""
|
||||
:avocado: tags=arch:s390x
|
||||
|
|
|
|||
Loading…
Reference in New Issue