Skip to content

Commit e844771

Browse files
committed
Remove explicit target(s) from reflect_empty_struct tests
Swift CI tests backward deployment on different host OSes, so this should be covered in testing. The explicit target doesn't work well with `executable_test` since it leads to binaries with too-new minimum deployment targets getting executed on older host OSes.
1 parent 4abb548 commit e844771

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

validation-test/Reflection/reflect_empty_struct.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-build-swift -lswiftSwiftReflectionTest -I %S/Inputs/EmptyStruct/ %s -o %t/reflect_empty_struct -target x86_64-apple-macosx10.99.0
2+
// RUN: %target-build-swift -lswiftSwiftReflectionTest -I %S/Inputs/EmptyStruct/ %s -o %t/reflect_empty_struct
33
// RUN: %target-codesign %t/reflect_empty_struct
44

55
// RUN: %target-run %target-swift-reflection-test %t/reflect_empty_struct | %FileCheck %s --check-prefix=CHECK-%target-ptrsize --dump-input fail
@@ -32,13 +32,13 @@ reflect(object: obj)
3232
// CHECK-64: Type info:
3333
// CHECK-64: (class_instance size=80 alignment=8 stride=80 num_extra_inhabitants=0 bitwise_takable=1
3434
// CHECK-64: (field name=a offset=16
35-
// CHECK-64: (builtin size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))
35+
// CHECK-64: ({{builtin|struct}} size=0 alignment={{1|4}} stride=1 num_extra_inhabitants=0 bitwise_takable=1))
3636
// CHECK-64: (field name=b offset=16
3737
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=2147483647 bitwise_takable=1
3838
// CHECK-64: (field name=metadata offset=24
3939
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1))))
4040
// CHECK-64: (field name=c offset=48
41-
// CHECK-64: (builtin size=0 alignment=4 stride=1 num_extra_inhabitants=0 bitwise_takable=1))
41+
// CHECK-64: ({{builtin|struct}} size=0 alignment={{1|4}} stride=1 num_extra_inhabitants=0 bitwise_takable=1))
4242
// CHECK-64: (field name=d offset=48
4343
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=2147483647 bitwise_takable=1
4444
// CHECK-64: (field name=metadata offset=24
@@ -52,13 +52,13 @@ reflect(object: obj)
5252
// CHECK-32: Type info:
5353
// CHECK-32: (class_instance size=40 alignment=4 stride=40 num_extra_inhabitants=0 bitwise_takable=1
5454
// CHECK-32: (field name=a offset=8
55-
// CHECK-32: (builtin size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))
55+
// CHECK-32: ({{builtin|struct}} size=0 alignment={{1|4}} stride=1 num_extra_inhabitants=0 bitwise_takable=1))
5656
// CHECK-32: (field name=b offset=8
5757
// CHECK-32: (opaque_existential size=16 alignment=4 stride=16 num_extra_inhabitants=4096 bitwise_takable=1
5858
// CHECK-32: (field name=metadata offset=12
5959
// CHECK-32: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=4096 bitwise_takable=1))))
6060
// CHECK-32: (field name=c offset=24
61-
// CHECK-32: (builtin size=0 alignment=4 stride=1 num_extra_inhabitants=0 bitwise_takable=1))
61+
// CHECK-32: ({{builtin|struct}} size=0 alignment={{1|4}} stride=1 num_extra_inhabitants=0 bitwise_takable=1))
6262
// CHECK-32: (field name=d offset=24
6363
// CHECK-32: (opaque_existential size=16 alignment=4 stride=16 num_extra_inhabitants=4096 bitwise_takable=1
6464
// CHECK-32: (field name=metadata offset=12

validation-test/Reflection/reflect_empty_struct_compat.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: %target-build-swift -lswiftSwiftReflectionTest -I %S/Inputs/EmptyStruct/ %s -o %t/reflect_empty_struct -target x86_64-apple-macosx10.15.0
4-
// RUN: %target-codesign %t/reflect_empty_struct
5-
// RUN: %target-run %target-swift-reflection-test %t/reflect_empty_struct | %FileCheck %s --check-prefix=CHECK-%target-ptrsize --dump-input fail
6-
7-
// RUN: %target-build-swift -lswiftSwiftReflectionTest -I %S/Inputs/EmptyStruct/ %s -o %t/reflect_empty_struct -target x86_64-apple-macosx10.14.0
3+
// RUN: %target-build-swift -lswiftSwiftReflectionTest -I %S/Inputs/EmptyStruct/ %s -o %t/reflect_empty_struct
84
// RUN: %target-codesign %t/reflect_empty_struct
95
// RUN: %target-run %target-swift-reflection-test %t/reflect_empty_struct | %FileCheck %s --check-prefix=CHECK-%target-ptrsize --dump-input fail
106

0 commit comments

Comments
 (0)