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

TestFoundation: make test_nullDevice test more portable #2243

Merged
merged 1 commit into from
May 18, 2019

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented May 9, 2019

This makes test_nullDevice more portable so that we can run the test
on Windows as well.

@compnerd
Copy link
Member Author

compnerd commented May 9, 2019

@swift-ci please test

@compnerd
Copy link
Member Author

compnerd commented May 9, 2019

@swift-ci please test Linux platform

@millenomi
Copy link
Contributor

This needs conflict resolution before I can merge.

@spevans
Copy link
Contributor

spevans commented May 10, 2019

Doesnt this need a

#if NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT
    #if canImport(SwiftFoundation) && !DEPLOYMENT_RUNTIME_OBJC
        @testable import SwiftFoundation
    #else
        @testable import Foundation
    #endif
#endif

At the top if you are using NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT ?

This makes test_nullDevice more portable so that we can run the test
on Windows as well.
@compnerd compnerd force-pushed the rube-goldberg-device branch from 553bd24 to 82b1744 Compare May 11, 2019 01:25
@compnerd
Copy link
Member Author

That is already present now. So, this is ready to go as is.

@spevans
Copy link
Contributor

spevans commented May 11, 2019

It needs to be in every file that does a @testable import - I just tested this PR on xcode and it wont compile otherwise.

@compnerd
Copy link
Member Author

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd compnerd merged commit 32ec786 into swiftlang:master May 18, 2019
@compnerd compnerd deleted the rube-goldberg-device branch May 18, 2019 18:21
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.

3 participants