Skip to content

Commit

Permalink
Merge pull request #115678 from veprbl/pr/coreutils_tests
Browse files Browse the repository at this point in the history
coreutils: enable tests for non-standard store path
  • Loading branch information
FRidh committed Mar 20, 2021
2 parents 11187b3 + 2e0d0b4 commit 72aa2d1
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions pkgs/tools/misc/coreutils/default.nix
Expand Up @@ -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
Expand Down Expand Up @@ -103,8 +106,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";
Expand Down

0 comments on commit 72aa2d1

Please sign in to comment.