more fixes

CTSRD-CHERI · Apr 17, 2024 · 8c2aa38 · 8c2aa38
1 parent bbca258
commit 8c2aa38
Showing 1 changed file with 61 additions and 15 deletions.
diff --git a/tests/test_argument_parsing.py b/tests/test_argument_parsing.py
@@ -813,37 +813,73 @@ def test_disk_image_path(target, expected_name):
     ("target", "config_options", "expected_kernels"),
     [
         # RISCV kernconf tests
-        pytest.param("cheribsd-riscv64-purecap", ["--cheribsd/no-build-alternate-abi-kernels"], ["CHERI-PURECAP-QEMU"]),
+        pytest.param(
+            "cheribsd-riscv64-purecap",
+            ["--cheribsd/no-build-alternate-abi-kernels"],
+            ["CHERI-PURECAP-QEMU"],
+        ),
         pytest.param(
             "cheribsd-riscv64-purecap",
             ["--cheribsd/build-fpga-kernels"],
-            ["CHERI-QEMU", "CHERI-PURECAP-QEMU"],
+            [
+                "CHERI-QEMU",
+                "CHERI-PURECAP-QEMU",
+            ],
+        ),
+        pytest.param(
+            "cheribsd-riscv64-purecap",
+            [],
+            [
+                "CHERI-PURECAP-QEMU",
+                "CHERI-QEMU",
+            ]
         ),
-        pytest.param("cheribsd-riscv64-purecap", [], ["CHERI-PURECAP-QEMU", "CHERI-QEMU"]),
         pytest.param(
             "cheribsd-riscv64-purecap",
             ["--cheribsd/build-alternate-abi-kernels", "--cheribsd/default-kernel-abi", "purecap"],
-            ["CHERI-QEMU", "CHERI-PURECAP-QEMU"],
+            [
+                "CHERI-QEMU",
+                "CHERI-PURECAP-QEMU",
+            ],
         ),
         pytest.param(
             "cheribsd-riscv64-purecap",
-            ["--cheribsd/build-fett-kernels", "--cheribsd/no-build-alternate-abi-kernels"],
-            ["CHERI-PURECAP-QEMU", "CHERI-PURECAP-QEMU-FETT"],
+            [
+                "--cheribsd/build-fett-kernels",
+                "--cheribsd/no-build-alternate-abi-kernels"],
+            [
+                "CHERI-PURECAP-QEMU",
+                "CHERI-PURECAP-QEMU-FETT",
+            ],
         ),
         pytest.param(
             "cheribsd-riscv64-purecap",
             ["--cheribsd/build-fett-kernels"],
-            ["CHERI-PURECAP-QEMU",  "CHERI-QEMU", "CHERI-QEMU-FETT"],
+            [
+                "CHERI-PURECAP-QEMU",
+                "CHERI-QEMU",
+                "CHERI-QEMU-FETT",
+            ],
         ),
         pytest.param(
             "cheribsd-riscv64-purecap",
-            ["--cheribsd/build-bench-kernels", "--cheribsd/no-build-alternate-abi-kernels"],
-            ["CHERI-PURECAP-QEMU", "CHERI-PURECAP-QEMU-NODEBUG"],
+            [
+                "--cheribsd/build-bench-kernels",
+                "--cheribsd/no-build-alternate-abi-kernels"],
+            [
+                "CHERI-PURECAP-QEMU",
+                "CHERI-PURECAP-QEMU-NODEBUG",
+            ],
         ),
         pytest.param(
             "cheribsd-riscv64-purecap",
             ["--cheribsd/build-bench-kernels"],
-            ["CHERI-PURECAP-QEMU", "CHERI-PURECAP-QEMU-NODEBUG", "CHERI-QEMU", "CHERI-QEMU-NODEBUG"],
+            [
+                "CHERI-PURECAP-QEMU",
+                "CHERI-PURECAP-QEMU-NODEBUG",
+                "CHERI-QEMU",
+                "CHERI-QEMU-NODEBUG",
+            ],
         ),
         pytest.param(
             "cheribsd-riscv64-purecap",
@@ -852,12 +888,22 @@ def test_disk_image_path(target, expected_name):
                 "--cheribsd/build-fpga-kernels",
                 "--cheribsd/no-build-alternate-abi-kernels",
             ],
-            ["CHERI-PURECAP-QEMU", "CHERI-PURECAP-QEMU-FETT", "CHERI-PURECAP-FETT"],
+            [
+                "CHERI-PURECAP-QEMU",
+                "CHERI-PURECAP-QEMU-FETT",
+                "CHERI-PURECAP-FETT",
+            ],
         ),
         pytest.param(
             "cheribsd-riscv64-purecap",
             ["--cheribsd/build-fett-kernels", "--cheribsd/build-fpga-kernels"],
-            ["CHERI-QEMU", "CHERI-QEMU-FETT", "CHERI-PURECAP-QEMU", "CHERI-FETT", "CHERI-PURECAP-FETT"],
+            [
+                "CHERI-QEMU",
+                "CHERI-QEMU-FETT",
+                "CHERI-PURECAP-QEMU",
+                "CHERI-FETT",
+                "CHERI-PURECAP-FETT",
+            ],
         ),
         pytest.param(
             "cheribsd-riscv64-purecap",
@@ -917,8 +963,8 @@ def test_kernel_configs(target, config_options: "list[str]", expected_kernels: "
                 "--cheribsd-mfs-root-kernel-riscv64-purecap/no-build-alternate-abi-kernels",
             ],
             [
-                "CHERI-QEMU-MFS-ROOT",
-                "CHERI-GFE"
+                "CHERI-PURECAP-QEMU-MFS-ROOT",
+                "CHERI-PURECAP-GFE"
             ],
         ),
         pytest.param(
@@ -927,7 +973,7 @@ def test_kernel_configs(target, config_options: "list[str]", expected_kernels: "
             [
                 "CHERI-PURECAP-QEMU-MFS-ROOT",
                 "CHERI-QEMU-MFS-ROOT",
-                "CHERI-PURECAP-GFE"
+                "CHERI-PURECAP-GFE",
                 "CHERI-GFE",
             ],
         ),