diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-04-12T09·03+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-12T09·03+0200 |
| commit | 23304f527a4754fc2a04c90acd05af6baf7f19cb (patch) | |
| tree | 89fefd1f4ec49ed8f670347e5d222821ce0c2e37 | |
| parent | b134c2d05280be9615c81f018a5309fc8dcbca0e (diff) | |
| parent | a0c56197fcb6d13e77ccbdd28322a540352b880c (diff) | |
Merge pull request #1302 from dtzWill/fix/nix-options
Process nix.conf options in "new" commands, add test
| -rw-r--r-- | src/nix/main.cc | 1 | ||||
| -rw-r--r-- | tests/timeout.nix | 3 | ||||
| -rw-r--r-- | tests/timeout.sh | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/nix/main.cc b/src/nix/main.cc index 440ced97dfcc..fdb8f6e3a197 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -42,6 +42,7 @@ void mainWrapped(int argc, char * * argv) NixArgs args; args.parseCmdline(argvToStrings(argc, argv)); + settings.update(); assert(args.command); diff --git a/tests/timeout.nix b/tests/timeout.nix index 540fba934ff6..e18d717eff1f 100644 --- a/tests/timeout.nix +++ b/tests/timeout.nix @@ -5,6 +5,7 @@ with import ./config.nix; infiniteLoop = mkDerivation { name = "timeout"; buildCommand = '' + touch $out echo "‘timeout’ builder entering an infinite loop" while true ; do echo -n .; done ''; @@ -13,6 +14,7 @@ with import ./config.nix; silent = mkDerivation { name = "silent"; buildCommand = '' + touch $out sleep 60 ''; }; @@ -20,6 +22,7 @@ with import ./config.nix; closeLog = mkDerivation { name = "silent"; buildCommand = '' + touch $out exec > /dev/null 2>&1 sleep 1000000000 ''; diff --git a/tests/timeout.sh b/tests/timeout.sh index ce1ae7d674a1..77b227e89ba5 100644 --- a/tests/timeout.sh +++ b/tests/timeout.sh @@ -29,3 +29,8 @@ if nix-build timeout.nix -A closeLog; then echo "build should have failed" exit 1 fi + +if nix build -f timeout.nix silent --option build-max-silent-time 2; then + echo "build should have failed" + exit 1 +fi |