Skip to content

[Xamarin.Android.Build.Tests] Fix the processing of the build.log files. #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 25, 2017
Merged

[Xamarin.Android.Build.Tests] Fix the processing of the build.log files. #968

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30297d3
[Xamarin.Android.Build.Tests] Fix the processing of the build.log files.
dellis1972 Oct 24, 2017
d7319a3
Fixed compile Error
dellis1972 Oct 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,18 +220,31 @@ protected bool BuildInternal (string projectOrSolution, string target, string []

LastBuildTime = DateTime.UtcNow - start;

LastBuildOutput = psi.FileName + " " + args.ToString () + Environment.NewLine;
var sb = new StringBuilder ();
sb.AppendLine ( psi.FileName + " " + args.ToString () + Environment.NewLine);
if (!ranToCompletion)
LastBuildOutput += "Build Timed Out!";
if (buildLogFullPath != null && File.Exists (buildLogFullPath))
LastBuildOutput += File.ReadAllText (buildLogFullPath);
LastBuildOutput += string.Format ("\n#stdout begin\n{0}\n#stdout end\n", p.StandardOutput.ReadToEnd ());
LastBuildOutput += string.Format ("\n#stderr begin\n{0}\n#stderr end\n", p.StandardError.ReadToEnd ());

var match = timeElapsedRegEx.Match (LastBuildOutput);
if (match.Success) {
LastBuildTime = TimeSpan.Parse (match.Groups ["TimeSpan"].Value);
sb.AppendLine ("Build Timed Out!");
if (buildLogFullPath != null && File.Exists (buildLogFullPath)) {
using (var fs = File.OpenRead (buildLogFullPath)) {
using (var sr = new StreamReader (fs, Encoding.UTF8, true, 65536)) {
string line;
while ((line = sr.ReadLine ()) != null) {
sb.AppendLine (line);
if (line.StartsWith ("Time Elapsed", StringComparison.OrdinalIgnoreCase)) {
var match = timeElapsedRegEx.Match (line);
if (match.Success) {
LastBuildTime = TimeSpan.Parse (match.Groups ["TimeSpan"].Value);
Console.WriteLine ($"Found Time Elapsed {LastBuildTime}");
}
}
}
}
}
}
sb.AppendFormat ("\n#stdout begin\n{0}\n#stdout end\n", p.StandardOutput.ReadToEnd ());
sb.AppendFormat ("\n#stderr begin\n{0}\n#stderr end\n", p.StandardError.ReadToEnd ());

LastBuildOutput = sb.ToString ();

if (buildLogFullPath != null) {
Directory.CreateDirectory (Path.GetDirectoryName (buildLogFullPath));
Expand Down