diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-10-23T18·43+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-10-23T18·50+0200 |
| commit | 37fbfffd8e23cf9ca4038e6c4145583a811e91aa (patch) | |
| tree | 4605d5cdd90bd1a9c5e796278bd40b0acb3ad93c /tests/build-remote.sh | |
| parent | f32cdc4fab1bff919c3d074a95e32a9934eb7386 (diff) | |
Pass all settings to build-remote
This ensures that command line flags such as --builders get passed correctly.
Diffstat (limited to 'tests/build-remote.sh')
| -rw-r--r-- | tests/build-remote.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/build-remote.sh b/tests/build-remote.sh index e27ce7e25a8e..603b57c59ed0 100644 --- a/tests/build-remote.sh +++ b/tests/build-remote.sh @@ -9,16 +9,11 @@ chmod -R u+w $TEST_ROOT/store0 || true chmod -R u+w $TEST_ROOT/store1 || true rm -rf $TEST_ROOT/store0 $TEST_ROOT/store1 -# FIXME: --option is not passed to build-remote, so have to create a config file. -export NIX_CONF_DIR=$TEST_ROOT/etc2 -mkdir -p $NIX_CONF_DIR -echo " -sandbox-paths = /nix/store -sandbox-build-dir = /build-tmp -" > $NIX_CONF_DIR/nix.conf +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" -outPath=$(nix-build build-hook.nix --no-out-link -j0 \ - --option builders "local?root=$TEST_ROOT/store0; local?root=$TEST_ROOT/store1 - - 1 1 foo") +outPath=$TEST_ROOT/result cat $outPath/foobar | grep FOOBAR |