More test updates

CTSRD-CHERI · Apr 16, 2024 · bbca258 · bbca258
1 parent 03ad367
commit bbca258
Showing 1 changed file with 25 additions and 9 deletions.
diff --git a/tests/test_argument_parsing.py b/tests/test_argument_parsing.py
@@ -833,12 +833,12 @@ def test_disk_image_path(target, expected_name):
         pytest.param(
             "cheribsd-riscv64-purecap",
             ["--cheribsd/build-fett-kernels"],
-            ["CHERI-PURECAP-QEMU", "CHERI-PURECAP-QEMU-FETT", "CHERI-QEMU"],
+            ["CHERI-PURECAP-QEMU",  "CHERI-QEMU", "CHERI-QEMU-FETT"],
         ),
         pytest.param(
             "cheribsd-riscv64-purecap",
             ["--cheribsd/build-bench-kernels", "--cheribsd/no-build-alternate-abi-kernels"],
-            ["CHERI-QEMU", "CHERI-QEMU-NODEBUG"],
+            ["CHERI-PURECAP-QEMU", "CHERI-PURECAP-QEMU-NODEBUG"],
         ),
         pytest.param(
             "cheribsd-riscv64-purecap",
@@ -866,8 +866,16 @@ def test_disk_image_path(target, expected_name):
         ),
         # Morello kernconf tests
         pytest.param("cheribsd-aarch64", [], ["GENERIC"]),
-        pytest.param("cheribsd-morello-purecap", ["--cheribsd/no-build-alternate-abi-kernels"], ["GENERIC-MORELLO"]),
-        pytest.param("cheribsd-morello-purecap", [], ["GENERIC-MORELLO", "GENERIC-MORELLO-PURECAP"]),
+        pytest.param(
+            "cheribsd-morello-purecap",
+            ["--cheribsd/no-build-alternate-abi-kernels"],
+            ["GENERIC-MORELLO-PURECAP"]
+        ),
+        pytest.param(
+            "cheribsd-morello-purecap",
+            [],
+            ["GENERIC-MORELLO-PURECAP", "GENERIC-MORELLO"]
+        ),
         pytest.param(
             "cheribsd-morello-purecap",
             ["--cheribsd-morello-purecap/kernel-config", "CUSTOM-KERNEL-CONFIG"],
@@ -908,12 +916,20 @@ def test_kernel_configs(target, config_options: "list[str]", expected_kernels: "
                 "--cheribsd-mfs-root-kernel-riscv64-purecap/build-fpga-kernels",
                 "--cheribsd-mfs-root-kernel-riscv64-purecap/no-build-alternate-abi-kernels",
             ],
-            ["CHERI-QEMU-MFS-ROOT", "CHERI-GFE"],
+            [
+                "CHERI-QEMU-MFS-ROOT",
+                "CHERI-GFE"
+            ],
         ),
         pytest.param(
             "cheribsd-mfs-root-kernel-riscv64-purecap",
             ["--cheribsd-mfs-root-kernel-riscv64-purecap/build-fpga-kernels"],
-            ["CHERI-QEMU-MFS-ROOT", "CHERI-PURECAP-QEMU-MFS-ROOT", "CHERI-GFE", "CHERI-PURECAP-GFE"],
+            [
+                "CHERI-PURECAP-QEMU-MFS-ROOT",
+                "CHERI-QEMU-MFS-ROOT",
+                "CHERI-PURECAP-GFE"
+                "CHERI-GFE",
+            ],
         ),
         pytest.param(
             "cheribsd-mfs-root-kernel-riscv64-purecap",
@@ -938,10 +954,10 @@ def test_kernel_configs(target, config_options: "list[str]", expected_kernels: "
             "cheribsd-mfs-root-kernel-riscv64-purecap",
             ["--cheribsd/build-nocaprevoke-kernel"],
             [
-                "CHERI-QEMU-MFS-ROOT",
-                "CHERI-NOCAPREVOKE-QEMU-MFS-ROOT",
                 "CHERI-PURECAP-QEMU-MFS-ROOT",
                 "CHERI-PURECAP-NOCAPREVOKE-QEMU-MFS-ROOT",
+                "CHERI-QEMU-MFS-ROOT",
+                "CHERI-NOCAPREVOKE-QEMU-MFS-ROOT",
             ],
         ),
     ],
@@ -1273,7 +1289,7 @@ def test_mfs_root_kernel_inherits_defaults_from_cheribsd():
         ],
     )
     assert cheribsd_riscv64_purecap.kernel_config == "BASE_CONFIG_RISCV64"
-    assert cheribsd_riscv64_hybrid.kernel_config == "CHERI-QEMU"
+    assert cheribsd_riscv64_hybrid.kernel_config == "CHERI-PURECAP-QEMU"
     assert mfs_riscv64.kernel_config is None
     assert mfs_riscv64_hybrid.kernel_config == "MFS_CONFIG_RISCV64_HYBRID"
     _parse_arguments(