Skip to content
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

Jump to bottom

Fix CoreCLR test build for SunOS #37824

Merged
merged 1 commit into from
Jun 24, 2020
Merged

Fix CoreCLR test build for SunOS #37824

merged 1 commit into from
Jun 24, 2020

Conversation

am11
Copy link
Member

@am11 am11 commented Jun 12, 2020 •
edited
Loading

  1. Replace RuntimeIdentifierGraphPath with BundledRuntimeIdentifierGraphFile and import liveBuilds.targets in test projects so we don't have to wait for SDK update, when a new platform is added to runtime.json.
  2. Fix profilerstring.h by inverting a preprocessor Windows/non-Windows condition to avoid including each Unix platform explicity. This was causing test compilation error.
  3. Update platform detection for sunos in test-related scripts.

Closes #37790.

@ghost
Copy link

ghost commented Jun 12, 2020

Tagging subscribers to this area: @ViktorHofer
Notify danmosemsft if you want to be subscribed.

@am11
Copy link
Member Author

am11 commented Jun 12, 2020

cc @janvorli, @ericstj

@am11 am11 mentioned this pull request Jun 21, 2020
Merged
am11
am11 commented Jun 21, 2020
View reviewed changes
src/coreclr/tryrun.cmake
set_cache_value(HAVE_PROCFS_CTL_EXITCODE 1)
set_cache_value(HAVE_PROCFS_STATUS_EXITCODE 1)
set_cache_value(HAVE_CLOCK_THREAD_CPUTIME_EXITCODE 1)
set_cache_value(HAVE_PROCFS_CTL_EXITCODE 0)
Copy link
Member Author

Choose a reason for hiding this comment

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

@janvorli, this was the leftover from #37753. The _EXITCODE conditions needed to be inverted. Removed HAVE_PROCFS_STATUS_EXITCODE and HAVE_CLOCK_THREAD_CPUTIME_EXITCODE because they are already set to 0 above.

janvorli
janvorli approved these changes Jun 22, 2020
View reviewed changes
Copy link
Member

@janvorli janvorli left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@am11 am11 mentioned this pull request Jun 22, 2020
Open
19 tasks
@janvorli janvorli merged commit d65dd30 into dotnet:master Jun 24, 2020
@am11 am11 deleted the feature/sunos/clr-test-build branch June 24, 2020 08:51
@ghost ghost locked as resolved and limited conversation to collaborators Dec 8, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@janvorli janvorli janvorli approved these changes

@ericstj ericstj ericstj approved these changes

Assignees
No one assigned
Labels
area-Infrastructure
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Lengthy RuntimeIdentifierGraph update roundtrip with SDK
4 participants
@am11 @ericstj @janvorli @Dotnet-GitSync-Bot