From c96e427ec0b57f5bf91fbce8908dced2b09862cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Mar 2013 16:48:48 +0100
Subject: [PATCH] Log segfaults from the evaluator

---
 src/lib/Hydra/Helper/AddBuilds.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index a35c2437..f554bb5c 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -735,7 +735,10 @@ sub evalJobs {
 
     (my $res, my $jobsXml, my $stderr) = captureStdoutStderr(10800,
         $evaluator, $nixExprFullPath, "--gc-roots-dir", getGCRootsDir, "-j", 1, inputsToArgs($inputInfo, $exprType));
-    die "cannot evaluate the Nix expression containing the jobs:\n$stderr" if $res;
+    if ($res) {
+        die "$evaluator returned " . ($res & 127 ? "signal $res" : "exit code " . ($res >> 8))
+            . ":\n" . ($stderr ? $stderr : "(no output)\n");
+    }
 
     print STDERR "$stderr";