tests: one kernel per line in kernconf tests

Rewrap tests so each kernel is on it's own line. This simplifies later reordering.
CTSRD-CHERI · Apr 17, 2024 · a8c5575 · a8c5575
1 parent 726f04a
commit a8c5575
Showing 1 changed file with 69 additions and 13 deletions.
diff --git a/tests/test_argument_parsing.py b/tests/test_argument_parsing.py
@@ -813,37 +813,69 @@ 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-QEMU"]),
+ pytest.param(
+ "cheribsd-riscv64-purecap",
+ ["--cheribsd/no-build-alternate-abi-kernels"],
+ ["CHERI-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-QEMU",
+ "CHERI-PURECAP-QEMU"
+ ],
  ),
- pytest.param("cheribsd-riscv64-purecap", [], ["CHERI-QEMU", "CHERI-PURECAP-QEMU"]),
  pytest.param(
  "cheribsd-riscv64-purecap",
  ["--cheribsd/build-alternate-abi-kernels", "--cheribsd/default-kernel-abi", "purecap"],
- ["CHERI-PURECAP-QEMU", "CHERI-QEMU"],
+ [
+ "CHERI-PURECAP-QEMU",
+ "CHERI-QEMU",
+ ],
  ),
  pytest.param(
  "cheribsd-riscv64-purecap",
  ["--cheribsd/build-fett-kernels", "--cheribsd/no-build-alternate-abi-kernels"],
- ["CHERI-QEMU", "CHERI-QEMU-FETT"],
+ [
+ "CHERI-QEMU",
+ "CHERI-QEMU-FETT",
+ ],
  ),
  pytest.param(
  "cheribsd-riscv64-purecap",
  ["--cheribsd/build-fett-kernels"],
- ["CHERI-QEMU", "CHERI-QEMU-FETT", "CHERI-PURECAP-QEMU"],
+ [
+ "CHERI-QEMU",
+ "CHERI-QEMU-FETT",
+ "CHERI-PURECAP-QEMU",
+ ],
  ),
  pytest.param(
  "cheribsd-riscv64-purecap",
  ["--cheribsd/build-bench-kernels", "--cheribsd/no-build-alternate-abi-kernels"],
- ["CHERI-QEMU", "CHERI-QEMU-NODEBUG"],
+ [
+ "CHERI-QEMU",
+ "CHERI-QEMU-NODEBUG",
+ ],
  ),
  pytest.param(
  "cheribsd-riscv64-purecap",
  ["--cheribsd/build-bench-kernels"],
- ["CHERI-QEMU", "CHERI-QEMU-NODEBUG", "CHERI-PURECAP-QEMU", "CHERI-PURECAP-QEMU-NODEBUG"],
+ [
+ "CHERI-QEMU",
+ "CHERI-QEMU-NODEBUG",
+ "CHERI-PURECAP-QEMU",
+ "CHERI-PURECAP-QEMU-NODEBUG",
+ ],
  ),
  pytest.param(
  "cheribsd-riscv64-purecap",
@@ -852,22 +884,46 @@ def test_disk_image_path(target, expected_name):
  "--cheribsd/build-fpga-kernels",
  "--cheribsd/no-build-alternate-abi-kernels",
  ],
- ["CHERI-QEMU", "CHERI-QEMU-FETT", "CHERI-FETT"],
+ [
+ "CHERI-QEMU",
+ "CHERI-QEMU-FETT",
+ "CHERI-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",
  ["--cheribsd-riscv64-purecap/kernel-config", "CUSTOM-KERNEL-CONFIG"],
  ["CUSTOM-KERNEL-CONFIG"],
  ),
  # 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-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-morello-purecap/kernel-config", "CUSTOM-KERNEL-CONFIG"],