Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/cyclictest-build into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

BugLink: https://bugs.launchpad.net/bugs/2036687

This test will need gcc to run. Also add a setup task to separate
test build phase and actual test phase.

[Sean Feole (sfeole)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, thanks!

diff --git a/cyclictest/control b/cyclictest/control
index 51ce596..45ffc4c 100644
--- a/cyclictest/control
+++ b/cyclictest/control
@@ -10,4 +10,6 @@ TEST_CLASS = 'kernel'
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
 
-job.run_test('cyclictest')
+result = job.run_test_detail('cyclictest', test_name='setup', tag='setup', timeout=60*5)
+if result == 'GOOD':
+    job.run_test('cyclictest', test_name='cyclictest', tag='cyclictest')
diff --git a/cyclictest/cyclictest.py b/cyclictest/cyclictest.py
index 29bb48b..eabc6fe 100644
--- a/cyclictest/cyclictest.py
+++ b/cyclictest/cyclictest.py
@@ -1,4 +1,5 @@
 import os
+import platform
 from autotest.client import test
 from autotest.client.shared import utils
 
@@ -11,10 +12,30 @@ class cyclictest(test.test):
     def initialize(self):
         pass
 
+    def install_required_pkgs(self):
+        arch   = platform.processor()
+        try:
+            series = platform.dist()[2]
+        except AttributeError:
+            import distro
+            series = distro.codename()
+
+        pkgs = [
+            'build-essential',
+        ]
+        gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x', 'riscv64'] else 'gcc-multilib'
+        pkgs.append(gcc)
+
+        cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
+        self.results = utils.system_output(cmd, retain_output=True)
+
     def setup(self):
+        self.install_required_pkgs()
         self.job.require_gcc()
         os.chdir(self.srcdir)
         utils.make()
 
-    def execute(self, args='-t 10 -l 100000'):
+    def run_once(self, test_name, args='-t 10 -l 100000'):
+        if test_name == 'setup':
+            return
         utils.system(self.srcdir + '/cyclictest ' + args)