Skip to content

Commit 48ee0a6

Browse files
swift-ciswift-ci
authored
Merge pull request #59279 from buttaface/droid
[android][test] Fix several tests on the Android CI
2 parents 5ed21c6 + 3933fc0 commit 48ee0a6

26 files changed

+43
-20
lines changed

‎test/Driver/Dependencies/only-skip-once.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// XFAIL: OS=linux-gnu, OS=openbsd, OS=windows-msvc
1+
// XFAIL: OS=linux-gnu, OS=openbsd, OS=windows-msvc, OS=linux-android, OS=linux-androideabi
22

33
// RUN: %empty-directory(%t)
44
// RUN: cp -r %S/Inputs/only-skip-once/* %t

‎test/Driver/parseable_output.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %swiftc_driver_plain -emit-executable %s -o %t.out -emit-module -emit-module-path %t.swiftmodule -emit-objc-header-path %t.h -serialize-diagnostics -emit-dependencies -parseable-output -driver-skip-execution 2>&1 | %FileCheck %s
22

3-
// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu
3+
// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu, OS=linux-android, OS=linux-androideabi
44

55
// CHECK: {{[1-9][0-9]*}}
66
// CHECK-NEXT: {

‎test/Driver/parseable_output_unicode.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: cat "%S/Inputs/unicode.txt" >> %t.rsp
33
// RUN: %swiftc_driver_plain -emit-executable @%t.rsp -o %t.out -emit-module -emit-module-path %t.swiftmodule -emit-objc-header-path %t.h -serialize-diagnostics -emit-dependencies -parseable-output -driver-skip-execution 2>&1 | %FileCheck %s
44

5-
// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu
5+
// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu, OS=linux-android, OS=linux-androideabi
66

77
// CHECK: {{[1-9][0-9]*}}
88
// CHECK-NEXT: {

‎test/Driver/sdk-apple.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu, OS=windows-msvc
1+
// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu, OS=windows-msvc, OS=linux-android, OS=linux-androideabi
22

33
// Test SDK detection for immediate mode.
44
// RUN: %empty-directory(%t)

‎test/IDE/print_clang_header_i386.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// REQUIRES: OS=macosx
22
// REQUIRES: CPU=x86_64
33
// FIXME: rdar://problem/19648117 Needs splitting objc parts out
4-
// XFAIL: OS=linux-gnu, OS=freebsd
54

65
// RUN: echo '#include "header-to-print.h"' > %t.i386.m
76
// RUN: %empty-directory(%t)

‎test/IRGen/abitypes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir -enable-objc-interop | %FileCheck -check-prefix=%target-cpu-%target-os-abi %s
22

33
// FIXME: rdar://problem/19648117 Needs splitting objc parts out
4-
// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd
4+
// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd, OS=linux-android, OS=linux-androideabi
55

66
import gadget
77
import Foundation

‎test/Interop/Cxx/foreign-reference/error-in-generic-context.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// RUN: rm -rf %t
22
// RUN: split-file %s %t
33
// RUN: not %target-swift-frontend -emit-ir -I %t/Inputs %t/test.swift -enable-experimental-cxx-interop 2>&1 | %FileCheck %s
4+
//
5+
// XFAIL: OS=linux-android, OS=linux-androideabi
46

57
//--- Inputs/module.modulemap
68
module Test {

‎test/Interop/Cxx/foreign-reference/move-only-irgen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
import MoveOnly
46

‎test/Interop/Cxx/foreign-reference/move-only-module-interface.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-ide-test -print-module -module-to-print=MoveOnly -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
// CHECK: class MoveOnly {
46
// CHECK-NOT: init

‎test/Interop/Cxx/foreign-reference/move-only-silgen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
import MoveOnly
46

‎test/Interop/Cxx/foreign-reference/nullable-module-interface.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-ide-test -print-module -module-to-print=Nullable -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
// CHECK: class Empty {
46
// CHECK: func test() -> Int32

‎test/Interop/Cxx/foreign-reference/pod-irgen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
import POD
46

‎test/Interop/Cxx/foreign-reference/pod-module-interface.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-ide-test -print-module -module-to-print=POD -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
// CHECK: class Empty {
46
// CHECK-NOT: init

‎test/Interop/Cxx/foreign-reference/pod-silgen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
import POD
46

‎test/Interop/Cxx/foreign-reference/singleton-irgen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
import Singleton
46

‎test/Interop/Cxx/foreign-reference/singleton-module-interface.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-ide-test -print-module -module-to-print=Singleton -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
// CHECK: class DeletedDtor {
46
// CHECK-NOT: init

‎test/Interop/Cxx/foreign-reference/singleton-silgen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
2+
//
3+
// XFAIL: OS=linux-android, OS=linux-androideabi
24

35
import Singleton
46

‎test/Prototypes/CollectionTransformers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ import Darwin
200200
import Dispatch
201201

202202
// FIXME: port to Linux.
203-
// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd
203+
// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd, OS=linux-android
204204

205205
// A wrapper for pthread_t with platform-independent interface.
206206
public struct _stdlib_pthread_t : Equatable, Hashable {

‎test/Reflection/box_descriptors.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %target-swift-reflection-dump -binary-filename %t/capture_descriptors%{target-shared-library-suffix} | %FileCheck %s
44

55
// SR-10758
6-
// UNSUPPORTED: OS=linux-gnu
6+
// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
77

88
// SR-12893
99
// XFAIL: OS=openbsd

‎test/SIL/clang-function-types-android.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import ctypes
66

77
public func f(g: @convention(c, cType: "void (*)(size_t)") (Int) -> ()) { g(0) }
88

9-
// CHECK-32: sil @$s4main1f1gyySiXzC9_ZTSPFvjE_tF : $@convention(thin) (@convention(c, cType: "void (*)(unsigned int)") @noescape (Int) -> ()) -> () {
10-
// CHECK-32: bb0(%0 : $@convention(c, cType: "void (*)(unsigned int)") @noescape (Int) -> ()):
11-
// CHECK-32: debug_value %0 : $@convention(c, cType: "void (*)(unsigned int)") @noescape (Int) -> (), let, name "g", argno 1 // id: %1
9+
// CHECK-32: sil @$s4main1f1gyySiXzC9_ZTSPFvjE_tF : $@convention(thin) (@convention(c, cType: "void (*)(unsigned int)") (Int) -> ()) -> () {
10+
// CHECK-32: bb0(%0 : $@convention(c, cType: "void (*)(unsigned int)") (Int) -> ()):
11+
// CHECK-32: debug_value %0 : $@convention(c, cType: "void (*)(unsigned int)") (Int) -> (), let, name "g", argno 1 // id: %1
1212

13-
// CHECK-64: sil @$s4main1f1gyySiXzC9_ZTSPFvmE_tF : $@convention(thin) (@convention(c, cType: "void (*)(unsigned long)") @noescape (Int) -> ()) -> () {
14-
// CHECK-64: bb0(%0 : $@convention(c, cType: "void (*)(unsigned long)") @noescape (Int) -> ()):
15-
// CHECK-64: debug_value %0 : $@convention(c, cType: "void (*)(unsigned long)") @noescape (Int) -> (), let, name "g", argno 1 // id: %1
13+
// CHECK-64: sil @$s4main1f1gyySiXzC9_ZTSPFvmE_tF : $@convention(thin) (@convention(c, cType: "void (*)(unsigned long)") (Int) -> ()) -> () {
14+
// CHECK-64: bb0(%0 : $@convention(c, cType: "void (*)(unsigned long)") (Int) -> ()):
15+
// CHECK-64: debug_value %0 : $@convention(c, cType: "void (*)(unsigned long)") (Int) -> (), let, name "g", argno 1 // id: %1

‎test/SILOptimizer/concat_string_literals.64.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
// We have a separate test for 32-bit architectures.
66
// REQUIRES: PTRSIZE=64
77

8+
// The string tag was recently shifted to the second byte on Android AArch64,
9+
// so these tests will need to be adapted for that.
10+
// XFAIL: OS=linux-android && CPU=aarch64
11+
812
// NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
913
// CHECK-LABEL: test_ascii_scalar_scalar2
1014
// CHECK: ret { i64, %swift.bridge* } { i64 25185, %swift.bridge* inttoptr (i64 -{{[0-9]+}} to %swift.bridge*) }

‎test/Sanitizers/tsan/objc_async.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// REQUIRES: concurrency
88
// REQUIRES: objc_interop
99
// REQUIRES: tsan_runtime
10-
// UNSUPPORTED: OS=linux-gnu
11-
// UNSUPPORTED: OS=windows-msvc
1210

1311
// rdar://76038845
1412
// UNSUPPORTED: use_os_stdlib

‎test/lit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1974,7 +1974,7 @@ def source_compiler_rt_libs(path):
19741974
and config.compiler_rt_platform in lib])
19751975

19761976
compiler_rt_dir = make_path(test_resource_dir, 'clang', 'lib',
1977-
platform.system().lower() if not kIsAndroid else 'android')
1977+
platform.system().lower())
19781978
source_compiler_rt_libs(compiler_rt_dir)
19791979

19801980
def check_runtime_libs(features_to_check):

‎test/stdlib/simd_diagnostics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-typecheck-verify-swift
22

33
// FIXME: No simd module on linux rdar://problem/20795411
4-
// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd
4+
// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd, OS=linux-android, OS=linux-androideabi
55
// XFAIL: OS=wasi
66

77
import simd

‎validation-test/SILOptimizer/large_string_array.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
// REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
1515
// REQUIRES: long_test
16-
// REQUIRES: CPU=arm64 || CPU=x86_64
16+
// REQUIRES: CPU=arm64 || CPU=x86_64 || CPU=aarch64
1717

1818
// Check if the optimizer can optimize the whole array into a statically
1919
// initialized global

‎validation-test/stdlib/SIMDParameterPassing.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
// REQUIRES: executable_test
2020
// REQUIRES: long_test
21-
// XFAIL: OS=linux-gnu
21+
// XFAIL: OS=linux-gnu, OS=linux-android
2222

2323
import StdlibUnittest
2424
import simd

0 commit comments

Comments
 (0)