@@ -9,6 +9,7 @@
# later. See the COPYING file in the top-level directory.
import os
+import time
from avocado import skipIf
from avocado_qemu import QemuSystemTest
@@ -20,7 +21,7 @@
class RxGdbSimMachine(QemuSystemTest):
timeout = 30
- KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 console=ttySC0,9600'
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_uboot(self):
@@ -31,8 +32,8 @@ def test_uboot(self):
:avocado: tags=machine:gdbsim-r5f562n8
:avocado: tags=endian:little
"""
- uboot_url = ('https://acc.dl.osdn.jp/users/23/23888/u-boot.bin.gz')
- uboot_hash = '9b78dbd43b40b2526848c0b1ce9de02c24f4dcdb'
+ uboot_url = ('https://osdn.dl.osdn.net/users/37/37476/u-boot.bin.gz')
+ uboot_hash = '5299a1deb6540ed8699a21ab32b61d862f8d3e32'
uboot_path = self.fetch_asset(uboot_url, asset_hash=uboot_hash)
uboot_path = archive.uncompress(uboot_path, self.workdir)
@@ -40,11 +41,14 @@ def test_uboot(self):
self.vm.add_args('-bios', uboot_path,
'-no-reboot')
self.vm.launch()
- uboot_version = 'U-Boot 2016.05-rc3-23705-ga1ef3c71cb-dirty'
+ uboot_version = 'U-Boot 2021.10-rc3-00012-g92f3eb4647 ' \
+ '(Jan 02 2022 - 21:06:23 +0900)'
wait_for_console_pattern(self, uboot_version)
- gcc_version = 'rx-unknown-linux-gcc (GCC) 9.0.0 20181105 (experimental)'
- # FIXME limit baudrate on chardev, else we type too fast
- #exec_command_and_wait_for_pattern(self, 'version', gcc_version)
+ gcc_version = 'rx-unknown-linux-gcc (GCC) 12.0.0 20210903 ' \
+ '(experimental)'
+ # Wait for prompt
+ time.sleep(1)
+ exec_command_and_wait_for_pattern(self, 'version', gcc_version)
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_linux_sash(self):
@@ -55,18 +59,19 @@ def test_linux_sash(self):
:avocado: tags=machine:gdbsim-r5f562n7
:avocado: tags=endian:little
"""
- dtb_url = ('https://acc.dl.osdn.jp/users/23/23887/rx-virt.dtb')
- dtb_hash = '7b4e4e2c71905da44e86ce47adee2210b026ac18'
+ dtb_url = ('https://osdn.dl.osdn.net/users/37/37625/rx-virt.dtb')
+ dtb_hash = 'c69ee47d322285d1fc359d18d50b74e385b4d76c'
dtb_path = self.fetch_asset(dtb_url, asset_hash=dtb_hash)
- kernel_url = ('http://acc.dl.osdn.jp/users/23/23845/zImage')
- kernel_hash = '39a81067f8d72faad90866ddfefa19165d68fc99'
+ kernel_url = ('https://osdn.dl.osdn.net/users/37/37623/zImage')
+ kernel_hash = '7aa396cd62d81d05fb5f8d7e56154cf4bf20e029'
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
self.vm.set_console()
kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'earlycon'
self.vm.add_args('-kernel', kernel_path,
'-dtb', dtb_path,
- '-no-reboot')
+ '-no-reboot',
+ '-append', kernel_command_line)
self.vm.launch()
wait_for_console_pattern(self, 'Sash command shell (version 1.1.1)',
failure_message='Kernel panic - not syncing')
Since SCI supports continuous data receive, Added that test. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> --- tests/avocado/machine_rx_gdbsim.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)