Fix sanity checker: don't use the fakeTty when no colored output is

needed
dlang-tour · Feb 16, 2018 · e164434 · e164434
1 parent 8fc3f3a
commit e164434
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/source/app.d b/source/app.d
@@ -89,7 +89,8 @@ private void doSanityCheck(ContentProvider contentProvider, IExecProvider execPr
 				section.language, section.title);
 
 		IExecProvider.RunInput input = {
-			source: section.sourceCode
+			source: section.sourceCode,
+			color: false,
 		};
 		auto result = execProvider.compileAndExecute(input);
 		enforce(result.success,

diff --git a/source/exec/stupidlocal.d b/source/exec/stupidlocal.d
@@ -92,19 +92,24 @@ class StupidLocal: IExecProvider
 			{
 				args = [dCompiler];
 				args ~= input.args.split(" ");
-				args ~= "-color=" ~ (input.color ? "on " : "off ");
+				args ~= "-color=" ~ (input.color ? "on" : "off");
 				args ~= "-run";
 				args ~= tmpfile.name;
 
-				// DMD requires a TTY for colored output
-				auto env = [
-					"TERM": "dtour"
-				];
-				auto fakeTty = `
-faketty () {	 script -qfc "$(printf "%q " "$@")" /dev/null ; }
-faketty ` ~ 	args.join(" ") ~  ` | cat | sed 's/\r$//'`;
-
-				res = fakeTty.executeShell(env);
+				if (input.color)
+				{
+					// DMD requires a TTY for colored output
+					auto env = [
+						"TERM": "dtour"
+					];
+					auto fakeTty = `
+faketty () {		 script -qfc "$(printf "%q " "$@")" /dev/null ; }
+faketty ` ~ 		args.join(" ") ~  ` | cat | sed 's/\r$//'`;
+
+					res = fakeTty.executeShell(env);
+				} else {
+					res = execute(args);
+				}
 			}
 			result.success = res.status == 0;
 			result.output = res.output;