Skip to content

[android][test] Fix or disable the remaining failing tests on the Android CI #81398

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

Merged
merged 1 commit into from
May 17, 2025
Merged

[android][test] Fix or disable the remaining failing tests on the Android CI #81398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/AutoDiff/SILOptimizer/vjp_inlining.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import _Differentiation
#if canImport(Glibc)
import Glibc
#elseif canImport(Android)
import Android
#else
import Foundation
#endif
Expand Down
6 changes: 3 additions & 3 deletions test/ClangImporter/cfuncs_parse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ func test_pow() {
}

// https://github.com/apple/swift/issues/51573
// long doubles in AAPCS64 are 128 bits, which is not supported by
// Swift, so don't test this.
#if !((os(Android) || os(Linux)) && arch(arm64))
// long doubles in AAPCS64 and 64-bit Android are 128 bits, which is not
// supported by Swift, so don't test this.
#if !((os(Android) && _pointerBitWidth(_64)) || (os(Linux) && arch(arm64)))
func test_powl() {
powl(1.5, 2.5)
}
Expand Down
2 changes: 1 addition & 1 deletion test/Frontend/default-search-paths.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// APPLE-NEXT: (End of search path lists.)

// Non-Apple platforms don't have any implicit framework search paths.
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -target x86_64-unknown-linux-android -parse %s -Rmodule-loading 2>&1 | %FileCheck -check-prefix=ANDROID %s
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -target x86_64-unknown-linux-android -parse -parse-stdlib %s -Rmodule-loading 2>&1 | %FileCheck -check-prefix=ANDROID %s
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed this test failing on the Android AArch64 CI alone in the last couple days with no output since it was added in #81269, so I ran the same command locally and got this error:

> ~/swift-DEVELOPMENT-SNAPSHOT-2025-04-12-a-fedora39/usr/bin/swift-frontend -target aarch64-unknown-linux-android -sdk /home/finagolfin/android-ndk-r27c/toolchains/llvm/prebuilt/linux-x86_64/sysroot -resource-dir /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/lib/swift -module-cache-path /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/swift-test-results/aarch64-unknown-linux-android/clang-module-cache -swift-version 4 -typo-correction-limit 10 -sdk /home/finagolfin/swift/test/Inputs/clang-importer-sdk -target x86_64-unknown-linux-android -parse foo.swift -Rmodule-loading
<unknown>:0: warning: libc not found for 'x86_64-unknown-linux-android'; C stdlib may be unavailable
Module import search paths:
Framework search paths:
Runtime library import search paths:
[0] /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/lib/swift/android
[1] /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/lib/swift/android/x86_64
[2] /home/finagolfin/swift/test/Inputs/clang-importer-sdk/usr/lib/swift/android
[3] /home/finagolfin/swift/test/Inputs/clang-importer-sdk/usr/lib/swift/android/x86_64
(End of search path lists.)
<unknown>:0: error: could not find module '_Concurrency' for target 'x86_64-unknown-linux-android'; found: aarch64-unknown-linux-android, at: /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/lib/swift/android/_Concurrency.swiftmodule

Since this passes on the Android x86_64 CI, this is another variant of the stdlib search path issue I raised for lto_autolink last week, which I'm able to avoid locally by passing in this extra -parse-stdlib flag also, as done in that test already.

@ian-twilightcoder, let me know what you think of this minor tweak to your new test for the Android CI.

// ANDROID: Implicit framework search paths:
// ANDROID-NEXT: Runtime library import search paths:
// ANDROID-NEXT: [0] BUILD_DIR/lib/swift/android
Expand Down
10 changes: 1 addition & 9 deletions test/Frontend/embed-bitcode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// REQUIRES: CPU=x86_64
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos, CPU=x86_64
// RUN: %target-swift-frontend -c -module-name someModule -embed-bitcode-marker -o %t.o %s
// RUN: llvm-objdump --macho --section="__LLVM,__bitcode" %t.o | %FileCheck -check-prefix=MARKER %s
// RUN: llvm-objdump --macho --section="__LLVM,__swift_cmdline" %t.o | %FileCheck -check-prefix=MARKER-CMD %s

// This file tests Mach-O file output, but Linux variants do not produce Mach-O
// files.
// UNSUPPORTED: OS=linux-gnu
// UNSUPPORTED: OS=linux-gnueabihf
// UNSUPPORTED: OS=freebsd
// UNSUPPORTED: OS=openbsd
// UNSUPPORTED: OS=windows-msvc

// MARKER: Contents of (__LLVM,__bitcode) section
// MARKER-NEXT: 00
// MARKER-CMD: Contents of (__LLVM,__swift_cmdline) section
Expand Down
14 changes: 9 additions & 5 deletions test/IRGen/condfail.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-swift-frontend -primary-file %s -O -g -S | %FileCheck %s --check-prefix CHECK --check-prefix CHECK-%target-cpu --check-prefix CHECK-OPT-%target-os
// RUN: %target-swift-frontend -primary-file %s -O -g -S | %FileCheck %s --check-prefix CHECK --check-prefix CHECK-%target-cpu --check-prefix CHECK-OPT-%target-os --check-prefix CHECK-OPT-%target-os-%target-cpu
// RUN: %target-swift-frontend -primary-file %s -g -S | %FileCheck %s --check-prefix CHECK --check-prefix CHECK-%target-cpu --check-prefix CHECK-NOOPT-%target-os

import Builtin
Expand All @@ -25,8 +25,10 @@ import Swift
// CHECK-OPT-windows: ##NO_APP
// CHECK-OPT-linux-androideabi: @APP
// CHECK-OPT-linux-androideabi: @NO_APP
// CHECK-OPT-linux-android: //APP
// CHECK-OPT-linux-android: //NO_APP
// CHECK-OPT-linux-android-aarch64: //APP
// CHECK-OPT-linux-android-aarch64: //NO_APP
// CHECK-OPT-linux-android-x86_64: #APP
// CHECK-OPT-linux-android-x86_64: #NO_APP
// CHECK-NOOPT-macosx-NOT: InlineAsm Start
// CHECK-NOOPT-macosx-NOT: InlineAsm End
// CHECK-NOOPT-linux-NOT: ##APP
Expand All @@ -35,8 +37,10 @@ import Swift
// CHECK-NOOPT-windows-NOT: ##NO_APP
// CHECK-OPT-linux-androideabi-NOT: @APP
// CHECK-OPT-linux-androideabi-NOT: @NO_APP
// CHECK-OPT-linux-android-NOT: //APP
// CHECK-OPT-linux-android-NOT: //NO_APP
// CHECK-OPT-linux-android-aarch64-NOT: //APP
// CHECK-OPT-linux-android-aarch64-NOT: //NO_APP
// CHECK-OPT-linux-android-x86_64-NOT: #APP
// CHECK-OPT-linux-android-x86_64-NOT: #NO_APP
// CHECK-x86_64: ud2
// CHECK-i386: ud2
// CHECK-arm64: brk
Expand Down
7 changes: 5 additions & 2 deletions test/IRGen/framepointer.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s -check-prefix CHECK --check-prefix=CHECK-%target-abi
// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s -check-prefix CHECK --check-prefix=CHECK-%target-abi --check-prefix=CHECK-%target-abi-%target-os
// RUN: %target-swift-frontend -primary-file %s -emit-ir -Xcc -mno-omit-leaf-frame-pointer | %FileCheck %s -check-prefix CHECK-ALL --check-prefix=CHECK-%target-abi-ALL
// RUN: %target-swift-frontend -primary-file %s -S | %FileCheck %s --check-prefix=CHECKASM --check-prefix=CHECKASM-%target-os-%target-cpu
// RUN: %target-swift-frontend -primary-file %s -emit-ir -Xcc -momit-leaf-frame-pointer | %FileCheck %s -check-prefix LEAF --check-prefix=LEAF-%target-abi
Expand Down Expand Up @@ -33,7 +33,10 @@ entry(%i : $Int32):
// CHECK: ret i32 %1
// CHECK: }

// CHECK-SYSV: attributes [[ATTR]] = { {{.*}}"frame-pointer"="all"
// CHECK-SYSV: Function Attrs:
// CHECK-SYSV-macosx: attributes [[ATTR]] = { {{.*}}"frame-pointer"="all"
// CHECK-SYSV-linux-gnu: attributes [[ATTR]] = { {{.*}}"frame-pointer"="all"
// CHECK-SYSV-linux-android: attributes [[ATTR]] = { {{.*}}"frame-pointer"="non-leaf"
// CHECK-WIN: attributes [[ATTR]] = { {{.*}}

// CHECK-ALL: define{{.*}} swiftcc i32 @leaf_function_no_frame_pointer(i32 %0) [[ATTR:#.*]] {
Expand Down
8 changes: 2 additions & 6 deletions test/IRGen/lto_autolink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import empty


// RUN: %target-swift-frontend -target %target-cpu-unknown-linux-gnu -emit-module -parse-stdlib -o %t -module-name empty -module-link-name empty %S/../Inputs/empty.swift
// RUN: %target-swift-emit-ir -target %target-cpu-unknown-linux-gnu -lto=llvm-full -parse-stdlib -I %t -I %S/Inputs -DTEST_CLANG_OPTIONS_MERGE %s | %FileCheck %s --check-prefix CHECK-ELF-MERGE
// RUN: %target-swift-emit-ir -target %target-cpu-unknown-linux-gnu -lto=llvm-thin -parse-stdlib -I %t -I %S/Inputs -DTEST_CLANG_OPTIONS_MERGE %s | %FileCheck %s --check-prefix CHECK-ELF-MERGE
// RUN: %target-swift-emit-ir -target %target-cpu-unknown-linux-gnu -lto=llvm-full -parse-stdlib -nostdimport -I %t -I %S/Inputs -DTEST_CLANG_OPTIONS_MERGE %s | %FileCheck %s --check-prefix CHECK-ELF-MERGE
// RUN: %target-swift-emit-ir -target %target-cpu-unknown-linux-gnu -lto=llvm-thin -parse-stdlib -nostdimport -I %t -I %S/Inputs -DTEST_CLANG_OPTIONS_MERGE %s | %FileCheck %s --check-prefix CHECK-ELF-MERGE

// CHECK-ELF-MERGE-DAG: !llvm.dependent-libraries = !{
// CHECK-ELF-MERGE-DAG: !{{[0-9]+}} = !{!"empty"}
Expand All @@ -43,8 +43,4 @@ import AutolinkElfCPragma
import AutolinkModuleMapLink
#endif

// UNSUPPORTED: OS=macosx && CPU=arm64
// UNSUPPORTED: OS=ios && CPU=arm64e
// UNSUPPORTED: OS=watchos && (CPU=arm64_32 || CPU=armv7k)
Comment on lines -46 to -48
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing these seems to have caused failures in iOS and macOS bots, e.g., https://ci.swift.org/job/oss-swift_tools-RA_stdlib-DA_test-device-non_executable/8901. Is there a specific reason to believe that these are no longer necessary?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed it on linux and Android, so I asked about fixing it on Darwin too. Allan, who originally disabled it, didn't respond, but Evan ran some other CI and said it seemed to work fine.

Looking at the error, it's exactly the same as the linux issue I fixed, so I'll submit the same fix for Darwin and if you can run this same failing CI on the Darwin fix, we can finally get it running on Darwin too.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Submitted the fix in #81695

// UNSUPPORTED: OS=linux-gnu && CPU=aarch64
// UNSUPPORTED: CPU=wasm32
2 changes: 1 addition & 1 deletion test/IRGen/pic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// platforms.

// https://github.com/apple/swift/issues/54619
// XFAIL: OS=linux-android, CPU=aarch64
// XFAIL: OS=linux-android && CPU=aarch64
// UNSUPPORTED: OS=linux-gnu, CPU=wasm32

// RUN: %target-swift-frontend %s -module-name main -S -o - | %FileCheck -check-prefix=%target-cpu -check-prefix=%target-cpu-%target-sdk-name %s
Expand Down
5 changes: 4 additions & 1 deletion test/IRGen/static_initializer.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-%target-abi -check-prefix CHECK-%target-abi-%target-cpu

// REQUIRES: CPU=arm64 || CPU=x86_64
// REQUIRES: CPU=aarch64 || CPU=arm64 || CPU=x86_64

// Android x86_64 doesn't expose Float80.
// UNSUPPORTED: OS=linux-android && CPU=x86_64

// Generated from
// var x : Int32 = 2
Expand Down
10 changes: 5 additions & 5 deletions test/Interop/Cxx/class/closure-thunk-irgen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public func testClosureToBlock() {
// CHECK: define internal void @"$s4main20testClosureToFuncPtryyFySo10NonTrivialVcfU_To"(ptr %[[V0:.*]])
// CHECK: %[[V1:.*]] = alloca %{{.*}}, align 8
// CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 8, ptr %[[V1]])
// CHECK-NEXT: call {{void|ptr}} @_ZN10NonTrivialC1ERKS_(ptr %[[V1]], ptr %[[V0]])
// CHECK-NEXT: call {{void|ptr}} @_ZN10NonTrivialC{{1|2}}ERKS_(ptr %[[V1]], ptr %[[V0]])
// CHECK-NEXT: call swiftcc void @"$s4main20testClosureToFuncPtryyFySo10NonTrivialVcfU_"(ptr noalias dereferenceable(8) %[[V1]])
// CHECK-NEXT: call {{void|ptr}} @_ZN10NonTrivialD1Ev(ptr %[[V1]])
// CHECK-NEXT: call {{void|ptr}} @_ZN10NonTrivialD{{1|2}}Ev(ptr %[[V1]])
// CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 8, ptr %[[V1]])
// CHECK-NEXT: ret void

Expand All @@ -41,7 +41,7 @@ public func testClosureToFuncPtrReturnNonTrivial() {
cfuncReturnNonTrivial2({() -> NonTrivial in return NonTrivial()});
}

// CHECK: define swiftcc { ptr, ptr } @"$s4main13returnFuncPtrySo10NonTrivialVcyF"()
// CHECK: define{{( protected)?}} swiftcc { ptr, ptr } @"$s4main13returnFuncPtrySo10NonTrivialVcyF"()
// CHECK: %[[V0:.*]] = call ptr @_Z8getFnPtrv()
// CHECK: %[[V1:.*]] = call noalias ptr @swift_allocObject(ptr getelementptr inbounds (%{{.*}}, ptr @{{.*}}, i32 0, i32 2), i64 24, i64 7)
// CHECK: %[[V2:.*]] = getelementptr inbounds{{.*}} <{ %{{.*}}, ptr }>, ptr %[[V1]], i32 0, i32 1
Expand All @@ -52,12 +52,12 @@ public func testClosureToFuncPtrReturnNonTrivial() {
// CHECK: define linkonce_odr hidden swiftcc void @"$sSo10NonTrivialVIetCX_ABIegn_TR"(ptr noalias dereferenceable(8) %[[V0:.*]], ptr %[[V1:.*]])
// CHECK: %[[V2:.*]] = alloca %{{.*}}, align 8
// CHECK: call void @llvm.lifetime.start.p0(i64 8, ptr %[[V2]])
// CHECK: call {{(void|ptr)}} @_ZN10NonTrivialC1ERKS_(ptr %[[V2]], ptr %[[V0]])
// CHECK: call {{(void|ptr)}} @_ZN10NonTrivialC{{1|2}}ERKS_(ptr %[[V2]], ptr %[[V0]])
// CHECK: invoke void %[[V1]](ptr %[[V2]])
// CHECK: to label %[[INVOKE_CONT:.*]] unwind label %{{.*}}

// CHECK: [[INVOKE_CONT]]:
// CHECK-NEXT: call {{(void|ptr)}} @_ZN10NonTrivialD1Ev(ptr %[[V2]])
// CHECK-NEXT: call {{(void|ptr)}} @_ZN10NonTrivialD{{1|2}}Ev(ptr %[[V2]])
// CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 8, ptr %[[V2]])
// CHECK-NEXT: ret void

Expand Down
8 changes: 4 additions & 4 deletions test/Interop/Cxx/class/function-call-irgen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@

import Closure

// CHECK: define swiftcc void @"$s4main14testNonTrivialyyF"()
// CHECK: define{{( protected)?}} swiftcc void @"$s4main14testNonTrivialyyF"()
// CHECK: %[[V0:.*]] = alloca %{{.*}}, align 8
// CHECK: call void @llvm.lifetime.start.p0(i64 8, ptr %[[V0]])
// CHECK: call {{(void|ptr)}} @__swift_cxx_ctor_ZN10NonTrivialC1Ev(ptr %[[V0]])
// CHECK: call void @_Z5cfunc10NonTrivial(ptr %[[V0]])
// CHECK: call {{(void|ptr)}} @_ZN10NonTrivialD1Ev(ptr %[[V0]])
// CHECK: call {{(void|ptr)}} @_ZN10NonTrivialD{{1|2}}Ev(ptr %[[V0]])
// CHECK: call void @llvm.lifetime.end.p0(i64 8, ptr %[[V0]])
// CHECK: ret void

public func testNonTrivial() {
cfunc(NonTrivial());
}

// CHECK: define swiftcc void @"$s4main29testNonTrivialFunctionPointeryyF"()
// CHECK: define{{( protected)?}} swiftcc void @"$s4main29testNonTrivialFunctionPointeryyF"()
// CHECK: %[[F_DEBUG:.*]] = alloca ptr, align 8
// CHECK: call void @llvm.memset.p0.i64(ptr align 8 %[[F_DEBUG]], i8 0, i64 8, i1 false)
// CHECK: %[[V0:.*]] = alloca %{{.*}}, align 8
Expand All @@ -29,7 +29,7 @@ public func testNonTrivial() {
// CHECK: to label %[[INVOKE_CONT:.*]] unwind label %{{.*}}

// CHECK: [[INVOKE_CONT]]:
// CHECK: call {{(void|ptr)}} @_ZN10NonTrivialD1Ev(ptr %[[V0]])
// CHECK: call {{(void|ptr)}} @_ZN10NonTrivialD{{1|2}}Ev(ptr %[[V0]])
// CHECK: call void @llvm.lifetime.end.p0(i64 8, ptr %[[V0]])
// CHECK: ret void

Expand Down
2 changes: 1 addition & 1 deletion test/Interop/Cxx/stdlib/std-span-interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// REQUIRES: swift_feature_SafeInteropWrappers

// FIXME swift-ci linux tests do not support std::span
// UNSUPPORTED: OS=linux-gnu
// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi

#if !BRIDGING_HEADER
import StdSpan
Expand Down
4 changes: 2 additions & 2 deletions test/Parse/enum_floating_point_raw_value.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

// REQUIRES: CPU=i386 || CPU=x86_64

// Windows does not support FP80
// XFAIL: OS=windows-msvc
// Windows and Android do not support FP80
// UNSUPPORTED: OS=windows-msvc, OS=linux-android

enum RawTypeWithFloatValues : Float { // expected-error {{'RawTypeWithFloatValues' declares raw type 'Float', but does not conform to RawRepresentable and conformance could not be synthesized}} expected-note {{add stubs for conformance}}
case Northrup = 1.5
Expand Down
2 changes: 1 addition & 1 deletion test/SIL/clang-function-types-android.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-sil -swift-version 5 -use-clang-function-types -experimental-print-full-convention -o - | %FileCheck %s --check-prefix=CHECK-%target-ptrsize
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -Xllvm -sil-print-types -emit-sil -swift-version 5 -use-clang-function-types -experimental-print-full-convention -o - | %FileCheck %s --check-prefix=CHECK-%target-ptrsize
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simply bringing over Erik's recent change


// REQUIRES: OS=linux-android || OS=linux-androideabi

Expand Down
4 changes: 3 additions & 1 deletion test/SILOptimizer/diagnostic_constant_propagation_floats_x86.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
//
// REQUIRES: CPU=i386 || CPU=x86_64
// UNSUPPORTED: OS=windows-msvc
//
// Windows and Android do not expose Float80.
// UNSUPPORTED: OS=windows-msvc, OS=linux-android
//
// These are tests for diagnostics produced by constant propagation pass
// on floating-point operations that are specific to x86 architectures,
Expand Down
7 changes: 6 additions & 1 deletion test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2405,10 +2405,15 @@ def find_compiler_rt_libs():
# Next check for the old scheme 'clang/lib/<os-name>', ignoring
# any target environment which is currently part of 'run_os'.
path = make_path(base, run_os.split('-')[0])

# Check if the Android environment needs to be in the name.
env = ''
if run_os.startswith('linux-android'):
env = '-android'
if os.path.exists(path):
# We should then have the architecture in the name.
for lib in os.listdir(path):
match = re.match(r'(?:lib)?clang_rt\.(\w+)-' + run_cpu, lib)
match = re.match(r'(?:lib)?clang_rt\.(\w+)-' + run_cpu + env, lib)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If running the Android x86_64 tests on linux x86_64, this was detecting the linux clang_rt libraries and wrongly enabling all these sanitizer tests for Android too, which then fail because the compiler correctly checks for this environment suffix. Checking for the suffix here too makes sure the Android-specific libraries are available, and disables the sanitizer tests on the Android CI when they aren't.

if match:
libs[match[1]] = lib

Expand Down
4 changes: 3 additions & 1 deletion test/stdlib/FloatingPointIR_FP80.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// RUN: %target-build-swift -Ounchecked -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s

// REQUIRES: CPU=i386 || CPU=x86_64
// UNSUPPORTED: OS=windows-msvc
//
// Windows and Android do not expose Float80.
// UNSUPPORTED: OS=windows-msvc, OS=linux-android

var globalFloat80 : Float80 = 0.0

Expand Down