[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/11] tests/ssh_linux_malta: Fix 64-bit target tests
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 11/11] tests/ssh_linux_malta: Fix 64-bit target tests |
Date: |
Sat, 19 Oct 2019 17:10:58 +0200 |
Commit 9090d3332cdcc added tests for specific to the 32-bit
machines, which inadvertently make the 64-bit tests failing.
Now than we have this information available in the CPU_INFO
array, use it to have the 64-bit tests back.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
.mailmap | 1 +
tests/acceptance/linux_ssh_mips_malta.py | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.mailmap b/.mailmap
index 0756a0bf66..fb7d7ede76 100644
--- a/.mailmap
+++ b/.mailmap
@@ -158,3 +158,4 @@ Zhengui Li <address@hidden>
Zhenwei Pi <address@hidden>
Zhenwei Pi <address@hidden>
Zhuang Yanying <address@hidden>
+Aleksandar Rikalo <address@hidden> <address@hidden>
diff --git a/tests/acceptance/linux_ssh_mips_malta.py
b/tests/acceptance/linux_ssh_mips_malta.py
index 2139c80f5f..fc13f9e4d4 100644
--- a/tests/acceptance/linux_ssh_mips_malta.py
+++ b/tests/acceptance/linux_ssh_mips_malta.py
@@ -44,8 +44,8 @@ class LinuxSSH(Test):
}
}
CPU_INFO = {
- 32: {'kernel_release': '3.2.0-4-4kc-malta'},
- 64: {'kernel_release': '3.2.0-4-5kc-malta'}
+ 32: {'cpu': 'MIPS 24Kc', 'kernel_release': '3.2.0-4-4kc-malta'},
+ 64: {'cpu': 'MIPS 20Kc', 'kernel_release': '3.2.0-4-5kc-malta'}
}
def get_url(self, endianess, path=''):
@@ -143,16 +143,16 @@ class LinuxSSH(Test):
else:
self.fail('"%s" output does not contain "%s"' % (cmd, exp))
- def run_common_commands(self):
+ def run_common_commands(self, wordsize):
self.ssh_command_output_contains(
'cat /proc/cpuinfo',
- '24Kc')
+ self.CPU_INFO[wordsize]['cpu'])
self.ssh_command_output_contains(
'uname -m',
'mips')
self.ssh_command_output_contains(
'uname -r',
- '3.2.0-4-4kc-malta')
+ self.CPU_INFO[wordsize]['kernel_release'])
self.ssh_command_output_contains(
'cat /proc/interrupts',
'XT-PIC timer')
@@ -209,7 +209,7 @@ class LinuxSSH(Test):
stdout, _ = self.ssh_command('uname -a')
self.assertIn(True, [uname_m + " GNU/Linux" in line for line in
stdout])
- self.run_common_commands()
+ self.run_common_commands(wordsize)
self.shutdown_via_ssh()
def test_mips_malta32eb_kernel3_2_0(self):
--
2.21.0
- [PATCH 02/11] tests/acceptance: Fixe wait_for_console_pattern() hangs, (continued)
- [PATCH 02/11] tests/acceptance: Fixe wait_for_console_pattern() hangs, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 03/11] tests/acceptance: Send <carriage return> on serial lines, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 01/11] Acceptance tests: refactor wait_for_console_pattern, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 04/11] tests/acceptance: Refactor exec_command_and_wait_for_pattern(), Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 05/11] tests/boot_linux_console: Use Avocado archive::gzip_uncompress(), Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 07/11] tests/ssh_linux_malta: Run tests using a snapshot image, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 10/11] tests/ssh_linux_malta: Refactor how to get image/kernel info, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 09/11] tests/ssh_linux_malta: Match stricter console output, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 06/11] tests/boot_linux_console: Run BusyBox on 5KEc 64-bit cpu, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 08/11] tests/ssh_linux_malta: Remove duplicated test, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 11/11] tests/ssh_linux_malta: Fix 64-bit target tests,
Philippe Mathieu-Daudé <=
- Re: [PATCH 00/11] tests/acceptance: Fix 64-bit MIPS target tests, Philippe Mathieu-Daudé, 2019/10/19