cheribsd: Add missing CHERI(-PURECAP)-CAPREVOKE-QEMU-MFS-ROOT kernels

Otherwise cheribsd-mfs-root-kernel-riscv64-{hybrid,purecap} hit an assertion failure when --cheribsd/caprevoke-kernel is passed.
CTSRD-CHERI · Aug 16, 2023 · deb5634 · deb5634
1 parent 4033ebe
commit deb5634
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pycheribuild/projects/cross/cheribsd.py b/pycheribuild/projects/cross/cheribsd.py
@@ -234,6 +234,8 @@ def make_all(self) -> "list[CheriBSDConfig]":
             configs.append(self.make_config({ConfigPlatform.QEMU}, kernel_abi, caprevoke=True, default=True))
             configs.append(
                 self.make_config({ConfigPlatform.QEMU}, kernel_abi, caprevoke=True, benchmark=True, default=True))
+            configs.append(
+                self.make_config({ConfigPlatform.QEMU}, kernel_abi, caprevoke=True, mfsroot=True, default=True))
             configs.append(
                 self.make_config({ConfigPlatform.QEMU}, kernel_abi, caprevoke=True, benchmark=True, mfsroot=True,
                                  default=True))

diff --git a/tests/test_argument_parsing.py b/tests/test_argument_parsing.py
@@ -930,6 +930,14 @@ def test_kernel_configs(target, config_options: "list[str]", expected_kernels: "
             ["--cheribsd/build-bench-kernels", "--cheribsd/default-kernel-abi=hybrid"],
             ["GENERIC-MFS-ROOT"],
         ),
+        # Another regression test for assert len(configs) != 0, "No matching default kernel configuration"; we were
+        # missing CHERI(-PURECAP)-CAPREVOKE-QEMU-MFS-ROOT
+        pytest.param(
+            "cheribsd-mfs-root-kernel-riscv64-purecap",
+            ["--cheribsd/caprevoke-kernel"],
+            ["CHERI-CAPREVOKE-QEMU-MFS-ROOT", "CHERI-QEMU-MFS-ROOT", "CHERI-PURECAP-CAPREVOKE-QEMU-MFS-ROOT",
+             "CHERI-PURECAP-QEMU-MFS-ROOT"],
+        ),
     ],
 )
 def test_mfsroot_kernel_configs(target: str, config_options: "list[str]", expected_kernels: "list[str]"):