Branch: refs/heads/master
Home: https://github.com/NixOS/hydra
Commit: 854513be8e84d6ec3168eba56f485608363675a4
https://github.com/NixOS/hydra/commit/854513be8e84d6ec3168eba56f485608363675a4
Author: Eelco Dolstra <[email protected]>
Date: 2012-04-30 (Mon, 30 Apr 2012)
Changed paths:
M release.nix
M src/script/hydra-build
M tests/Setup.pm
Log Message:
-----------
I should test first
diff --git a/release.nix b/release.nix
index ba720db..73a89ad 100644
--- a/release.nix
+++ b/release.nix
@@ -80,7 +80,7 @@ rec {
done
''; # */
- LOGNAME="$USER";
+ LOGNAME = "foo";
meta = {
description = "Build of Hydra on ${system}";
diff --git a/src/script/hydra-build b/src/script/hydra-build
index 41a4458..67dab49 100755
--- a/src/script/hydra-build
+++ b/src/script/hydra-build
@@ -368,7 +368,7 @@ sub doBuild {
$stopTime = time();
if ($res != 0) {
- if ($thisBuildFailed && $res == 100) { $buildStatus = 1; }
+ if ($thisBuildFailed && $res == 100 << 8) { $buildStatus = 1; }
elsif ($someBuildFailed) { $buildStatus = 2; }
else { $buildStatus = 3; }
}
diff --git a/tests/Setup.pm b/tests/Setup.pm
index 3643a89..69762cc 100644
--- a/tests/Setup.pm
+++ b/tests/Setup.pm
@@ -71,7 +71,9 @@ sub evalSucceeds {
sub runBuild {
my ($build) = @_;
- return captureStdoutStderr(60, ("../src/script/hydra-build", $build->id));
+ my ($res, $stdout, $stderr) = captureStdoutStderr(60,
("../src/script/hydra-build", $build->id));
+ print "STDERR: $stderr" if $res;
+ return ($res, $stdout, $stderr);
}
sub updateRepository {
================================================================
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
