Merge ~canonical-kernel-team/+git/autotest-client-tests:myamada/ptrace-get-set-sud into ~canonical-kernel-team/+git/autotest-client-tests:master

[Masahiro Yamada]

I'd like to propose a solution for the following bug ticket.

https://bugs.launchpad.net/ubuntu-kernel-tests/+bug/2044079

[Po-Hsu Lin (cypressyew)]

Thanks for the investigation and the fix!
Patch tested on an ARM64 box with Noble-6.8 and it's working as expected.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed with BugLink format amended plus test name added to the title.
Thanks!

diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
index cd29963..7a7984e 100644
--- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
+++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
@@ -136,6 +136,17 @@ class ubuntu_kernel_selftests(test.test):
                 utils.system(cmd)
 
             #
+            # Disable ptrace/get_set_sud on architectures without CONFIG_GENERIC_ENTRY
+            # LP: #2044079
+            #
+            config_file = '/boot/config-{}'.format(platform.uname()[2])
+            if os.path.exists(config_file) and not 'CONFIG_GENERIC_ENTRY=y' in open(config_file).read():
+                mk = 'linux/tools/testing/selftests/ptrace/Makefile'
+                if os.path.exists(mk):
+                    cmd = 'sed -i "s/ get_set_sud//" ' + mk
+                    utils.system(cmd)
+
+            #
             # memory hotplug test will fail on arm and several cloud platforms from 5.6+
             # as it was enabled in 5.6 but needs memory that does not
             # have boot time pages in the regions to be offlined and