Skip to content

Commit 3c51106

Browse files
Fix tests on Windows CI with vs2022
1 parent 7092e50 commit 3c51106

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

test/Driver/Dependencies/one-way-merge-module-fine.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
// CHECK-FIRST-DAG: Produced master.swiftmodule
1313

1414
// swift-driver checks existence of all outputs
15-
// RUN: touch -t 201401240006 %t/{main,other,master}.swift{module,doc,sourceinfo}
15+
// RUN: touch -t 201401240006 %t/*.swiftmodule
16+
// RUN: touch -t 201401240006 %t/*.swiftdoc
17+
// RUN: touch -t 201401240006 %t/*.swiftsourceinfo
1618

1719
// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
1820

test/ModuleInterface/ModuleCache/prefer-local-module-to-sdk-framework.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
// RUN: %empty-directory(%t/BuildDir/Lib.framework/Modules/Lib.swiftmodule)
2-
// RUN: %empty-directory(%t/SecondBuildDir/Lib.framework/Modules/Lib.swiftmodule)
1+
// RUN: %empty-directory(%t/Build1/Lib.framework/Modules/Lib.swiftmodule)
2+
// RUN: %empty-directory(%t/Build2/Lib.framework/Modules/Lib.swiftmodule)
33
// RUN: %empty-directory(%t/ModuleCache)
44

55
// RUN: echo 'public func showsUpInBothPlaces() {}' > %t/Lib.swift
66

77
// 1. Create a .swiftinterface file containing just one API, and put it inside a second build dir (without a .swiftmodule)
8-
// RUN: %target-swift-frontend -typecheck %t/Lib.swift -emit-module-interface-path %t/SecondBuildDir/Lib.framework/Modules/Lib.swiftmodule/%target-swiftinterface-name -module-name Lib
8+
// RUN: %target-swift-frontend -typecheck %t/Lib.swift -emit-module-interface-path %t/Build2/Lib.framework/Modules/Lib.swiftmodule/%target-swiftinterface-name -module-name Lib
99

1010
// 2. Add a new API to the module, and compile just the serialized version in the build dir.
1111
// RUN: echo 'public func onlyInTheCompiledModule() {}' >> %t/Lib.swift
12-
// RUN: %target-swift-frontend -emit-module %t/Lib.swift -o %t/BuildDir/Lib.framework/Modules/Lib.swiftmodule/%target-swiftmodule-name -emit-module-interface-path %t/BuildDir/Lib.framework/Modules/Lib.swiftmodule/%target-swiftinterface-name -module-name Lib
12+
// RUN: %target-swift-frontend -emit-module %t/Lib.swift -o %t/Build1/Lib.framework/Modules/Lib.swiftmodule/%target-swiftmodule-name -emit-module-interface-path %t/Build1/Lib.framework/Modules/Lib.swiftmodule/%target-swiftinterface-name -module-name Lib
1313

1414
// 3. Make sure when we compile this test file, we can access both APIs since we'll
1515
// load the compiled .swiftmodule instead of the .swiftinterface in the SDK.
16-
// RUN: %target-swift-frontend -typecheck %s -F %t/BuildDir -F %t/SecondBuildDir -module-cache-path %t/ModuleCache
16+
// RUN: %target-swift-frontend -typecheck %s -F %t/Build1 -F %t/Build2 -module-cache-path %t/ModuleCache
1717

1818
// 4. Make sure we didn't compile any .swiftinterfaces into the module cache.
1919
// RUN: ls %t/ModuleCache | not grep 'swiftmodule'
2020

2121
// 5. This should also work if the swiftinterface isn't present in the first build dir.
22-
// RUN: rm %t/BuildDir/Lib.framework/Modules/Lib.swiftmodule/%target-swiftinterface-name
23-
// RUN: %target-swift-frontend -typecheck %s -F %t/BuildDir -F %t/SecondBuildDir -module-cache-path %t/ModuleCache
22+
// RUN: rm %t/Build1/Lib.framework/Modules/Lib.swiftmodule/%target-swiftinterface-name
23+
// RUN: %target-swift-frontend -typecheck %s -F %t/Build1 -F %t/Build2 -module-cache-path %t/ModuleCache
2424

2525
// 6. Make sure we /still/ didn't compile any .swiftinterfaces into the module cache.
2626
// RUN: ls %t/ModuleCache | not grep 'swiftmodule'

0 commit comments

Comments
 (0)