Skip to content

Commit 51081f6

Browse files
committed
[test] Fix or disable tests for 32-bit platforms
Fix two IRGen tests that are failing on Android armv7 and disable eight ClangImporter, C++ Interop, and SILOptimizer tests, two of which that were already failing on other 32-bit platforms.
1 parent a9f696b commit 51081f6

10 files changed

+11
-4
lines changed

test/ClangImporter/pcm-emit-direct-cc1-mode.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,7 @@
1515
// CHECK-CLANG-SAME: '-fmodules'
1616
// CHECK-CLANG-NOT: clang importer driver args
1717

18+
// XFAIL: OS=linux-androideabi
19+
1820
import script
1921
var _ : ScriptTy

test/IRGen/abitypes_arm.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ class Foo {
1111
}
1212
}
1313

14-
// armv7: define internal void @makeOne(ptr noalias sret({{.*}}) align 4 %agg.result, float{{( noundef)?}} %f, float{{( noundef)?}} %s)
14+
// armv7: define internal void @makeOne(ptr{{( dead_on_unwind)?}} noalias{{( writable)?}} sret({{.*}}) align 4 %agg.result, float{{( noundef)?}} %f, float{{( noundef)?}} %s)
1515
// armv7s: define internal void @makeOne(ptr noalias sret({{.*}}) align 4 %agg.result, float %f, float %s)
1616
// armv7k: define internal %struct.One @makeOne(float {{.*}}%f, float {{.*}}%s)

test/Interop/Cxx/class/constructors-copy-module-interface.swift

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

34
// CHECK: struct TemplatedCopyConstructor
45
// CHECK: struct TemplatedCopyConstructorWithExtraArg

test/Interop/Cxx/class/constructors-diagnostics.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
// This test uses -verify-additional-file, which do not work well on Windows.
44
// UNSUPPORTED: OS=windows-msvc
5+
// XFAIL: OS=linux-androideabi
56

67
import Constructors
78

test/Interop/Cxx/class/constructors-module-interface.swift

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

34
// CHECK: struct ExplicitDefaultConstructor {
45
// CHECK-NEXT: init()

test/Interop/Cxx/class/constructors-silgen.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// RUN: %target-swiftxx-frontend -I %S/Inputs -Xllvm -sil-print-types -emit-silgen %s | %FileCheck %s
2+
// XFAIL: OS=linux-androideabi
23

34
import Constructors
45

test/Interop/Cxx/class/constructors-typechecker.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop
2+
// XFAIL: OS=linux-androideabi
23

34
import Constructors
45

test/Interop/Cxx/class/custom-new-operator-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ import CustomNewOperator
55
var x = callsCustomNew()
66

77
// Make sure the definition of `operator new` is emitted.
8-
// CHECK: define {{.*}} @{{_ZnwmPv15container_new_t|"\?\?2@YAPEAX_KPEAXUcontainer_new_t@@@Z"}}
8+
// CHECK: define {{.*}} @{{_Znw(j|m)Pv15container_new_t|"\?\?2@YAPEAX_KPEAXUcontainer_new_t@@@Z"}}

test/SILOptimizer/package-cmo-serialize-tables.swift

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

2020
// Temporarily disabling on watchOS (both arm64_32 & armv7k):
2121
// rdar://140330692 (🟠 OSS Swift CI: oss-swift_tools-RA_stdlib-DA_test-device-non_executable failed...
22-
// UNSUPPORTED: OS=watchos
22+
// UNSUPPORTED: OS=watchos, OS=linux-androideabi
2323

2424
//--- main.swift
2525

test/SILOptimizer/throws_prediction.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// RUN: -sil-verify-all -module-name=test -emit-sil \
1717
// RUN: | %FileCheck --check-prefix CHECK-DISABLED %s
1818

19-
// UNSUPPORTED: CPU=armv7k || CPU=arm64_32
19+
// UNSUPPORTED: CPU=armv7k, CPU=arm64_32, CPU=armv7
2020

2121
// CHECK-DISABLED-NOT: normal_count
2222

0 commit comments

Comments
 (0)