Skip to content

test: configure the windows test environment #15018

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

Merged
merged 1 commit into from
Nov 27, 2018

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Mar 6, 2018

This enables lit to at least start running on Windows. There is more
work necessary to get the tests actually passing on Windows.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

@compnerd
Copy link
Member Author

compnerd commented Mar 6, 2018

@compnerd
Copy link
Member Author

compnerd commented Mar 6, 2018

@swift-ci please test

Copy link
Contributor

@jrose-apple jrose-apple left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@@ -158,8 +158,16 @@ if platform.system() == 'Darwin':
config.environment['TOOLCHAINS'] = \
os.environ.get('TOOLCHAINS', config.darwin_xcrun_toolchain)


kIsWindows = platform.system() == 'Windows'
Copy link
Contributor

Choose a reason for hiding this comment

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

Nitpick: please match the naming conventions for all the other variables in the file (snake_case, no leading "k").

Copy link
Member Author

Choose a reason for hiding this comment

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

This is a bit more complicated: this is also the name of a variable in the rest of lit (where I stole it from). It is in the core lit infrastructure ... so I'm kinda torn (my personal preference is the snake case).

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah. Uh…we're setting a variable in the rest of lit? Is it expecting us to do that?

Basically, if it's what Clang does then okay (although it may be worth leaving a comment).

@jrose-apple
Copy link
Contributor

Ah, is it worth bothering to make sure this doesn't conflict with Cygwin? I don't know if anyone's actively using that, though.

@compnerd
Copy link
Member Author

compnerd commented Mar 6, 2018

IIRC, @huonw was the one working on cygwin? I don't know if the tests ever passed in that environment in the first place.

@swift-ci
Copy link
Contributor

swift-ci commented Mar 6, 2018

Build failed
Swift Test Linux Platform
Git Sha - 0a63ed62204a7c8355782556bb89ee7a936cf612

@swift-ci
Copy link
Contributor

swift-ci commented Mar 6, 2018

Build failed
Swift Test OS X Platform
Git Sha - 0a63ed62204a7c8355782556bb89ee7a936cf612

@compnerd compnerd force-pushed the windows-is-lit branch 2 times, most recently from 87452ca to 55a53e3 Compare March 6, 2018 20:37
@huonw
Copy link
Contributor

huonw commented Mar 6, 2018

Not me, sorry!

@troughton
Copy link
Contributor

I think @tinysun212 was working on the Cygwin port.

@tinysun212
Copy link
Contributor

It is difficult to test on the Cygwin in my current situation.
I think this PR is not likely to affect to Cygwin because the added codes are enclosed by elif run_os in ['windows-msvc']:.

@compnerd
Copy link
Member Author

compnerd commented Mar 7, 2018

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Mar 7, 2018

Build failed
Swift Test Linux Platform
Git Sha - 0a63ed62204a7c8355782556bb89ee7a936cf612

@swift-ci
Copy link
Contributor

swift-ci commented Mar 7, 2018

Build failed
Swift Test OS X Platform
Git Sha - 0a63ed62204a7c8355782556bb89ee7a936cf612

@compnerd compnerd force-pushed the windows-is-lit branch 2 times, most recently from 68fe8e0 to 9b4e0f9 Compare March 7, 2018 05:23
@AndrewSB
Copy link
Contributor

AndrewSB commented Mar 7, 2018

This is awesome 👍

@compnerd compnerd force-pushed the windows-is-lit branch 3 times, most recently from 1731eb7 to f766208 Compare March 11, 2018 02:03
@compnerd
Copy link
Member Author

Okay, I've not had to tweak this in quite some time. I think that this is good from the support side, the tests need adjustment still.

@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - f766208b44fdc1fd7ed46618611f6ae912b88cf7

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - f766208b44fdc1fd7ed46618611f6ae912b88cf7

@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - f766208b44fdc1fd7ed46618611f6ae912b88cf7

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - f766208b44fdc1fd7ed46618611f6ae912b88cf7

@compnerd
Copy link
Member Author

@swift-ci please test and merge

@compnerd
Copy link
Member Author

Please test with following PR:
apple/swift-llvm#81

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - f766208b44fdc1fd7ed46618611f6ae912b88cf7

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - f766208b44fdc1fd7ed46618611f6ae912b88cf7

@compnerd compnerd force-pushed the windows-is-lit branch 2 times, most recently from b0d9547 to 242578f Compare April 25, 2018 22:35
@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 242578f

@compnerd
Copy link
Member Author

@swift-ci please smoke test

@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - fdfe12601879fc2328f63797b1312d615c4568b6

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - fdfe12601879fc2328f63797b1312d615c4568b6

@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - fdfe12601879fc2328f63797b1312d615c4568b6

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - fdfe12601879fc2328f63797b1312d615c4568b6

This enables lit to at least start running on Windows.  There is more
work necessary to get the tests actually passing on Windows.
@compnerd
Copy link
Member Author

@swift-ci please smoke test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 46de4205a5935b55aa283f955dcec84da08e8bb7

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 46de4205a5935b55aa283f955dcec84da08e8bb7

@compnerd
Copy link
Member Author

@swift-ci please test and merge

@compnerd compnerd merged commit cd8e12d into swiftlang:master Nov 27, 2018
@compnerd compnerd deleted the windows-is-lit branch November 27, 2018 00:39
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.

7 participants