From 902810b16b2586cdb4dd4356ebf6bd89d48ceaeb Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Sun, 27 Oct 2024 23:56:46 -0700 Subject: [PATCH] nix: Disable unwinding for Verus test Signed-off-by: Nick Spinale --- crates/private/tests/root-task/verus/task/Cargo.nix | 4 +++- crates/private/tests/root-task/verus/task/Cargo.toml | 2 +- hacking/nix/scope/world/instances/verus.nix | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crates/private/tests/root-task/verus/task/Cargo.nix b/crates/private/tests/root-task/verus/task/Cargo.nix index 1fee0f57f..998f65e2f 100644 --- a/crates/private/tests/root-task/verus/task/Cargo.nix +++ b/crates/private/tests/root-task/verus/task/Cargo.nix @@ -11,8 +11,10 @@ mk { dependencies = { inherit (localCrates) sel4 - sel4-root-task tests-root-task-verus-core ; + sel4-root-task = localCrates.sel4-root-task // { + default-features = false; + }; }; } diff --git a/crates/private/tests/root-task/verus/task/Cargo.toml b/crates/private/tests/root-task/verus/task/Cargo.toml index 80b470c2d..344dedc9d 100644 --- a/crates/private/tests/root-task/verus/task/Cargo.toml +++ b/crates/private/tests/root-task/verus/task/Cargo.toml @@ -18,5 +18,5 @@ license = "BSD-2-Clause" [dependencies] sel4 = { path = "../../../../../sel4" } -sel4-root-task = { path = "../../../../../sel4-root-task" } +sel4-root-task = { path = "../../../../../sel4-root-task", default-features = false } tests-root-task-verus-core = { path = "../core" } diff --git a/hacking/nix/scope/world/instances/verus.nix b/hacking/nix/scope/world/instances/verus.nix index a4a1a74a7..206317e2a 100644 --- a/hacking/nix/scope/world/instances/verus.nix +++ b/hacking/nix/scope/world/instances/verus.nix @@ -25,7 +25,9 @@ mkInstance { rootCrate = crates.tests-root-task-verus-task; release = false; - verifyWithVerus = true; + extraProfile = { + panic = "abort"; + }; layers = [ crateUtils.defaultIntermediateLayer @@ -34,6 +36,8 @@ mkInstance { modifications = seL4Modifications; } ]; + + verifyWithVerus = true; }; extraPlatformArgs = lib.optionalAttrs canSimulate {