dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

tests: move stdenv hook tests to stdenv.hooks

Browse Source
This commit is contained in:
Artturin 2022-12-11 13:31:50 +02:00
parent 84a7cadfd2
commit 9cb5662187
3 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/test/hooks/default.nix
View File

@ -1,28 +1,8 @@
# To run these tests:
# nix-build -A tests.hooks
{ stdenv, pkgs, lib }:
{ stdenv, tests, lib }:
{
# this attrset is for hooks in `stdenv.defaultNativeBuildInputs`
default-stdenv-hooks = lib.recurseIntoAttrs {
make-symlinks-relative = stdenv.mkDerivation {
name = "test-make-symlinks-relative";
passAsFile = [ "buildCommand" ];
buildCommand = ''
mkdir -p $out/{bar,baz}
source1="$out/bar/foo"
destination1="$out/baz/foo"
echo foo > $source1
ln -s $source1 $destination1
echo "symlink before patching: $(readlink $destination1)"
_makeSymlinksRelative
echo "symlink after patching: $(readlink $destination1)"
([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
'';
};
};
default-stdenv-hooks = lib.recurseIntoAttrs tests.stdenv.hooks;
}

6
pkgs/test/stdenv/default.nix
View File

@ -95,6 +95,9 @@ let
in
{
# tests for hooks in `stdenv.defaultNativeBuildInputs`
hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; });
test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; };
test-prepend-append-to-var = testPrependAndAppendToVar {
@ -114,6 +117,9 @@ in
};
structuredAttrsByDefault = lib.recurseIntoAttrs {
hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; });
test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest {
name = "test-cc-wrapper-substitutions-structuredAttrsByDefault";
stdenv' = bootStdenvStructuredAttrsByDefault;

35
pkgs/test/stdenv/hooks.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv }:
# ordering should match defaultNativeBuildInputs
{
move-docs = stdenv.mkDerivation {
name = "test-move-docs";
buildCommand = ''
mkdir -p $out/{man,doc,info}
touch $out/{man,doc,info}/foo
cat $out/{man,doc,info}/foo
_moveToShare
(cat $out/share/{man,doc,info}/foo 2>/dev/null && echo "man,doc,info were moved") || (echo "man,doc,info were not moved" && exit 1)
'';
};
make-symlinks-relative = stdenv.mkDerivation {
name = "test-make-symlinks-relative";
buildCommand = ''
mkdir -p $out/{bar,baz}
source1="$out/bar/foo"
destination1="$out/baz/foo"
echo foo > $source1
ln -s $source1 $destination1
echo "symlink before patching: $(readlink $destination1)"
_makeSymlinksRelative
echo "symlink after patching: $(readlink $destination1)"
([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
'';
};
}