From 25f8e0cef99b6919b17a4b972a10a0e95cca6632 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 10 Mar 2021 05:44:56 +0300 Subject: [PATCH 1/2] coreutils: enable tests for non-standard store path Tests don't fail because of a different store path, but for other reasons like lack of sandboxing. Those tests should be disabled explicitly. --- pkgs/tools/misc/coreutils/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 131ce2774d1..4284bb6d1af 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -103,8 +103,7 @@ stdenv.mkDerivation (rec { # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform - && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) - && builtins.storeDir == "/nix/store"; + && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl); # Prevents attempts of running 'help2man' on cross-built binaries. PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; From 2e0d0b46920461b1b5f88d879d2c0c8605f7ecda Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 10 Mar 2021 05:47:37 +0300 Subject: [PATCH 2/2] coreutils: disable df-symlink test --- pkgs/tools/misc/coreutils/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 4284bb6d1af..bfe5c5c5045 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation (rec { sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh + # Depends on the mountpoints + sed '2i echo Skipping df df-symlink test && exit 77' -i ./tests/df/df-symlink.sh + # Some target platforms, especially when building inside a container have # issues with the inotify test. sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail-2/inotify-dir-recreate.sh