Merge pull request #1212 from apple/chicken-scratch

CodaFi · web-flow · commit 032ccefaff29 · 2022-11-01T22:29:45.000-07:00
s/build-path/scratch-path
diff --git a/Tests/SwiftDriverTests/IntegrationTests.swift b/Tests/SwiftDriverTests/IntegrationTests.swift
@@ -84,7 +84,7 @@ final class IntegrationTests: IntegrationTestCase {
       let buildPath = path.appending(component: "build")
       let args = [
         "swift", "build", "--package-path", packageDirectory.pathString,
-        "--build-path", buildPath.pathString
+        "--scratch-path", buildPath.pathString
       ]
       let extraEnv = [ "SWIFT_EXEC": compiler.pathString]
 
diff --git a/Utilities/build-script-helper.py b/Utilities/build-script-helper.py
@@ -72,7 +72,7 @@ def swiftpm_bin_path(swift_exec, swiftpm_args, env=None):
 def get_swiftpm_options(args):
   swiftpm_args = [
     '--package-path', args.package_path,
-    '--build-path', args.build_path,
+    '--scratch-path', args.build_path,
     '--configuration', args.configuration,
   ]
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ final class IntegrationTests: IntegrationTestCase {`
`84`	`84`	`let buildPath = path.appending(component: "build")`
`85`	`85`	`let args = [`
`86`	`86`	`"swift", "build", "--package-path", packageDirectory.pathString,`
`87`		`- "--build-path", buildPath.pathString`
	`87`	`+ "--scratch-path", buildPath.pathString`
`88`	`88`	`]`
`89`	`89`	`let extraEnv = [ "SWIFT_EXEC": compiler.pathString]`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ def swiftpm_bin_path(swift_exec, swiftpm_args, env=None):`
`72`	`72`	`def get_swiftpm_options(args):`
`73`	`73`	`swiftpm_args = [`
`74`	`74`	`'--package-path', args.package_path,`
`75`		`- '--build-path', args.build_path,`
	`75`	`+ '--scratch-path', args.build_path,`
`76`	`76`	`'--configuration', args.configuration,`
`77`	`77`	`]`
`78`	`78`