mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix threading issue in source build smoke tests (#15009)

Browse source
This commit is contained in:
Michael Simons 2022-11-17 16:43:16 -06:00 committed by GitHub
parent 03c15d0900
commit b504dab642
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs
View file

@ -75,16 +75,30 @@ internal static class ExecuteHelper
process.WaitForExit();
}
string output = stdOutput.ToString().Trim();
if (logOutput && !string.IsNullOrWhiteSpace(output))
string output;
string error;
lock (stdOutput)
{
outputHelper.WriteLine(output);
output = stdOutput.ToString().Trim();
}
string error = stdError.ToString().Trim();
if (logOutput && !string.IsNullOrWhiteSpace(error))
lock (stdError)
{
outputHelper.WriteLine(error);
error = stdError.ToString().Trim();
}
if (logOutput)
{
if (!string.IsNullOrWhiteSpace(output))
{
outputHelper.WriteLine(output);
}
if (string.IsNullOrWhiteSpace(error))
{
outputHelper.WriteLine(error);
}
}
return (process, output, error);