about summary refs log tree commit diff
path: root/tests/timeout.sh
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-08-31T12·28+0200
committerEelco Dolstra <edolstra@gmail.com>2017-08-31T12·28+0200
commitc2154d4c8422ddc1c201d503bb52edff854af2ad (patch)
tree46b01c4081ef1ba5c16bf3b739218cbdbee1ebd6 /tests/timeout.sh
parent7d4a7136dba7ceb3d5b080b092eb76d23e2bb549 (diff)
Rename a few configuration options
In particular, drop the "build-" and "gc-" prefixes which are
pointless. So now you can say

  nix build --no-sandbox

instead of

  nix build --no-build-use-sandbox
Diffstat (limited to '')
-rw-r--r--tests/timeout.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/timeout.sh b/tests/timeout.sh
index 2b864b86dc..d3d85200fa 100644
--- a/tests/timeout.sh
+++ b/tests/timeout.sh
@@ -15,7 +15,7 @@ if ! echo "$messages" | grep -q "timed out"; then
     exit 1
 fi
 
-if nix-build -Q timeout.nix -A infiniteLoop --option build-max-log-size 100; then
+if nix-build -Q timeout.nix -A infiniteLoop --option max-build-log-size 100; then
     echo "build should have failed"
     exit 1
 fi
@@ -30,7 +30,7 @@ if nix-build timeout.nix -A closeLog; then
     exit 1
 fi
 
-if nix build -f timeout.nix silent --option build-max-silent-time 2; then
+if nix build -f timeout.nix silent --max-silent-time 2; then
     echo "build should have failed"
     exit 1
 fi