From f6df3fac97ee350cc6347794128ef3d7f86e1d65 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Wed, 14 Feb 2024 05:32:14 +0000 Subject: [PATCH] test_argument_parsing: Update tests after previous commit --- tests/test_argument_parsing.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_argument_parsing.py b/tests/test_argument_parsing.py index be0854070..b7f6a01a9 100644 --- a/tests/test_argument_parsing.py +++ b/tests/test_argument_parsing.py @@ -828,12 +828,12 @@ def test_disk_image_path(target, expected_name): pytest.param( "cheribsd-riscv64-purecap", ["--cheribsd/build-fett-kernels", "--cheribsd/no-build-alternate-abi-kernels"], - ["CHERI-QEMU-FETT", "CHERI-QEMU"], + ["CHERI-QEMU", "CHERI-QEMU-FETT"], ), pytest.param( "cheribsd-riscv64-purecap", ["--cheribsd/build-fett-kernels"], - ["CHERI-QEMU-FETT", "CHERI-QEMU", "CHERI-PURECAP-QEMU"], + ["CHERI-QEMU", "CHERI-QEMU-FETT", "CHERI-PURECAP-QEMU"], ), pytest.param( "cheribsd-riscv64-purecap", @@ -843,7 +843,7 @@ def test_disk_image_path(target, expected_name): pytest.param( "cheribsd-riscv64-purecap", ["--cheribsd/build-bench-kernels"], - ["CHERI-QEMU", "CHERI-QEMU-NODEBUG", "CHERI-PURECAP-QEMU-NODEBUG", "CHERI-PURECAP-QEMU"], + ["CHERI-QEMU", "CHERI-QEMU-NODEBUG", "CHERI-PURECAP-QEMU", "CHERI-PURECAP-QEMU-NODEBUG"], ), pytest.param( "cheribsd-riscv64-purecap", @@ -852,12 +852,12 @@ def test_disk_image_path(target, expected_name): "--cheribsd/build-fpga-kernels", "--cheribsd/no-build-alternate-abi-kernels", ], - ["CHERI-QEMU-FETT", "CHERI-QEMU", "CHERI-FETT"], + ["CHERI-QEMU", "CHERI-QEMU-FETT", "CHERI-FETT"], ), pytest.param( "cheribsd-riscv64-purecap", ["--cheribsd/build-fett-kernels", "--cheribsd/build-fpga-kernels"], - ["CHERI-QEMU-FETT", "CHERI-QEMU", "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", @@ -937,8 +937,8 @@ def test_kernel_configs(target, config_options: "list[str]", expected_kernels: " pytest.param( "cheribsd-mfs-root-kernel-riscv64-purecap", ["--cheribsd/build-nocaprevoke-kernel"], - ["CHERI-NOCAPREVOKE-QEMU-MFS-ROOT", "CHERI-QEMU-MFS-ROOT", "CHERI-PURECAP-NOCAPREVOKE-QEMU-MFS-ROOT", - "CHERI-PURECAP-QEMU-MFS-ROOT"], + ["CHERI-QEMU-MFS-ROOT", "CHERI-NOCAPREVOKE-QEMU-MFS-ROOT", "CHERI-PURECAP-QEMU-MFS-ROOT", + "CHERI-PURECAP-NOCAPREVOKE-QEMU-MFS-ROOT"], ), ], )