qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #1302 from dtzWill/fix/nix-options

Browse source 
Process nix.conf options in "new" commands, add test
This commit is contained in:
Eelco Dolstra 2017-04-12 11:03:19 +02:00 committed by GitHub
parent b134c2d052 a0c56197fc
commit 23304f527a
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/nix/main.cc
View file

@ -42,6 +42,7 @@ void mainWrapped(int argc, char * * argv)
NixArgs args; NixArgs args;
args.parseCmdline(argvToStrings(argc, argv)); args.parseCmdline(argvToStrings(argc, argv));
settings.update();
assert(args.command); assert(args.command);

3
tests/timeout.nix
View file

@ -5,6 +5,7 @@ with import ./config.nix;
infiniteLoop = mkDerivation { infiniteLoop = mkDerivation {
name = "timeout"; name = "timeout";
buildCommand = '' buildCommand = ''
touch $out
echo "‘timeout’ builder entering an infinite loop" echo "‘timeout’ builder entering an infinite loop"
while true ; do echo -n .; done while true ; do echo -n .; done
''; '';
@ -13,6 +14,7 @@ with import ./config.nix;
silent = mkDerivation { silent = mkDerivation {
name = "silent"; name = "silent";
buildCommand = '' buildCommand = ''
touch $out
sleep 60 sleep 60
''; '';
}; };
@ -20,6 +22,7 @@ with import ./config.nix;
closeLog = mkDerivation { closeLog = mkDerivation {
name = "silent"; name = "silent";
buildCommand = '' buildCommand = ''
touch $out
exec > /dev/null 2>&1 exec > /dev/null 2>&1
sleep 1000000000 sleep 1000000000
''; '';

5
tests/timeout.sh
View file

@ -29,3 +29,8 @@ if nix-build timeout.nix -A closeLog; then
echo "build should have failed" echo "build should have failed"
exit 1 exit 1
fi fi
if nix build -f timeout.nix silent --option build-max-silent-time 2; then
echo "build should have failed"
exit 1
fi