Skip to content

[xharness] Always build the test libraries before doing anything else. #3601

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
rolfbjarne merged 1 commit into from
Feb 27, 2018
Merged

[xharness] Always build the test libraries before doing anything else. #3601

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions tests/xharness/Jenkins.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,7 @@ public int Run ()
populating = false;
}).Wait ();
GenerateReport ();
BuildTestLibraries ();
if (!IsServerMode) {
foreach (var task in Tasks)
tasks.Add (task.RunAsync ());
Copy link
Contributor

@mandel-macaque mandel-macaque Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might be wrong here, ProcessHelper.ExecuteCommandAsync does return a task, correct?

public static Task<bool> PollForExitAsync (int pid, TimeSpan timeout)

The task is ignored in BuildTestLibraries that returns void (which we should only do in events). So, I think we should be paying attention to the result of the task and, since it is async but needed, we might wait for it to success before we do anything else (there is now guaranteed AFAIK that the build will be done before we needed it).

I might be completely wrong here, but just wanted you to confirm is correct.

Expand All @@ -892,6 +893,11 @@ public bool IsServerMode {
get { return Harness.JenkinsConfiguration == "server"; }
}

void BuildTestLibraries ()
{
ProcessHelper.ExecuteCommandAsync ("make", $"all -j{Environment.ProcessorCount} -C {StringUtils.Quote (Path.Combine (Harness.RootDirectory, "test-libraries"))}", MainLog, TimeSpan.FromMinutes (1)).Wait ();
}
Copy link
Contributor

@mandel-macaque mandel-macaque Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should return a Task, not void.

Copy link
Member Author

@rolfbjarne rolfbjarne Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I call .Wait () at the end to make it synchronous.

Copy link
Contributor

@mandel-macaque mandel-macaque Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agh, I did not see that, cool...


Task RunTestServer ()
{
var server = new HttpListener ();
Expand Down