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

Switch To target-swiftc_driver #34284

Merged
merged 3 commits into from
Oct 20, 2020
Merged

Conversation

CodaFi
Copy link
Contributor

@CodaFi CodaFi commented Oct 12, 2020

Try to pass an explicit target to these tests so more exotic hosts do
the right thing.

rdar://70175753

@CodaFi CodaFi requested a review from beccadax October 12, 2020 22:18
@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 12, 2020

@swift-ci test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 0a1b3de407c77fc6a3c91be6ee015eee8a9d8dcd

@swift-ci
Copy link
Contributor

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

Try to pass an explicit target to these tests so more exotic hosts do
the right thing.

rdar://70175753
Unfortunately, OutputFileMap does not normalize input names when it is constructing keys. Instead, keys to the map are formed by appending the entry's value directly onto the working directory with the test host's path separator convention.

On Windows, the tests here were using UNIX-style path separators when passing inputs to the Driver, so the key was

"C:\Path\To\File\A.swift"

But the input path to the driver was

"C:\Path\To\File/A.swift"

To work around this - and to ultimately make the test slightly more portable - just use relative paths to the input files since we've already changed directories to the working directory before we run these driver commands.
@CodaFi CodaFi force-pushed the testable-hypotheses branch from 0a1b3de to bcd0cb6 Compare October 19, 2020 21:09
@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 19, 2020

@swift-ci test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - bcd0cb6

@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 19, 2020

@swift-ci test macOS

@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 19, 2020

@swift-ci test Windows

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - bcd0cb6

@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 19, 2020

@swift-ci test macOS

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - bcd0cb6

@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 19, 2020

@swift-ci test macOS

@CodaFi CodaFi marked this pull request as ready for review October 20, 2020 06:34
@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 20, 2020

@CodaFi CodaFi merged commit cfb4a0f into swiftlang:main Oct 20, 2020
@CodaFi CodaFi deleted the testable-hypotheses branch October 20, 2020 18:09
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.

2 participants