Skip to content

Fix CoreCLR test build for SunOS - #37824

Merged
janvorli merged 1 commit into
dotnet:masterfrom
am11:feature/sunos/clr-test-build
Jun 24, 2020
Merged

Fix CoreCLR test build for SunOS#37824
janvorli merged 1 commit into
dotnet:masterfrom
am11:feature/sunos/clr-test-build

Conversation

@am11

@am11 am11 commented Jun 12, 2020

Copy link
Copy Markdown
Member
  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

ghost commented Jun 12, 2020

Copy link
Copy Markdown

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

@am11

am11 commented Jun 12, 2020

Copy link
Copy Markdown
Member Author

cc @janvorli, @ericstj

Comment thread 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
Copy Markdown
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 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thank you!

@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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Lengthy RuntimeIdentifierGraph update roundtrip with SDK

4 participants