[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/20] tests/ssh_linux_malta: Fix 64-bit target tests
From: |
Aleksandar Markovic |
Subject: |
[PULL 20/20] tests/ssh_linux_malta: Fix 64-bit target tests |
Date: |
Fri, 25 Oct 2019 18:44:22 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
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>
Signed-off-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Message-Id: <address@hidden>
---
tests/acceptance/linux_ssh_mips_malta.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/acceptance/linux_ssh_mips_malta.py
b/tests/acceptance/linux_ssh_mips_malta.py
index 14b8a5b..aa12001 100644
--- a/tests/acceptance/linux_ssh_mips_malta.py
+++ b/tests/acceptance/linux_ssh_mips_malta.py
@@ -43,8 +43,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=''):
@@ -155,16 +155,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')
@@ -221,7 +221,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.7.4
- [PULL 08/20] target/mips: msa: Split helpers for HADD_<S|U>.<H|W|D>, (continued)
- [PULL 08/20] target/mips: msa: Split helpers for HADD_<S|U>.<H|W|D>, Aleksandar Markovic, 2019/10/25
- [PULL 13/20] target/mips: Demacro LMI decoder, Aleksandar Markovic, 2019/10/25
- [PULL 12/20] target/mips: msa: Split helpers for ASUB_<S|U>.<B|H|W|D>, Aleksandar Markovic, 2019/10/25
- [PULL 16/20] tests/ssh_linux_malta: Run tests using a snapshot image, Aleksandar Markovic, 2019/10/25
- [PULL 05/20] target/mips: msa: Split helpers for <MAX|MIN>_<S|U>.<B|H|W|D>, Aleksandar Markovic, 2019/10/25
- [PULL 17/20] tests/ssh_linux_malta: Remove duplicated test, Aleksandar Markovic, 2019/10/25
- [PULL 18/20] tests/ssh_linux_malta: Match stricter console output, Aleksandar Markovic, 2019/10/25
- [PULL 09/20] target/mips: msa: Split helpers for S<LL|RA|RAR|RL|RLR>.<B|H|W|D>, Aleksandar Markovic, 2019/10/25
- [PULL 06/20] target/mips: msa: Split helpers for ILV<EV|OD|L|R>.<B|H|W|D>, Aleksandar Markovic, 2019/10/25
- [PULL 19/20] tests/ssh_linux_malta: Refactor how to get image/kernel info, Aleksandar Markovic, 2019/10/25
- [PULL 20/20] tests/ssh_linux_malta: Fix 64-bit target tests,
Aleksandar Markovic <=
- [PULL 02/20] target/mips: Clean up op_helper.c, Aleksandar Markovic, 2019/10/25
- [PULL 15/20] target/mips: Refactor handling of vector compare 'less than' (signed) instructions, Aleksandar Markovic, 2019/10/25
- [PULL 14/20] target/mips: Refactor handling of vector compare 'equal' instructions, Aleksandar Markovic, 2019/10/25
- Re: [PULL 00/20] MIPS queue for October 24th, 2019 - v2, Peter Maydell, 2019/10/25