make readOutput a filter on a string

Author: rainers

test/dshell/sameenv.d

@@ -8,8 +8,8 @@ void main()
     run("$OUTPUT_BASE/printenv$EXE", File(envFromExe, "wb"));
     run("$DMD -m$MODEL -run $EXTRA_FILES/printenv.d", File(envFromRun, "wb"));
 
-    const fromExe = readOutput(envFromExe);
-    const fromRun = readOutput(envFromRun);
+    const fromExe = readText(envFromExe).filterCompilerOutput;
+    const fromRun = readText(envFromRun).filterCompilerOutput;
     if (fromExe != fromRun)
     {
         writefln("FromExe:");

test/tools/dshell_prebuilt/dshell_prebuilt.d

@@ -291,11 +291,10 @@ private GrepResult grepLines(T)(T lineRange, string finalPattern)
 }
 
 /**
-read the the given `file` and remove \r and the compiler debug header.
+remove \r and the compiler debug header from the given string.
 */
-string readOutput(string file)
+string filterCompilerOutput(string output)
 {
-    string output = readText(file);
     output = std.string.replace(output, "\r", "");
     output = std.regex.replaceAll(output, regex(`^DMD v2\.[0-9]+.*\n? DEBUG\n`, "m"), "");
     return output;