[stdlib] Migrate stdlib tests of Swift 3 #17427

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

airspeedswift merged 4 commits into swiftlang:master from airspeedswift:stdlib-swift-4-tests

Jul 8, 2018

Member

airspeedswift commented Jun 22, 2018 •

edited

Loading

PR to gather std lib tests that use Swift 3.

Some need switching from 3 to 4, with source tweaks
Some just need deleting because they were testing 3-only stuff
Some test multiple versions and need 3 removing

Feel free to join the party.

Member Author

airspeedswift commented Jun 22, 2018

@swift-ci please test

airspeedswift requested review from moiseev, milseman, lorentey and lancep

June 22, 2018 17:45

slavapestov reviewed

View reviewed changes

test/stdlib/Dispatch.swift

    
            @@ -595,11 +595,9 @@ DispatchAPI.test("DispatchTimeInterval") {
          
              	expectTrue(t == t) // This would crash.

              }

              #if swift(>=4.0)

Contributor

slavapestov Jun 22, 2018

Can you remove the RUN: line for -swift-version 3 too?

slavapestov reviewed

View reviewed changes

test/stdlib/LazyCollectionPlus.swift Outdated

    
            @@ -1,5 +1,5 @@
          
              // RUN: %empty-directory(%t)

              // RUN: %target-build-swift %s -o %t/a.out3 -swift-version 3 && %target-run %t/a.out3

              // RUN: %target-build-swift %s -o %t/a.out -swift-version 3 && %target-run %t/a.out

Contributor

slavapestov Jun 22, 2018

Should this be -swift-version 4?

Member Author

airspeedswift Jul 5, 2018

ah in fact the whole test should just go, we don't support this beyond Swift 3

Contributor

slavapestov commented Jun 22, 2018

Thanks for working on this!

Member

milseman commented Jun 23, 2018

Some of these changes are to explicitly check legacy support for users of -swift-version 3. Is your intention for us to not test this mode at all, or just to migrate stale tests?

milseman approved these changes

View reviewed changes

Member

milseman left a comment

LGTM

lorentey approved these changes

View reviewed changes

Member

lorentey left a comment

Big thumbs up!

test/stdlib/StringFlatMap.swift Outdated

    
              // RUN: %target-build-swift %s -o %t/a.out4 -swift-version 4 && %target-run %t/a.out4

              // REQUIRES: executable_test

              import StdlibUnittest

              #if swift(>=4)

              public typealias ExpectedResultType = [Character]

              let swiftVersion = "4"

Member

lorentey Jun 29, 2018

Nit: I think we should remove these two variables now; they make it slightly harder to understand the tests.

airspeedswift force-pushed the stdlib-swift-4-tests branch from 20b0b56 to 41e05d4 Compare

July 5, 2018 15:12

Member Author

airspeedswift commented Jul 5, 2018

@swift-ci please test

airspeedswift changed the title ~~[stdlib][WIP] Migrate stdlib tests of Swift 3~~ [stdlib] Migrate stdlib tests of Swift 3

Contributor

swift-ci commented Jul 5, 2018

Build failed
Swift Test Linux Platform
Git Sha - 41e05d41aad9a2b041519a88f0a4a19dfcb07d13

Member Author

airspeedswift commented Jul 5, 2018

@swift-ci please test Linux platform

Contributor

swift-ci commented Jul 5, 2018

Build failed
Swift Test Linux Platform
Git Sha - 41e05d41aad9a2b041519a88f0a4a19dfcb07d13

Member Author

airspeedswift commented Jul 5, 2018

@swift-ci please test Linux platform

Contributor

swift-ci commented Jul 5, 2018

Build failed
Swift Test Linux Platform
Git Sha - 41e05d41aad9a2b041519a88f0a4a19dfcb07d13

Member Author

airspeedswift commented Jul 5, 2018

@swift-ci please clean test linux platform

Contributor

swift-ci commented Jul 5, 2018

Build failed
Swift Test Linux Platform
Git Sha - 41e05d41aad9a2b041519a88f0a4a19dfcb07d13

airspeedswift force-pushed the stdlib-swift-4-tests branch from 41e05d4 to 6dc812b Compare

July 5, 2018 20:18

Member Author

airspeedswift commented Jul 5, 2018

@swift-ci please test

Contributor

swift-ci commented Jul 5, 2018

Build failed
Swift Test OS X Platform
Git Sha - 41e05d41aad9a2b041519a88f0a4a19dfcb07d13

Contributor

swift-ci commented Jul 5, 2018

Build failed
Swift Test Linux Platform
Git Sha - 41e05d41aad9a2b041519a88f0a4a19dfcb07d13

airspeedswift force-pushed the stdlib-swift-4-tests branch 2 times, most recently from ae6ded1 to 387ca22 Compare

July 6, 2018 18:35

Member Author

airspeedswift commented Jul 6, 2018

@swift-ci please test

Contributor

swift-ci commented Jul 6, 2018

Build failed
Swift Test Linux Platform
Git Sha - f7ab8ca87135fe50f4f16357aca0af969772d96d

airspeedswift commented

View reviewed changes

test/stdlib/Inputs/DictionaryKeyValueTypesObjC.swift

    
            @@ -475,8 +475,7 @@ func getBridgedNSDictionaryOfRefTypesBridgedVerbatim() -> NSDictionary {
          
                d[TestObjCKeyTy(20)] = TestObjCValueTy(1020)

                d[TestObjCKeyTy(30)] = TestObjCValueTy(1030)

                let bridged =

                  unsafeBitCast(convertDictionaryToNSDictionary(d), to: NSDictionary.self)

Member Author

airspeedswift Jul 6, 2018

@lorentey just to check, can you spot any higher purpose to this bit cast that I'm missing? The function already returns an NSDictionary.

Member

lorentey Jul 8, 2018

There is none as far as I can tell!

Member Author

airspeedswift commented Jul 6, 2018

@swift-ci please test linux platform

airspeedswift and others added 4 commits

July 7, 2018 17:20


          First sweep of Swift 3 stdlib test upgrades

49e54b7


          Review feedback

762433b


          Remove a handful more #if >=4.0

1859e2d


          Fix up Dictionary tests

f5d938a

airspeedswift force-pushed the stdlib-swift-4-tests branch from 387ca22 to f5d938a Compare

July 8, 2018 00:23

Member Author

airspeedswift commented Jul 8, 2018

@swift-ci please test

Contributor

swift-ci commented Jul 8, 2018

Build failed
Swift Test Linux Platform
Git Sha - 387ca22eb7d4c2ef5423f0e63afeeb7091d0e545

Contributor

swift-ci commented Jul 8, 2018

Build failed
Swift Test OS X Platform
Git Sha - 387ca22eb7d4c2ef5423f0e63afeeb7091d0e545

Member Author

airspeedswift commented Jul 8, 2018

@swift-ci please test Linux platform

Contributor

swift-ci commented Jul 8, 2018

Build failed
Swift Test Linux Platform
Git Sha - f5d938a

Member Author

airspeedswift commented Jul 8, 2018

@swift-ci please test Linux platform

Member Author

airspeedswift commented Jul 8, 2018

Finally™️

airspeedswift merged commit 685f31b into swiftlang:master

airspeedswift deleted the stdlib-swift-4-tests branch

July 8, 2018 16:37

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

slavapestov slavapestov left review comments

lorentey lorentey approved these changes

milseman milseman approved these changes

moiseev Awaiting requested review from moiseev

lancep Awaiting requested review from lancep

Labels

None yet