From 3450b7d9859ad6e981ca2202b7c44bf53931f7ce Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Wed, 14 Feb 2024 11:38:10 +0000 Subject: [PATCH] nix: Polish Ring test Signed-off-by: Nick Spinale --- hacking/nix/scope/world/instances/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hacking/nix/scope/world/instances/default.nix b/hacking/nix/scope/world/instances/default.nix index 581c741d4..559e0af36 100644 --- a/hacking/nix/scope/world/instances/default.nix +++ b/hacking/nix/scope/world/instances/default.nix @@ -78,8 +78,9 @@ in rec { tests.root-task.panicking.byConfig.abort.withoutAlloc tests.root-task.panicking.byConfig.unwind.withAlloc tests.root-task.panicking.byConfig.unwind.withoutAlloc - tests.root-task.default-test-harness tests.root-task.c + tests.root-task.default-test-harness + # tests.root-task.ring tests.capdl.threads tests.capdl.utcover microkit.examples.hello @@ -212,7 +213,7 @@ in rec { }; }); - ring = maybe (haveFullRuntime && haveUnwindingSupport) ( + ring = maybe (haveFullRuntime && haveUnwindingSupport && !hostPlatform.isRiscV32) ( let rootTask = lib.makeOverridable mkTask { rootCrate = crates.ring; @@ -256,7 +257,7 @@ in rec { in { inherit byElf; - all = mkRunTests "run-all-ring-test" (lib.flip lib.mapAttrsToList byElf (k: v: lib.nameValuePair k v.automate)); + automate = mkRunTests "run-all-ring-test" (lib.flip lib.mapAttrsToList byElf (k: v: lib.nameValuePair k v.automate)); } );