wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 18:31:49 +02:00
Code Activity

Support unit prefixes in configuration settings

Browse source 
E.g. you can now say `--min-free 1G`.
This commit is contained in:
Eelco Dolstra 2023-02-16 15:16:30 +01:00
parent d8d20307a8
commit 79c7d6205c
4 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/functional/config.sh
View file

@ -66,4 +66,9 @@ exp_features=$(nix config show | grep '^experimental-features' | cut -d '=' -f 2
# Test that it's possible to retrieve a single setting's value
val=$(nix config show | grep '^warn-dirty' | cut -d '=' -f 2 | xargs)
val2=$(nix config show warn-dirty)
[[ $val == $val2 ]]
[[ $val == $val2 ]]
# Test unit prefixes.
[[ $(nix config show --min-free 64K min-free) = 65536 ]]
[[ $(nix config show --min-free 1M min-free) = 1048576 ]]
[[ $(nix config show --min-free 2G min-free) = 2147483648 ]]

4
tests/functional/gc-auto.sh
View file

@ -62,11 +62,11 @@ EOF
)
nix build --impure -v -o $TEST_ROOT/result-A -L --expr "$expr" \
--min-free 1000 --max-free 2000 --min-free-check-interval 1 &
--min-free 1K --max-free 2K --min-free-check-interval 1 &
pid1=$!
nix build --impure -v -o $TEST_ROOT/result-B -L --expr "$expr2" \
--min-free 1000 --max-free 2000 --min-free-check-interval 1 &
--min-free 1K --max-free 2K --min-free-check-interval 1 &
pid2=$!
# Once the first build is done, unblock the second one.