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

[Po-Hsu Lin]

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

This test will take about 32.5 minutes to run on J-6.2 generic-64k ARM64
VM on openstack,

Separate the setup task so that we can know it's the test build or the
test itself is causing timeout, also bump to timeout to 40 minutes.

[Po-Hsu Lin (cypressyew)]

Note that we used to bump it once to 25 mins for older kernels in bug 2033498

[Francis Ginther (fginther)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied with typo corrected (separate) in the title.

diff --git a/rmaptest/control b/rmaptest/control
index 1ce4a3f..7250fca 100644
--- a/rmaptest/control
+++ b/rmaptest/control
@@ -12,4 +12,6 @@ DOC = """
 Create lots of VMAs mapped by lots of tasks.  To tickle objrmap and the
 virtual scan.
 """
-job.run_test('rmaptest', timeout=60*25)
+result = job.run_test_detail('rmaptest', test_name='setup', tag='setup', timeout=60*5)
+if result == 'GOOD':
+    job.run_test('rmaptest', test_name='rmaptest', tag='rmaptest', timeout=60*40)
diff --git a/rmaptest/rmaptest.py b/rmaptest/rmaptest.py
index 058dcac..d860dec 100644
--- a/rmaptest/rmaptest.py
+++ b/rmaptest/rmaptest.py
@@ -40,7 +40,9 @@ class rmaptest(test.test):
         os.chdir(self.srcdir)
         utils.system(utils.get_cc() + ' -Wall -o rmaptest rmap-test.c')
 
-    def execute(self, args=''):
+    def run_once(self, test_name, args=''):
+        if test_name == 'setup':
+            return
         os.chdir(self.tmpdir)
         for test in tests:
             cmd = '%s/%s %s %s' % (self.srcdir, test[name], args, test[arglist])