OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/acceptance/virtio-gpu.py: combine kernel command line 

Both tests use the same kernel command line arguments, so there's no
need to have a common and then an additional set of arguments.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20210714174051.28164-5-crosa@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
This commit is contained in:
Cleber Rosa 2021-07-14 13:40:49 -04:00
parent 3c6eb9c6f0
commit 532835d022
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/acceptance/virtio-gpu.py
View File

@ -34,7 +34,7 @@ class VirtioGPUx86(Test):
:avocado: tags=cpu:host
"""
KERNEL_COMMON_COMMAND_LINE = "printk.time=0 "
KERNEL_COMMAND_LINE = "printk.time=0 console=ttyS0 rdinit=/bin/bash"
KERNEL_URL = (
"https://archives.fedoraproject.org/pub/fedora"
"/linux/releases/33/Everything/x86_64/os/images"
@ -58,9 +58,6 @@ class VirtioGPUx86(Test):
"""
:avocado: tags=device:virtio-vga
"""
kernel_command_line = (
self.KERNEL_COMMON_COMMAND_LINE + "console=ttyS0 rdinit=/bin/bash"
)
# FIXME: should check presence of virtio, virgl etc
self.require_accelerator('kvm')
@ -78,7 +75,7 @@ class VirtioGPUx86(Test):
"-initrd",
initrd_path,
"-append",
kernel_command_line,
self.KERNEL_COMMAND_LINE,
)
try:
self.vm.launch()
@ -96,9 +93,6 @@ class VirtioGPUx86(Test):
"""
:avocado: tags=device:vhost-user-vga
"""
kernel_command_line = (
self.KERNEL_COMMON_COMMAND_LINE + "console=ttyS0 rdinit=/bin/bash"
)
# FIXME: should check presence of vhost-user-gpu, virgl, memfd etc
self.require_accelerator('kvm')
@ -145,7 +139,7 @@ class VirtioGPUx86(Test):
"-initrd",
initrd_path,
"-append",
kernel_command_line,
self.KERNEL_COMMAND_LINE,
)
self.vm.launch()
self.wait_for_console_pattern("as init process")