From c9d47f2b65d12d4e7f15880746a207afd268e7c4 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 6 Nov 2015 14:15:18 -0800
Subject: [PATCH] src: force line buffering for stderr

SmartOS does not line buffer stderr by default, or at least that is the
behavior on the Node project Jenkins server. Force line buffering. This
resolves the flakiness observed on SmartOS for
test-debug-signal-cluster.

Fixes: https://github.com/nodejs/node/issues/2476
Refs: https://github.com/nodejs/node/pull/3615
---
 src/node_main.cc              | 1 +
 test/parallel/parallel.status | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node_main.cc b/src/node_main.cc
index 13a70b2d0d33d7..58e747e52c49ef 100644
--- a/src/node_main.cc
+++ b/src/node_main.cc
@@ -41,6 +41,7 @@ int wmain(int argc, wchar_t *wargv[]) {
 #else
 // UNIX
 int main(int argc, char *argv[]) {
+  setvbuf(stderr, NULL, _IOLBF, 1024);
   return node::Start(argc, argv);
 }
 #endif
diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 69a154730658d2..9334614d5626d8 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -18,7 +18,6 @@ test-child-process-exit-code      : PASS,FLAKY
 [$system==macos]
 
 [$system==solaris] # Also applies to SmartOS
-test-debug-signal-cluster         : PASS,FLAKY
 
 [$system==freebsd]
 test-net-socket-local-address     : PASS,FLAKY