From 21948deed99a3295e4d5666e027a6ca42dc00b40 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 19 Jan 2017 16:58:39 +0100
Subject: Kill builds when we get EOF on the log FD

This closes a long-time bug that allowed builds to hang Nix
indefinitely (regardless of timeouts) simply by doing

  exec > /dev/null 2>&1; while true; do true; done

Now, on EOF, we just send SIGKILL to the child to make sure it's
really gone.
---
 tests/timeout.nix | 8 ++++++++
 tests/timeout.sh  | 5 +++++
 2 files changed, 13 insertions(+)

(limited to 'tests')

diff --git a/tests/timeout.nix b/tests/timeout.nix
index 1f3f23f16a98..540fba934ff6 100644
--- a/tests/timeout.nix
+++ b/tests/timeout.nix
@@ -17,4 +17,12 @@ with import ./config.nix;
     '';
   };
 
+  closeLog = mkDerivation {
+    name = "silent";
+    buildCommand = ''
+      exec > /dev/null 2>&1
+      sleep 1000000000
+    '';
+  };
+
 }
diff --git a/tests/timeout.sh b/tests/timeout.sh
index ba9a6c3df26e..ce1ae7d674a1 100644
--- a/tests/timeout.sh
+++ b/tests/timeout.sh
@@ -24,3 +24,8 @@ if nix-build timeout.nix -A silent --max-silent-time 2; then
     echo "build should have failed"
     exit 1
 fi
+
+if nix-build timeout.nix -A closeLog; then
+    echo "build should have failed"
+    exit 1
+fi
-- 
cgit 1.4.1