Skip to content

[5.5][NFC] Fix executable tests by passing in the SDK path explicitly. #736

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 1 commit into from
Jun 29, 2021
Merged

[5.5][NFC] Fix executable tests by passing in the SDK path explicitly. #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
$0 <<< "import G;"
}

let sdkArgumentsForTesting = try Driver.sdkArgumentsForTesting() ?? []
let packageRootPath = URL(fileURLWithPath: #file).pathComponents
.prefix(while: { $0 != "Tests" }).joined(separator: "/").dropFirst()
let testInputsPath = packageRootPath + "/TestInputs"
Expand All @@ -567,7 +568,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
"-I", swiftModuleInterfacesPath,
"-experimental-explicit-module-build",
"-working-directory", path.pathString,
main.pathString],
main.pathString] + sdkArgumentsForTesting,
env: ProcessEnv.vars)
let jobs = try driver.planBuild()
try driver.run(jobs: jobs)
Expand Down
9 changes: 6 additions & 3 deletions Tests/SwiftDriverTests/JobExecutorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,9 +474,10 @@ final class JobExecutorTests: XCTestCase {
fileSystem: localFileSystem,
env: ProcessEnv.vars)
let outputPath = path.appending(component: "finalOutput")
let sdkArgumentsForTesting = try Driver.sdkArgumentsForTesting() ?? []
var driver = try Driver(args: ["swiftc", main.pathString,
"-driver-filelist-threshold", "0",
"-o", outputPath.pathString],
"-o", outputPath.pathString] + sdkArgumentsForTesting,
env: ProcessEnv.vars,
diagnosticsEngine: diags,
fileSystem: localFileSystem,
Expand Down Expand Up @@ -511,10 +512,11 @@ final class JobExecutorTests: XCTestCase {
fileSystem: localFileSystem,
env: ProcessEnv.vars)
let outputPath = path.appending(component: "finalOutput")
let sdkArgumentsForTesting = try Driver.sdkArgumentsForTesting() ?? []
var driver = try Driver(args: ["swiftc", main.pathString,
"-save-temps",
"-driver-filelist-threshold", "0",
"-o", outputPath.pathString],
"-o", outputPath.pathString] + sdkArgumentsForTesting,
env: ProcessEnv.vars,
diagnosticsEngine: diags,
fileSystem: localFileSystem,
Expand Down Expand Up @@ -549,10 +551,11 @@ final class JobExecutorTests: XCTestCase {
fileSystem: localFileSystem,
env: ProcessEnv.vars)
let outputPath = path.appending(component: "finalOutput")
let sdkArgumentsForTesting = try Driver.sdkArgumentsForTesting() ?? []
var driver = try Driver(args: ["swiftc", main.pathString,
"-driver-filelist-threshold", "0",
"-Xfrontend", "-debug-crash-immediately",
"-o", outputPath.pathString],
"-o", outputPath.pathString] + sdkArgumentsForTesting,
env: ProcessEnv.vars,
diagnosticsEngine: diags,
fileSystem: localFileSystem,
Expand Down
3 changes: 2 additions & 1 deletion Tests/SwiftDriverTests/ParsableMessageTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,10 @@ final class ParsableMessageTests: XCTestCase {
$0 <<< "print(\"hello, world!\")"
}
let diags = DiagnosticsEngine()
let sdkArgumentsForTesting = try Driver.sdkArgumentsForTesting() ?? []
var driver = try Driver(args: ["swiftc", main.pathString,
"-use-frontend-parseable-output",
"-o", output.pathString],
"-o", output.pathString] + sdkArgumentsForTesting,
env: ProcessEnv.vars,
diagnosticsEngine: diags,
fileSystem: localFileSystem)
Expand Down