| Message ID | 20191019153437.9820-12-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | tests/acceptance: Fix 64-bit MIPS target tests | expand |
On Saturday, October 19, 2019, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > 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é <f4bug@amsat.org> > --- > v2: do not include Aleksandar Rikalo mailmap change > --- > tests/acceptance/linux_ssh_mips_malta.py | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > 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 > > >
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):
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é <f4bug@amsat.org> --- v2: do not include Aleksandar Rikalo mailmap change --- tests/acceptance/linux_ssh_mips_malta.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)