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.

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

Portable emit tests #25459

Merged
merged 3 commits into from
Mar 15, 2018
Merged

Portable emit tests #25459

merged 3 commits into from
Mar 15, 2018

Conversation

tmat
Copy link
Member

@tmat tmat commented Mar 14, 2018

Fix dev15.7.x to master merge issues.

@tmat tmat requested review from a team as code owners March 14, 2018 00:56
@@ -1,5 +1,5 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

#if NET461
Copy link
Member

Choose a reason for hiding this comment

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

Why are all these #if necessary? These tests are all compiling today

@tmat
Copy link
Member Author

tmat commented Mar 14, 2018

test windows_debug_unit32_prtest please

@jaredpar
Copy link
Member

Why the “#if” blocks. These shouldn’t be necessary.

@jaredpar
Copy link
Member

Don't think these commits of mine should be cherry-picked. Several of them have already largely been undone by later changes in dev15.7.x. I'm going to send an email out shortly to swat to try and figure out why the the merge dev15.7.x to master isn't working.

@tmat
Copy link
Member Author

tmat commented Mar 14, 2018

Apparently the #if's are currently needed: https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_debug_unit32_prtest/12372/

That indicates more commits are missing from master.

@jaredpar
Copy link
Member

@tmat check your inbox. I'm not sure what is going on here or what we merged at this point.

@jaredpar
Copy link
Member

@tmat we've all sync'd up. Proceed with the revert. The #if are necessary at this time given the current state of the branches.

@jaredpar
Copy link
Member

retest windows_debug_unit64_prtest please

@tmat
Copy link
Member Author

tmat commented Mar 14, 2018

test windows_debug_vs-integration_prtest please

@tmat
Copy link
Member Author

tmat commented Mar 14, 2018

test windows_release_vs-integration_prtest please

@tmat
Copy link
Member Author

tmat commented Mar 15, 2018

test windows_debug_vs-integration_prtest please

@jaredpar
Copy link
Member

Looks like the windows_coreclr_test_prtest is in a zombie state. That job was renamed in a recent change to netci.groovy. Every other leg is passing.

Let me know when you're ready to merge and I'll override the required flag for this leg.

@tmat
Copy link
Member Author

tmat commented Mar 15, 2018

@jaredpar I think it's good to go.

@tmat tmat changed the title WIP: Portable emit tests Portable emit tests Mar 15, 2018
@jaredpar jaredpar merged commit 4311fe3 into dotnet:master Mar 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants