| Message ID | 20210615152339.41252-1-krzysztof.kozlowski@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [ACT,1/2] UBUNTU: SAUCE: ubuntu_kernel_selftests: properly disable memory-hotplug | expand |
LGTM, and I have this tested on our bare-metal arm64 node, it's
working as expected.
Acked-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
Applied and pushed.
Thanks
Sam
diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py index 0f4c46d24573..6f889fbb639f 100644 --- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py +++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py @@ -191,8 +191,9 @@ class ubuntu_kernel_selftests(test.test): if self.arch.startswith('arm') or self.arch == 'aarch64': print("Disabling memory hotplug test on ARM platform") fn = 'linux/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh' + mk = 'linux/tools/testing/selftests/memory-hotplug/Makefile' if os.path.exists(fn): - cmd = 'chmod -x ' + fn + cmd = 'sed -i "s/ mem-on-off-test.sh//" ' + mk utils.system(cmd) # net/txtimestamp.sh is very fragile, disable it
For arm64 the mem-on-off-test.sh from memory-hotplug was disabled by removing the executable bit. However this started failing recently: # selftests: memory-hotplug: mem-on-off-test.sh # Warning: file mem-on-off-test.sh is not executable, correct this. not ok 1 selftests: memory-hotplug: mem-on-off-test.sh Disable the test just like in other cases - by removing it from Makefile. BugLink: https://bugs.launchpad.net/bugs/1891003 Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- ubuntu_kernel_selftests/ubuntu_kernel_selftests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)