Skip to content

Make computeXCTestMinimumDeploymentTarget() more robust #2729

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
May 5, 2020
Merged

Make computeXCTestMinimumDeploymentTarget() more robust #2729

merged 1 commit into from
May 5, 2020

Conversation

neonichu
Copy link
Contributor

@neonichu neonichu commented May 5, 2020

This could assert with empty stdout from xcrun or if the output of xcrun was not an absolute path. We should be robust against these cases and return the fallback.

rdar://problem/62898201

@neonichu
Copy link
Contributor Author

neonichu commented May 5, 2020

@swift-ci please smoke test

@neonichu
Copy link
Contributor Author

neonichu commented May 5, 2020

/home/buildnode/jenkins/workspace/swift-package-manager-self-hosted-Linux-smoke-test/branch-master/swiftpm/Tests/PackageLoadingTests/MinimumDeploymentTargetTests.swift:24: error: MinimumDeploymentTargetTests.testDoesNotAssertWithNoOutput : XCTAssertNil threw error "could not find executable for 'xcrun'" -

I need to #if os(macOS) these tests.

@neonichu neonichu force-pushed the computeXCTestMinimumDeploymentTarget-robustness branch from 8c83d35 to bd587ef Compare May 5, 2020 20:48
@neonichu
Copy link
Contributor Author

neonichu commented May 5, 2020

@swift-ci please smoke test

abertelrud
abertelrud reviewed May 5, 2020
View reviewed changes
@neonichu
Make computeXCTestMinimumDeploymentTarget() more robust
6021666 
This could assert with empty stdout from `xcrun` or if the output of
`xcrun` was not an absolute path. We should be robust against these
cases and return the fallback.

rdar://problem/62898201
@neonichu neonichu force-pushed the computeXCTestMinimumDeploymentTarget-robustness branch from bd587ef to 6021666 Compare May 5, 2020 21:31
@neonichu
Copy link
Contributor Author

neonichu commented May 5, 2020

@swift-ci please smoke test

@neonichu neonichu merged commit 8ee8bf2 into swiftlang:master May 5, 2020
@neonichu neonichu deleted the computeXCTestMinimumDeploymentTarget-robustness branch May 5, 2020 23:05
@neonichu neonichu mentioned this pull request May 5, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abertelrud abertelrud abertelrud approved these changes

@aciidgh aciidgh Awaiting requested review from aciidgh

@friedbunny friedbunny Awaiting requested review from friedbunny

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@neonichu @abertelrud