qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #1699 from aszlig/fix-remote-build-log

Browse source 
build-remote: Fix missing log output
This commit is contained in:
Eelco Dolstra 2017-11-27 13:59:51 +01:00 committed by GitHub
parent 549c3706a5 6567ab95a0
commit 3c470c97a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/build-remote/build-remote.cc
View file

@ -177,7 +177,7 @@ int main (int argc, char * * argv)
Activity act(*logger, lvlTalkative, actUnknown, fmt("connecting to '%s'", bestMachine->storeUri)); Activity act(*logger, lvlTalkative, actUnknown, fmt("connecting to '%s'", bestMachine->storeUri));
Store::Params storeParams; Store::Params storeParams;
if (hasPrefix(storeUri, "ssh://")) { if (hasPrefix(bestMachine->storeUri, "ssh://")) {
storeParams["max-connections"] ="1"; storeParams["max-connections"] ="1";
storeParams["log-fd"] = "4"; storeParams["log-fd"] = "4";
if (bestMachine->sshKey != "") if (bestMachine->sshKey != "")

5
tests/remote-builds.nix
View file

@ -85,7 +85,10 @@ in
} }
# Perform a build and check that it was performed on the slave. # 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"); $slave1->succeed("test -e $out");
# And a parallel build. # And a parallel build.