Merge pull request #312 from atilaneves/io

Fix #311 - don't disable stderr by default
atilaneves · May 1, 2024 · edb765e · edb765e
2 parents a4f20ed + f13338d
commit edb765e
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 10 deletions.
diff --git a/subpackages/runner/source/unit_threaded/runner/io.d b/subpackages/runner/source/unit_threaded/runner/io.d
@@ -20,8 +20,9 @@ void writelnUt(T...)(auto ref T args) {
 
 
 private shared(bool) _debugOutput = false; ///print debug msgs?
+private shared(bool) _silenceStderr = false; ///print debug msgs?
 private shared(bool) _forceEscCodes = false; ///use ANSI escape codes anyway?
-package(unit_threaded) shared(bool) _useEscCodes;
+package(unit_threaded) immutable bool _useEscCodes;
 
 
 version (Windows) {
@@ -89,6 +90,18 @@ package bool isDebugOutputEnabled() nothrow @trusted {
     }
 }
 
+package bool isStderrSilenced() @safe nothrow {
+    synchronized {
+        return _silenceStderr;
+    }
+}
+
+void disableStderr(bool value = true) @safe nothrow {
+    synchronized {
+        _silenceStderr = value;
+    }
+}
+
 package void forceEscCodes() nothrow {
     synchronized {
         _forceEscCodes = true;
@@ -259,8 +272,6 @@ void threadWriter(alias OUT, alias ERR)(from!"std.concurrency".Tid tid)
 {
     import std.concurrency: receive, send, OwnerTerminated, Tid;
 
-    auto done = false;
-
     auto saveStdout = OUT;
     auto saveStderr = ERR;
 
@@ -274,7 +285,8 @@ void threadWriter(alias OUT, alias ERR)(from!"std.concurrency".Tid tid)
 
     if (!isDebugOutputEnabled()) {
         OUT = typeof(OUT)(nullFileName, "w");
-        ERR = typeof(ERR)(nullFileName, "w");
+        if(isStderrSilenced)
+            ERR = typeof(ERR)(nullFileName, "w");
     }
 
     void actuallyPrint(in string msg) {
@@ -305,7 +317,7 @@ void threadWriter(alias OUT, alias ERR)(from!"std.concurrency".Tid tid)
 
     Tid currentTid;
 
-    while (!done) {
+    for(auto done = false; !done; ) {
         receive(
             (string msg, Tid originTid) {
 

diff --git a/tests/unit_threaded/ut/io.d b/tests/unit_threaded/ut/io.d
@@ -113,12 +113,35 @@ unittest {
     import unit_threaded.should;
 
     enableDebugOutput(false);
+    disableStderr(false);
     resetFakeFiles;
 
     auto tid = spawn(&threadWriter!(gOut, gErr), thisTid);
     tid.send(ThreadWait());
     receiveOnly!ThreadStarted;
 
+    // stdoutshould have been redirected but not stderr
+    gOut.shouldEqual(shared FakeFile(nullFileName, "w"));
+    gErr.shouldEqual(shared FakeFile("err", "mode"));
+
+    tid.send(ThreadFinish());
+    receiveOnly!ThreadEnded;
+}
+
+unittest {
+    import std.concurrency: spawn, thisTid, send, receiveOnly;
+    import unit_threaded.should;
+
+    enableDebugOutput(false);
+    disableStderr(true);
+    scope(exit) disableStderr(false);
+    resetFakeFiles;
+
+    auto tid = spawn(&threadWriter!(gOut, gErr), thisTid);
+    tid.send(ThreadWait());
+    receiveOnly!ThreadStarted;
+
+    // stdout/stderr should have been redirected
     gOut.shouldEqual(shared FakeFile(nullFileName, "w"));
     gErr.shouldEqual(shared FakeFile(nullFileName, "w"));
 
@@ -131,13 +154,16 @@ unittest {
     import unit_threaded.should;
 
     enableDebugOutput(true);
+    disableStderr(false);
     scope(exit) enableDebugOutput(false);
     resetFakeFiles;
 
     auto tid = spawn(&threadWriter!(gOut, gErr), thisTid);
     tid.send(ThreadWait());
     receiveOnly!ThreadStarted;
 
+    // since debug output is enabled we don't expect stdout/stderr to
+    // be redirected.
     gOut.shouldEqual(shared FakeFile("out", "mode"));
     gErr.shouldEqual(shared FakeFile("err", "mode"));
 
@@ -259,8 +285,8 @@ unittest {
 
     receiveOnly!bool; //wait for spawned thread to do its thing
 
-    // from now on, we've send "foo\n" but not flushed
-    // and the other tid has send "bar\n" and flushed
+    // from now on, we've sent "foo\n" but not flushed
+    // and the other tid has sent "bar\n" and flushed
 
     writerTid.send(Flush(), thisTid);
 
@@ -298,8 +324,8 @@ unittest {
 
     receiveOnly!bool; //wait for spawned thread to do its thing
 
-    // from now on, we've send "foo\n" but not flushed
-    // and the other tid has send "bar\n", flushed, then "baz\n"
+    // from now on, we've sent "foo\n" but not flushed
+    // and the other tid has sent "bar\n", flushed, then "baz\n"
 
     writerTid.send(Flush(), thisTid);
 
@@ -451,7 +477,7 @@ unittest {
     oops();
     writer.output.splitLines.should == [
         "OopsTest:",
-        "    " ~ buildPath("tests", "unit_threaded", "ut", "io.d") ~ ":433 - oops",
+        "    " ~ buildPath("tests", "unit_threaded", "ut", "io.d") ~ ":459 - oops",
         "",
     ];
 }