[4/6] testsuite: make compat test standalone test

Message ID 20251217140827.166531-5-felix.moessbauer@siemens.com
State Under Review
Headers show
Series [1/6] testsuite: move targets with custom kernel to separate test | expand

Commit Message

Felix Moessbauer Dec. 17, 2025, 2:08 p.m. UTC
Currently, enabling compat mode during configuration also changes the
set of packages we build. As this is done with appends, some packages
are unconditionally added, despite not being part of the original test
case. We change this by only enabling compat mode when selecting compat.
To actually test the compat feature, we add a simple and fast test that
builds the hello-isar-compat package.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 testsuite/cibuilder.py |  4 ----
 testsuite/citest.py    | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Patch

diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index 46bfc546..25e3b6cb 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -180,11 +180,7 @@  class CIBuilder(Test):
             if compat_arch:
                 f.write(
                     'ISAR_ENABLE_COMPAT_ARCH:amd64 = "1"\n'
-                    'IMAGE_INSTALL:remove:amd64 = "hello-isar"\n'
-                    'IMAGE_INSTALL:append:amd64 = " hello-isar-compat"\n'
                     'ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\n'
-                    'IMAGE_INSTALL:remove:arm64 = "hello-isar"\n'
-                    'IMAGE_INSTALL:append:arm64 = " hello-isar-compat"\n'
                 )
             if not cross:
                 f.write('ISAR_CROSS_COMPILE = "0"\n')
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 601eca92..aee138bc 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -112,6 +112,25 @@  class DevTest(CIBaseTest):
         self.vm_start('arm', 'bookworm', skip_modulecheck=True)
 
 
+class CompatTest(CIBaseTest):
+    """
+    Test compilation of recipes for compat architecture.
+    This also tests a custom sbuild chroot for compat.
+    :avocado: tags=compat,fast
+    """
+
+    def test_compat_recipe(self):
+        targets = [
+            'mc:qemuamd64-bookworm:hello-isar-compat',
+            'mc:qemuarm64-bookworm:hello-isar-compat',
+            'mc:qemuamd64-trixie:hello-isar-compat',
+            'mc:qemuarm64-trixie:hello-isar-compat',
+        ]
+
+        self.init()
+        self.perform_build_test(targets, compat_arch=True)
+
+
 class ReproTest(CIBaseTest):
 
     """