tests.trivial-builders.symlinkJoin: fix group mismatches
This fixes group mismatches observed on Darwin, e.g.:
```
--- /nix/store/w7fr9zs91z02c1bbd54lxkvipwn7xfhd-symlinkJoin
+++ /nix/store/7r2jq748ikrryqzm55cwbxqpng276wpd-symlinkJoin-foo-bar-baz
├── stat {}
│ @@ -1,7 +1,7 @@
│
│ Size: 128 Blocks: 0 IO Block: 4096 directory
│ -Device: 1,15 Access: (0555/dr-xr-xr-x) Uid: ( 0/ root) Gid: ( 0/ wheel)
│ +Device: 1,15 Access: (0555/dr-xr-xr-x) Uid: ( 0/ root) Gid: ( 350/ nixbld)
```
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{
|
||||
symlinkJoin,
|
||||
writeTextFile,
|
||||
runCommand,
|
||||
runCommandLocal,
|
||||
testers,
|
||||
}:
|
||||
|
||||
@@ -31,7 +31,7 @@ let
|
||||
text = "qux";
|
||||
};
|
||||
|
||||
emulatedSymlinkJoinFooBarStrip = runCommand "symlinkJoin-strip-foo-bar" { } ''
|
||||
emulatedSymlinkJoinFooBarStrip = runCommandLocal "symlinkJoin-strip-foo-bar" { } ''
|
||||
mkdir $out
|
||||
ln -s ${foo}/etc/test.d/foo $out/
|
||||
ln -s ${bar}/etc/test.d/bar $out/
|
||||
@@ -48,7 +48,7 @@ in
|
||||
baz
|
||||
];
|
||||
};
|
||||
expected = runCommand "symlinkJoin-foo-bar-baz" { } ''
|
||||
expected = runCommandLocal "symlinkJoin-foo-bar-baz" { } ''
|
||||
mkdir -p $out/{var/lib/arbitrary,etc/test.d}
|
||||
ln -s {${foo},${bar}}/etc/test.d/* $out/etc/test.d
|
||||
ln -s ${baz}/var/lib/arbitrary/baz $out/var/lib/arbitrary/
|
||||
@@ -66,7 +66,7 @@ in
|
||||
baz
|
||||
];
|
||||
};
|
||||
expected = runCommand "symlinkJoin-foo-bar-baz" { } ''
|
||||
expected = runCommandLocal "symlinkJoin-foo-bar-baz" { } ''
|
||||
mkdir -p $out/{var/lib/arbitrary,etc/test.d}
|
||||
ln -s {${foo},${bar}}/etc/test.d/* $out/etc/test.d
|
||||
ln -s ${baz}/var/lib/arbitrary/baz $out/var/lib/arbitrary/
|
||||
@@ -115,7 +115,7 @@ in
|
||||
};
|
||||
|
||||
symlinkJoin-fails-on-missing =
|
||||
runCommand "symlinkJoin-fails-on-missing"
|
||||
runCommandLocal "symlinkJoin-fails-on-missing"
|
||||
{
|
||||
failed = testBuildFailure (symlinkJoin {
|
||||
name = "symlinkJoin-fail";
|
||||
@@ -134,7 +134,7 @@ in
|
||||
'';
|
||||
|
||||
symlinkJoin-fails-on-file =
|
||||
runCommand "symlinkJoin-fails-on-file"
|
||||
runCommandLocal "symlinkJoin-fails-on-file"
|
||||
{
|
||||
failed = testBuildFailure (symlinkJoin {
|
||||
name = "symlinkJoin-fail";
|
||||
|
||||
Reference in New Issue
Block a user