-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[android][test] Fix several tests on the Android CI #59279
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
Conversation
@@ -1,7 +1,6 @@ | |||
// REQUIRES: OS=macosx | |||
// REQUIRES: CPU=x86_64 | |||
// FIXME: rdar://problem/19648117 Needs splitting objc parts out | |||
// XFAIL: OS=linux-gnu, OS=freebsd |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not needed because of the REQUIRES: OS=macosx
line above?
@@ -7,8 +7,6 @@ | |||
// REQUIRES: concurrency | |||
// REQUIRES: objc_interop | |||
// REQUIRES: tsan_runtime | |||
// UNSUPPORTED: OS=linux-gnu | |||
// UNSUPPORTED: OS=windows-msvc |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this test requires objc_interop
, which is only available on Apple platforms, these lines are not needed.
@@ -1,7 +1,7 @@ | |||
// RUN: %target-typecheck-verify-swift | |||
|
|||
// FIXME: No simd module on linux rdar://problem/20795411 | |||
// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd | |||
// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd, OS=linux-android, OS=linux-androideabi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Strangely, this test passes when the toolchain is built and run natively on Android but not when cross-compiling, not sure what's going on.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And now it fails natively too. 🤷
Those updates LGTM. Thanks and sorry about the churn - I was just trying to get the tests to consistently use the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@swift-ci please smoke test
- 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.
Finally ran the compiler validation suite natively on the latest Jun. 7 trunk snapshot and updated this pull with the results. I simply disabled the 11 C++ foreign reference Interop tests that are failing on the Android CI, though I left alone the additional four Interop tests that fail natively. That means this pull should get the Android CI green again, ready for review, @drodriguez. Running the testsuite natively on Android AArch64 also turned up the following:
|
@swift-ci please smoke test and merge |
Congrats. The AArch64 test seems to be green: https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64/902/ . Sadly there's a static_assert for the ARMv7 build: https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/901/ (is i386 a thing in Android anymore? it might fail in the same way) |
Yeah, I saw that the armv7 build of the stdlib started failing yesterday morning, right before you merged this pull. Nobody has ever tried Swift on Android i386 AFAIK, which makes sense as there was never really any such hardware. |
Maybe related to #59287? |
The ARMv7 thing is my fault. I hadn't been thinking about 32-bit Linux when I wrote the new |
SIL/clang-function-types
tests, so I remove it for Android too.SILOptimizer/concat_string_literals.64
will need to be updated for that, disabled it for now.Also, these five tests were all disabled on
linux
before #58975 but pass on the Android CI now, so I left them enabled for Android. Maybe they should be enabled for linux-gnu too:AutoDiff/compiler_crashers_fixed/rdar71191415-nested-differentiation-of-extension-method-optimized
SILOptimizer/addr_escape_info
SILOptimizer/escape_info
SILOptimizer/ranges
Sema/type_checker_perf/fast/rdar54580427
Another 5-10 tests are now enabled natively on Android, I will kick off a native build and test run of the toolchain with the next trunk snapshot tag and update this pull to disable them again if any fail.
Once this pull gets these tests fixed, all that remains is the 11 C++ Interop foreign reference tests that have been failing on the Android CI since they were added late last year. I can simply disable them all for Android, or if @zoecarver has any suggestions, we could try to fix them.
@bnbarham, you modified most of these tests, let me know what you think.
@compnerd and @drodriguez, trying to get the Android CI passing again, feedback welcome.