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

[Po-Hsu Lin]

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

Tests from kernel selftest now require header files to be built first.

This affects:
* ubuntu_kernel_selftests
* ubuntu_bpf
* ubuntu_kselftest_ftrace

Run the make header command during setup phase, so that we just need
to run it once.

[Po-Hsu Lin (cypressyew)]

This is hindering test build on Xenial, maybe we should limit this make header thing to newer kernels (jammy+)

[Francis Ginther (fginther)]

+1

review: Approve

[Sean Feole (sfeole)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed. Thanks!

diff --git a/ubuntu_bpf/ubuntu_bpf.py b/ubuntu_bpf/ubuntu_bpf.py
index 0c52a7e..516bc58 100644
--- a/ubuntu_bpf/ubuntu_bpf.py
+++ b/ubuntu_bpf/ubuntu_bpf.py
@@ -43,6 +43,11 @@ class ubuntu_bpf(test.test):
         else:
             pkgs.extend(['clang', 'llvm', 'lld'])
 
+        # Build header first (LP: #2031400)
+        if not self.series in ['trusty', 'xenial', 'bionic', 'focal']:
+            cmd = "make -C linux/ headers"
+            utils.system_output(cmd, retain_output=True)
+
         cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
 
diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
index 23269c4..496099b 100644
--- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
+++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
@@ -220,6 +220,12 @@ class ubuntu_kernel_selftests(test.test):
                 cmd = 'sed -i "/^TEST_PROGS += txtimestamp.sh$/d" ' + fn
                 utils.system(cmd)
 
+            # Build header first (LP: #2031400)
+            if not self.series in ['trusty', 'xenial', 'bionic', 'focal']:
+                cmd = "make -C linux/ headers"
+                utils.system_output(cmd, retain_output=True)
+
+
     def run_once(self, test_name):
         if test_name == 'setup':
             return
diff --git a/ubuntu_kselftests_ftrace/ubuntu_kselftests_ftrace.py b/ubuntu_kselftests_ftrace/ubuntu_kselftests_ftrace.py
index 0f14def..74d5c0c 100644
--- a/ubuntu_kselftests_ftrace/ubuntu_kselftests_ftrace.py
+++ b/ubuntu_kselftests_ftrace/ubuntu_kselftests_ftrace.py
@@ -84,6 +84,11 @@ class ubuntu_kselftests_ftrace(test.test):
                 if os.path.exists(fn):
                     os.remove(fn)
 
+            # Build header first (LP: #2031400)
+            if not self.series in ['trusty', 'xenial', 'bionic', 'focal']:
+                cmd = "make -C linux/ headers"
+                utils.system_output(cmd, retain_output=True)
+
 
     def run_once(self, test_name):
         if test_name == 'setup':