[ACT][PATCH 1/2] UBUNTU: SAUCE: ubuntu_kernel_selftests: properly disable memory-hotplug

Krzysztof Kozlowski krzysztof.kozlowski at canonical.com
Tue Jun 15 15:23:38 UTC 2021


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 at canonical.com>
---
 ubuntu_kernel_selftests/ubuntu_kernel_selftests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
-- 
2.27.0




More information about the kernel-team mailing list