Skip to content

Fix tests on Windows CI with VS2022 #66510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 14, 2023
Merged

Fix tests on Windows CI with VS2022 #66510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c51106
Fix tests on Windows CI with vs2022
tristanlabelle Jun 9, 2023
6308cd0
Migrate test to touch.py
tristanlabelle Jun 12, 2023
0d5aa7f
Fix non-glob paths in touch.py
tristanlabelle Jun 12, 2023
11f34b7
Fix linting error
tristanlabelle Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions test/Driver/Dependencies/Inputs/touch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#
# ----------------------------------------------------------------------------

import glob
import os
import sys

Expand All @@ -23,6 +24,14 @@

# Update the output file mtime, or create it if necessary.
# From http://stackoverflow.com/a/1160227.
for outputFile in sys.argv[2:]:
with open(outputFile, 'a'):
os.utime(outputFile, (timeVal, timeVal))
for filePathPattern in sys.argv[2:]:
# Support glob patterns if the shell did not expand them (like cmd.exe)
if glob.escape(filePathPattern) == filePathPattern:
# Not a glob pattern. We should touch that specific file.
filePaths = [filePathPattern]
else:
filePaths = glob.glob(filePathPattern)

for filePath in filePaths:
with open(filePath, 'a'):
os.utime(filePath, (timeVal, timeVal))
6 changes: 4 additions & 2 deletions test/Driver/Dependencies/one-way-merge-module-fine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/one-way-fine/* %t
// RUN: touch -t 201401240005 %t/*
// RUN: %{python} %S/Inputs/touch.py 201401240005 %t/*

// 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-FIRST %s

Expand All @@ -12,7 +12,9 @@
// CHECK-FIRST-DAG: Produced master.swiftmodule

// swift-driver checks existence of all outputs
// RUN: touch -t 201401240006 %t/{main,other,master}.swift{module,doc,sourceinfo}
// RUN: %{python} %S/Inputs/touch.py 201401240006 %t/*.swiftmodule
// RUN: %{python} %S/Inputs/touch.py 201401240006 %t/*.swiftdoc
// RUN: %{python} %S/Inputs/touch.py 201401240006 %t/*.swiftsourceinfo

// 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

Expand Down
14 changes: 7 additions & 7 deletions test/ModuleInterface/ModuleCache/prefer-local-module-to-sdk-framework.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
// RUN: %empty-directory(%t/BuildDir/Lib.framework/Modules/Lib.swiftmodule)
// RUN: %empty-directory(%t/SecondBuildDir/Lib.framework/Modules/Lib.swiftmodule)
// RUN: %empty-directory(%t/Build1/Lib.framework/Modules/Lib.swiftmodule)
// RUN: %empty-directory(%t/Build2/Lib.framework/Modules/Lib.swiftmodule)
// RUN: %empty-directory(%t/ModuleCache)

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

// 1. Create a .swiftinterface file containing just one API, and put it inside a second build dir (without a .swiftmodule)
// 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
// 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

// 2. Add a new API to the module, and compile just the serialized version in the build dir.
// RUN: echo 'public func onlyInTheCompiledModule() {}' >> %t/Lib.swift
// 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
// 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

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

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

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

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