diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-10-24T13·16+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-10-24T13·32+0200 |
| commit | d16fd2497374671c92cb877f9570d65783a77d99 (patch) | |
| tree | ce2a871f4d9e5a65108768f1f8584cd545cbd6ac /tests | |
| parent | 3460e4cf007017e89096b4fad083692666b87a20 (diff) | |
Allow shorter syntax for chroot stores
You can now say '--store /tmp/nix' instead of '--store local?root=/tmp/nix'.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/build-remote.sh | 6 | ||||
| -rw-r--r-- | tests/linux-sandbox.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/build-remote.sh b/tests/build-remote.sh index 603b57c59ed0..cf3bb4633183 100644 --- a/tests/build-remote.sh +++ b/tests/build-remote.sh @@ -11,7 +11,7 @@ rm -rf $TEST_ROOT/store0 $TEST_ROOT/store1 nix build -f build-hook.nix -o $TEST_ROOT/result --max-jobs 0 \ --sandbox-paths /nix/store --sandbox-build-dir /build-tmp \ - --builders "local?root=$TEST_ROOT/store0; local?root=$TEST_ROOT/store1 - - 1 1 foo" + --builders "$TEST_ROOT/store0; $TEST_ROOT/store1 - - 1 1 foo" outPath=$TEST_ROOT/result @@ -19,5 +19,5 @@ cat $outPath/foobar | grep FOOBAR # Ensure that input1 was built on store1 due to the required feature. p=$(readlink -f $outPath/input-2) -(! nix path-info --store local?root=$TEST_ROOT/store0 --all | grep dependencies.builder1.sh) -nix path-info --store local?root=$TEST_ROOT/store1 --all | grep dependencies.builder1.sh +(! nix path-info --store $TEST_ROOT/store0 --all | grep dependencies.builder1.sh) +nix path-info --store $TEST_ROOT/store1 --all | grep dependencies.builder1.sh diff --git a/tests/linux-sandbox.sh b/tests/linux-sandbox.sh index 7f4e83b560be..0691c30be1ce 100644 --- a/tests/linux-sandbox.sh +++ b/tests/linux-sandbox.sh @@ -14,7 +14,7 @@ chmod -R u+w $TEST_ROOT/store0 || true rm -rf $TEST_ROOT/store0 export NIX_STORE_DIR=/my/store -export NIX_REMOTE="local?root=$TEST_ROOT/store0" +export NIX_REMOTE=$TEST_ROOT/store0 outPath=$(nix-build dependencies.nix --no-out-link --option sandbox-paths /nix/store) |