Skip to content

reland: Emit coverage mappings for all modules #32352

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

Conversation

keith
Copy link
Member

@keith keith commented Jun 12, 2020

This reverts commit 499ed05.

The change here is to pass -num-threads 1 to avoid an issue on windows where the output of both modules was interleaved. This still goes down the multithreaded codepath so it still validates the fix.

I filed https://bugs.swift.org/browse/SR-13016 for future investigation around this multithreaded issue

#32216 (comment)

@CodaFi
Copy link
Contributor

CodaFi commented Jun 12, 2020

Do you have an SR for the XFAIL on Windows?

@CodaFi
Copy link
Contributor

CodaFi commented Jun 12, 2020

@swift-ci smoke test

@keith
Copy link
Member Author

keith commented Jun 12, 2020

added to the description, also happy to add in a comment there if you'd prefer!

@CodaFi
Copy link
Contributor

CodaFi commented Jun 12, 2020

That's all I need for now!

To aid your debugging, have you tried marking both files as -primary-file?

@keith
Copy link
Member Author

keith commented Jun 12, 2020

Interesting, I'm still working on getting a windows VM setup to actually debug at all 😞 but that's a good thing I can try!

@keith
Copy link
Member Author

keith commented Jun 12, 2020

seems like my XFAIL didn't work, does it have to be at the top or something? I copy pasted from some other test and that's the only major difference I see

@CodaFi
Copy link
Contributor

CodaFi commented Jun 13, 2020

Try using UNSUPPORTED OS=windows-msvc then.

@keith keith force-pushed the ks/reland-emit-coverage-mappings-for-all-modules branch from eabf16b to 2299968 Compare June 13, 2020 01:24
@keith
Copy link
Member Author

keith commented Jun 13, 2020

I tested your primary-file idea on macOS and it still works as expected, I pushed that here and removed the XFAIL, do you mind re-running the tests so we can see if that works for windows too (I'm still building on my windows VM)

@keith
Copy link
Member Author

keith commented Jun 13, 2020

looks like we commented around the same time, I can push that if this option doesn't work while I continue to debug it

@CodaFi
Copy link
Contributor

CodaFi commented Jun 13, 2020

@swift-ci smoke test

@keith
Copy link
Member Author

keith commented Jun 13, 2020

hrm this windows failure looks like a flake

@CodaFi
Copy link
Contributor

CodaFi commented Jun 13, 2020

@swift-ci smoke test Windows

@keith
Copy link
Member Author

keith commented Jun 13, 2020

Yay! It looks like your idea worked! Thanks a ton!

@keith
Copy link
Member Author

keith commented Jun 14, 2020

Ah crap, it looks like while the test did pass in this configuration, it's because it's not actually validating the right behavior. If I revert my actual change and run with the primary-file args on macOS, it still passes.

@keith keith force-pushed the ks/reland-emit-coverage-mappings-for-all-modules branch from 2299968 to 5c8ec2e Compare June 14, 2020 18:26
@keith
Copy link
Member Author

keith commented Jun 14, 2020

I've reverted that change so that it fails again, and will continue to debug a bit, I now have a windows environment setup and I can't reproduce the CI failure 😞

@compnerd
Copy link
Member

@swift-ci please test Windows platform

2 similar comments
@compnerd
Copy link
Member

@swift-ci please test Windows platform

@keith
Copy link
Member Author

keith commented Jun 14, 2020

@swift-ci please test Windows platform

@keith
Copy link
Member Author

keith commented Jun 14, 2020

was hoping the behavior might differ if I was trying to rebuild on the same commit

@compnerd
Copy link
Member

@swift-ci please test Windows platform

This reverts commit 499ed05.

This changes the num-threads passed to 1 to avoid a multithreaded output
issue on windows
@keith keith force-pushed the ks/reland-emit-coverage-mappings-for-all-modules branch from c941648 to 76ca05f Compare June 14, 2020 20:14
@compnerd
Copy link
Member

@swift-ci please test Windows platform

@keith
Copy link
Member Author

keith commented Jun 14, 2020

Yippee it passed!

@compnerd
Copy link
Member

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 3510c191376cd1cff6df8d868db6c1a04b998403

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 3510c191376cd1cff6df8d868db6c1a04b998403

@compnerd compnerd merged commit 73d8419 into swiftlang:master Jun 15, 2020
@keith
Copy link
Member Author

keith commented Jun 15, 2020

Thanks again everyone for your help!

@keith keith deleted the ks/reland-emit-coverage-mappings-for-all-modules branch June 15, 2020 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants