wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

tests: Fix installTests

Browse source
This commit is contained in:
Robert Hensing 2025-02-18 15:55:19 +01:00
parent 3556f6bf4c
commit 2b5365bcf7
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/functional/misc.sh
View file

@ -11,7 +11,7 @@ source common.sh
#nix-hash --help | grepQuiet base32 #nix-hash --help | grepQuiet base32
# Can we ask for the version number? # Can we ask for the version number?
nix-env --version | grep "$version" nix-env --version | grep -F "${_NIX_TEST_CLIENT_VERSION:-$version}"
nix_env=$(type -P nix-env) nix_env=$(type -P nix-env)
(PATH=""; ! $nix_env --help 2>&1 ) | grepQuiet -F "The 'man' command was not found, but it is needed for 'nix-env' and some other 'nix-*' commands' help text. Perhaps you could install the 'man' command?" (PATH=""; ! $nix_env --help 2>&1 ) | grepQuiet -F "The 'man' command was not found, but it is needed for 'nix-env' and some other 'nix-*' commands' help text. Perhaps you could install the 'man' command?"

2
tests/functional/package.nix
View file

@ -99,6 +99,8 @@ mkMesonDerivation (
} }
// lib.optionalAttrs (test-daemon != null) { // lib.optionalAttrs (test-daemon != null) {
# TODO rename to _NIX_TEST_DAEMON_PACKAGE
NIX_DAEMON_PACKAGE = test-daemon; NIX_DAEMON_PACKAGE = test-daemon;
_NIX_TEST_CLIENT_VERSION = nix-cli.version;
} }
) )