Consolidate BuildConfiguration.buildArgs into one spot

Author: plemarquand

Sources/_InternalTestSupport/misc.swift

@@ -322,7 +322,7 @@ fileprivate func setup(
         #else
         try Process.checkNonZeroExit(args: "cp", "-R", "-H", srcDir.pathString, dstDir.pathString)
         #endif
-        
+
         // Ensure we get a clean test fixture.
         try localFileSystem.removeFileTree(dstDir.appending(component: ".build"))
         try localFileSystem.removeFileTree(dstDir.appending(component: ".swiftpm"))
@@ -533,14 +533,7 @@ private func swiftArgs(
     Xswiftc: [String],
     buildSystem: BuildSystemProvider.Kind?
 ) -> [String] {
-    var args = ["--configuration"]
-    switch configuration {
-    case .debug:
-        args.append("debug")
-    case .release:
-        args.append("release")
-    }
-
+    var args = configuration.buildArgs
     args += Xcc.flatMap { ["-Xcc", $0] }
     args += Xld.flatMap { ["-Xlinker", $0] }
     args += Xswiftc.flatMap { ["-Xswiftc", $0] }
@@ -549,7 +542,7 @@ private func swiftArgs(
     return args
 }
 
-@available(*, 
+@available(*,
     deprecated,
     renamed: "loadModulesGraph",
     message: "Rename for consistency: the type of this functions return value is named `ModulesGraph`."
@@ -582,6 +575,19 @@ public func loadPackageGraph(
     )
 }
 
+extension BuildConfiguration {
+    public var buildArgs: [String] {
+        var args = ["--configuration"]
+        switch self {
+        case .debug:
+            args.append("debug")
+        case .release:
+            args.append("release")
+        }
+        return args
+    }
+}
+
 public let emptyZipFile = ByteString([0x80, 0x75, 0x05, 0x06] + [UInt8](repeating: 0x00, count: 18))
 
 extension FileSystem {
@@ -693,7 +699,7 @@ public func getNumberOfMatches(of match: String, in value: String) -> Int {
 }
 
 public extension String {
-    var withSwiftLineEnding: String {   
+    var withSwiftLineEnding: String {
         return replacingOccurrences(of: "\r\n", with: "\n")
     }
 }

Tests/CommandsTests/TestCommandTests.swift

@@ -1436,7 +1436,7 @@ struct TestCommandTests {
         }
 
         func args(_ args: [String], for buildSystem: BuildSystemProvider.Kind, buildConfiguration: BuildConfiguration = .debug) -> [String] {
-            return args + buildConfiguration.args + getBuildSystemArgs(for: buildSystem)
+            return args + buildConfiguration.buildArgs + getBuildSystemArgs(for: buildSystem)
         }
 
         func commandState() throws -> (SwiftCommandState, BufferedOutputByteStream) {
@@ -1467,16 +1467,3 @@ struct TestCommandTests {
     }
 }
 
-fileprivate extension BuildConfiguration {
-    var args: [String] {
-        var args = ["--configuration"]
-        switch self {
-        case .debug:
-            args.append("debug")
-        case .release:
-            args.append("release")
-        }
-        return args
-    }
-}
-