Skip to content

Commit 49f8507

Browse files
committed
ParseableInterface: improve test coverage on Windows
This slightly improves the passing set of tests on Windows.
1 parent d072ceb commit 49f8507

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

test/ParseableInterface/ModuleCache/module-cache-leaf-hash-change-rebuilds-all.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
//
1919
// Setup phase 2: build modules, pushing timestamps of inputs and intermediates into the past as we go.
2020
//
21-
// RUN: %S/Inputs/make-old.py %t/leaf.swift %t/other.swift
21+
// RUN: %{python} %S/Inputs/make-old.py %t/leaf.swift %t/other.swift
2222
// RUN: %target-swift-frontend -I %t -emit-parseable-module-interface-path %t/LeafModule.swiftinterface -module-name LeafModule %t/leaf.swift -emit-module -o /dev/null
23-
// RUN: %S/Inputs/make-old.py %t/LeafModule.swiftinterface
23+
// RUN: %{python} %S/Inputs/make-old.py %t/LeafModule.swiftinterface
2424
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -emit-module -o /dev/null
25-
// RUN: %S/Inputs/make-old.py %t/modulecache/LeafModule-*.swiftmodule %t/OtherModule.swiftinterface
25+
// RUN: %{python} %S/Inputs/make-old.py %t/modulecache/LeafModule-*.swiftmodule %t/OtherModule.swiftinterface
2626
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s
27-
// RUN: %S/Inputs/make-old.py %t/modulecache/OtherModule-*.swiftmodule
27+
// RUN: %{python} %S/Inputs/make-old.py %t/modulecache/OtherModule-*.swiftmodule
2828
//
2929
//
3030
// Actual test: Change a byte in LeafModule.swiftinterface, check both cached modules get rebuilt.
3131
//
3232
// RUN: %{python} %S/Inputs/check-is-old.py %t/OtherModule.swiftinterface %t/LeafModule.swiftinterface
3333
// RUN: %{python} %S/Inputs/check-is-old.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule
3434
// RUN: sed -e 's/LeafFunc2/LoafFunc2/' -i.prev %t/LeafModule.swiftinterface
35-
// RUN: %S/Inputs/make-old.py %t/LeafModule.swiftinterface
35+
// RUN: %{python} %S/Inputs/make-old.py %t/LeafModule.swiftinterface
3636
// RUN: rm %t/TestModule.swiftmodule
3737
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s
3838
// RUN: %{python} %S/Inputs/check-is-new.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule

test/ParseableInterface/linking-to-module.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ import TestModule
77

88
_ = TestStruct()
99

10-
// CHECK: -lcoreTestModuleKitUtilsTool
10+
// CHECK: {{-lcoreTestModuleKitUtilsTool|/DEFAULTLIB:coreTestModuleKitUtilsTool.lib}}

test/ParseableInterface/synthesized.swift

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ public enum HasRawValue: Int {
1111
// CHECK-DAG: }
1212
} // CHECK: {{^}$}}
1313

14-
// CHECK-LABEL: @objc public enum ObjCEnum : Int {
15-
@objc public enum ObjCEnum: Int {
16-
// CHECK-NEXT: case a, b, c
14+
@objc public enum ObjCEnum: Int32 {
1715
case a, b = 5, c
18-
// CHECK-DAG: public typealias RawValue = Swift.Int
19-
// CHECK-DAG: @inlinable public init?(rawValue: Swift.Int)
20-
// CHECK-DAG: public var rawValue: Swift.Int {
21-
// CHECK-DAG: @inlinable get{{$}}
22-
// CHECK-DAG: }
23-
} // CHECK: {{^}$}}
16+
}
17+
18+
// CHECK-LABEL: @objc public enum ObjCEnum : Int32 {
19+
// CHECK-NEXT: case a, b, c
20+
// CHECK-DAG: public typealias RawValue = Swift.Int32
21+
// CHECK-DAG: @inlinable public init?(rawValue: Swift.Int32)
22+
// CHECK-DAG: public var rawValue: Swift.Int32 {
23+
// CHECK-DAG: @inlinable get{{$}}
24+
// CHECK-DAG: }
25+
// CHECK: {{^}$}}

0 commit comments

Comments
 (0)