From f2bf4970c95b772f6da8890200a2e20788609cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 8 Oct 2025 13:53:11 +0200 Subject: [PATCH] Replace __noChroot with requiredSystemFeatures --- test/compilers/clang-openmp-ld.nix | 5 ++--- test/compilers/clang-openmp-nosv.nix | 5 ++--- test/compilers/clang-openmp.nix | 5 ++--- test/compilers/ompss2.nix | 7 ++++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/test/compilers/clang-openmp-ld.nix b/test/compilers/clang-openmp-ld.nix index 593706a..1b9f0bb 100644 --- a/test/compilers/clang-openmp-ld.nix +++ b/test/compilers/clang-openmp-ld.nix @@ -23,9 +23,8 @@ in stdenv.mkDerivation { dontUnpack = true; dontConfigure = true; - # nOS-V requires access to /sys/devices to request NUMA information. It will - # fail to run otherwise, so we disable the sandbox for this test. - __noChroot = true; + # nOS-V requires access to /sys/devices to request NUMA information + requiredSystemFeatures = [ "sys-devices" ]; buildInputs = [ openmp ]; diff --git a/test/compilers/clang-openmp-nosv.nix b/test/compilers/clang-openmp-nosv.nix index 237e466..67b8189 100644 --- a/test/compilers/clang-openmp-nosv.nix +++ b/test/compilers/clang-openmp-nosv.nix @@ -36,9 +36,8 @@ in stdenv.mkDerivation { dontUnpack = true; dontConfigure = true; - # nOS-V requires access to /sys/devices to request NUMA information. It will - # fail to run otherwise, so we disable the sandbox for this test. - __noChroot = true; + # nOS-V requires access to /sys/devices to request NUMA information + requiredSystemFeatures = [ "sys-devices" ]; buildInputs = [ nosv ]; diff --git a/test/compilers/clang-openmp.nix b/test/compilers/clang-openmp.nix index 42044c7..e0833c0 100644 --- a/test/compilers/clang-openmp.nix +++ b/test/compilers/clang-openmp.nix @@ -24,9 +24,8 @@ in stdenv.mkDerivation { dontUnpack = true; dontConfigure = true; - # nOS-V requires access to /sys/devices to request NUMA information. It will - # fail to run otherwise, so we disable the sandbox for this test. - __noChroot = true; + # nOS-V requires access to /sys/devices to request NUMA information + requiredSystemFeatures = [ "sys-devices" ]; buildPhase = '' set -x diff --git a/test/compilers/ompss2.nix b/test/compilers/ompss2.nix index 9ce3728..60d68f3 100644 --- a/test/compilers/ompss2.nix +++ b/test/compilers/ompss2.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; #NIX_DEBUG = 1; buildInputs = [ ]; #strace gdb; - # NODES requires access to /sys/devices to request NUMA information. It will - # fail to run otherwise, so we disable the sandbox for this test. - __noChroot = true; + + # NODES requires access to /sys/devices to request NUMA information + requiredSystemFeatures = [ "sys-devices" ]; + buildPhase = '' set -x #$CC -v