Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/selftest-ftrace-cleanup into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

ftrace test has been moved into ubuntu_kselftests_ftrace, related code
can be removed now.

[Sean Feole (sfeole)]

+1

review: Approve

[Francis Ginther (fginther)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Patch applied, Thanks!

diff --git a/ubuntu_kernel_selftests/control b/ubuntu_kernel_selftests/control
index 396f870..33ec6af 100644
--- a/ubuntu_kernel_selftests/control
+++ b/ubuntu_kernel_selftests/control
@@ -60,15 +60,7 @@ if result == 'GOOD':
             tests = utils.system_output(cmd).split()
             for item in tests:
                 timeout_threshold = arch_scale*60*45
-                if item == 'ftracetest':
-                    if arch == 'riscv64':
-                        # autotest timeout on riscv64 is incorrect (lp:1940080), disable it
-                        # It takes about 22 mins on 5.15 and about 35 mins on 5.13
-                        timeout_threshold = 0
-                    else:
-                        # ftracetest will take about ~60 minutes to run on some instances (lp:2008063)
-                        timeout_threshold = 60 * 75
-                elif item == 'fcnal-test.sh':
+                if item == 'fcnal-test.sh':
                     timeout_threshold = arch_scale*60*75  # lp:2006499, lp:2012016
                 test = "{}:{}".format(category, item)
                 job.run_test_detail(NAME, test_name=test, tag=test, timeout=timeout_threshold)
diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
index 496099b..cb6f8ef 100644
--- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
+++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
@@ -166,26 +166,6 @@ class ubuntu_kernel_selftests(test.test):
                     utils.system(cmd)
 
             #
-            # Disable new ftrace tests that don't work reliably across
-            # architectures because of various symbols being checked
-            #
-            filenames = [
-                'ftrace/func_stack_tracer.tc',
-                'ftrace/func-filter-glob.tc',
-                'trigger/inter-event/trigger-inter-event-combined-hist.tc',
-                'trigger/inter-event/trigger-synthetic-event-createremove.tc',
-                'trigger/trigger-hist.tc',
-                'trigger/trigger-trace-marker-hist.tc',
-                'kprobe/probepoint.tc',
-                'kprobe/kprobe_module.tc',
-            ]
-
-            for fn in filenames:
-                fn = 'linux/tools/testing/selftests/ftrace/test.d/' + fn
-                if os.path.exists(fn):
-                    os.remove(fn)
-
-            #
             # ptrace/vmaccess was introduced in 5.7-rc1 and is broken ATM,
             # see https://lkml.org/lkml/2020/4/9/648
             #