Skip to content

[Tests] Make OS features consistent #58975

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
May 25, 2022

Conversation

bnbarham
Copy link
Contributor

lit.py currently allows any substring of target_triple to be used as a
feature in REQUIRES/UNSUPPORTED/XFAIL. This results in various forms of
the OS spread across the tests and is also somewhat confusing since they
aren't actually listed in the available features.

Modify all OS-related features to use the OS= version that Swift adds
instead. We can later remove config.target_triple so that these don't
the non-OS versions don't work in the first place.

@bnbarham bnbarham requested review from compnerd and shahmishal May 19, 2022 01:03
@bnbarham bnbarham force-pushed the make-features-consistent branch from b01c6a4 to a871e14 Compare May 19, 2022 01:14
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham bnbarham force-pushed the make-features-consistent branch from a871e14 to 86162b9 Compare May 19, 2022 16:21
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham bnbarham force-pushed the make-features-consistent branch from 86162b9 to f2938c4 Compare May 19, 2022 19:40
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham
Copy link
Contributor Author

bnbarham commented May 19, 2022

@shahmishal I had a look at the counts:
Linux: Same
Windows: 10 extra passing (re-enabled some distributed actor tests). This is off though because I re-enabled 13, so there's 3 new unsupported now it seems?
MacOS: 1 extra passing (re-enabled a concurrency test)

Edit: Going to separate re-enabling to a different PR to avoid confusion in this one.

@bnbarham bnbarham force-pushed the make-features-consistent branch from f2938c4 to 04becae Compare May 21, 2022 00:20
@bnbarham
Copy link
Contributor Author

@swift-ci please test Windows platform

lit.py currently allows any substring of `target_triple` to be used as a
feature in REQUIRES/UNSUPPORTED/XFAIL. This results in various forms of
the OS spread across the tests and is also somewhat confusing since they
aren't actually listed in the available features.

Modify all OS-related features to use the `OS=` version that Swift adds
instead. We can later remove `config.target_triple` so that these don't
the non-OS versions don't work in the first place.
@bnbarham bnbarham force-pushed the make-features-consistent branch from 04becae to 05d33a4 Compare May 21, 2022 02:53
@bnbarham
Copy link
Contributor Author

@swift-ci please test Windows platform

@bnbarham bnbarham force-pushed the make-features-consistent branch from a5d4df9 to c163e0f Compare May 23, 2022 16:20
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham
Copy link
Contributor Author

@swift-ci please test Linux platform

@bnbarham
Copy link
Contributor Author

As far as I can tell all the counts are the same. Happy for me to merge @shahmishal @compnerd?

@compnerd
Copy link
Member

Sure, if its no-op on the counts, lets merge it and clean up subsequently.

@bnbarham bnbarham merged commit efc9469 into swiftlang:main May 25, 2022
@bnbarham bnbarham deleted the make-features-consistent branch May 25, 2022 23:02
finagolfin added a commit to finagolfin/swift that referenced this pull request Jun 6, 2022
- swiftlang#58975 switched many tests from XFAIL on linux to linux-gnu, so seven
  fail on the Android CI. They are now explicitly excluded.
- swiftlang#42478 removed the @NoEscape attribute for the non-Android
  SIL/clang-function-types tests, so I remove it for Android too.
- My pull swiftlang#40779 moved the Swift pointer tags to the second byte, so
  SILOptimizer/concat_string_literals.64 will need to be updated for that,
  disabled it for now.
- Compiler-rt moved the directory in which it places those libraries for
  Android, llvm/llvm-project@a68ccba, so lit.cfg is updated for that.
finagolfin added a commit to finagolfin/swift that referenced this pull request Jun 7, 2022
- swiftlang#58975 switched many tests from XFAIL on linux to linux-gnu, so seven
  fail on the Android CI. They are now explicitly excluded.
- swiftlang#42478 removed the @NoEscape attribute for the non-Android
  SIL/clang-function-types tests, so I remove it for Android too.
- My pull swiftlang#40779 moved the Swift pointer tags to the second byte, so
  SILOptimizer/concat_string_literals.64 will need to be updated for that,
  disabled it for now.
- Compiler-rt moved the directory in which it places those libraries for
  Android, llvm/llvm-project@a68ccba, so lit.cfg is updated for that.
finagolfin added a commit to finagolfin/swift that referenced this pull request Jun 9, 2022
- swiftlang#58975 switched many tests from XFAIL on linux to linux-gnu, so seven
  fail on the Android CI and two natively. They are now explicitly excluded.
- swiftlang#39605 added several C++ Interop tests, 11 of which fail on the Android CI,
  so disable them for now.
- swiftlang#42478 removed the @NoEscape attribute for the non-Android
  SIL/clang-function-types tests, so I remove it for Android too.
- My pull swiftlang#40779 moved the Swift pointer tags to the second byte, so
  SILOptimizer/concat_string_literals.64 will need to be updated for that,
  disabled it for now.
- Compiler-rt moved the directory in which it places those libraries for
  Android, llvm/llvm-project@a68ccba, so lit.cfg is updated for that.
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