diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-11-27T12·59+0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27T12·59+0100 |
| commit | 3c470c97a1b8d19f03c4d3caa9872e2e786a15ea (patch) | |
| tree | f91f5e506c891d118c99a29fed50a2d3eb8b21b6 | |
| parent | 549c3706a5d63e10d908b43da8479331a844018f (diff) | |
| parent | 6567ab95a0b5cdca3f8b22dbbcd98ec5d18b63b0 (diff) | |
Merge pull request #1699 from aszlig/fix-remote-build-log
build-remote: Fix missing log output
| -rw-r--r-- | src/build-remote/build-remote.cc | 2 | ||||
| -rw-r--r-- | tests/remote-builds.nix | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index 6e05e165545d..445006b327fd 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -177,7 +177,7 @@ int main (int argc, char * * argv) Activity act(*logger, lvlTalkative, actUnknown, fmt("connecting to '%s'", bestMachine->storeUri)); Store::Params storeParams; - if (hasPrefix(storeUri, "ssh://")) { + if (hasPrefix(bestMachine->storeUri, "ssh://")) { storeParams["max-connections"] ="1"; storeParams["log-fd"] = "4"; if (bestMachine->sshKey != "") diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix index 39bd090e43e7..58a26d8b6182 100644 --- a/tests/remote-builds.nix +++ b/tests/remote-builds.nix @@ -85,7 +85,10 @@ in } # Perform a build and check that it was performed on the slave. - my $out = $client->succeed("nix-build ${expr nodes.client.config 1}"); + my $out = $client->succeed( + "nix-build ${expr nodes.client.config 1} 2> build-output", + "grep -q Hello build-output" + ); $slave1->succeed("test -e $out"); # And a parallel build. |