diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-23 18:01:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 18:01:49 +0000 |
| commit | 3cdd7718204d55c46ee81a58706e2ef1d291cbe7 (patch) | |
| tree | dbcce89d48dbf6ebcf08c550b3b3c1170e53c3a3 /pkgs/test/stdenv | |
| parent | 1dd9fc27f56c8cdc6315f701148ca40b6bff8087 (diff) | |
| parent | 4688cd53b60d045633225e628d37f64105fb81ff (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/test/stdenv')
| -rw-r--r-- | pkgs/test/stdenv/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/test/stdenv/hooks.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index 91964213bbc6e..ba9ea8cb75b20 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -113,7 +113,7 @@ in # Assumption: the first output* variable to be configured is # _overrideFirst outputDev "dev" "out" - expectedMsg = "_assignFirst: could not find a non-empty variable to assign to outputDev. The following variables were all unset or empty: dev out."; + expectedMsg = "error: _assignFirst: could not find a non-empty variable to assign to outputDev.\n The following variables were all unset or empty:\n dev out"; } '' grep -F "$expectedMsg" $result/testBuildFailure.log >/dev/null touch $out diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index eb1b3f61bda62..ba5da511c6fef 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -115,7 +115,7 @@ name = "test-reproducible-builds"; buildCommand = '' # can't be tested more precisely because the value of random-seed changes depending on the output - [[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]] + [[ $env.NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]] touch $out ''; }; |