Test: Merge IntegrationTests into Tests

Consolidate all the tests into a single folders.  This change only moves
the IntegrationTests/Sources and IntegrationTests/Tests to their
respective directory and update tests to make use of the existing
executeSwift* functions.

A subsequent change will find better homes for the tests under
Tests/IntegrationTests.

Author: bkhouri

IntegrationTests/Fixtures/BinaryTargets/Inputs/DynamicLibrary/DynamicLibrary.m renamed to Fixtures/BinaryTargets/Inputs/DynamicLibrary/DynamicLibrary.m

@@ -775,7 +775,6 @@ let package = Package(
                 .unsafeFlags(["-static"]),
             ]
         ),
-
         .target(
             /** Test for thread-sanitizer. */
             name: "tsan_utils",
@@ -827,6 +826,13 @@ let package = Package(
             name: "LLBuildManifestTests",
             dependencies: ["Basics", "LLBuildManifest", "_InternalTestSupport"]
         ),
+        .testTarget(
+            name: "IntegrationTests",
+            dependencies: [
+                "_InternalTestSupport",
+                "SPMBuildCore",
+            ]
+        ),
         .testTarget(
             name: "WorkspaceTests",
             dependencies: ["Workspace", "_InternalTestSupport"]
@@ -983,6 +989,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
                 "dummy-swiftc",
             ]
         ),
+
     ])
 }
 #endif

IntegrationTests/Fixtures/BinaryTargets/Inputs/DynamicLibrary/include/DynamicLibrary.h renamed to Fixtures/BinaryTargets/Inputs/DynamicLibrary/include/DynamicLibrary.h

@@ -10,11 +10,12 @@
 
 import Foundation
 import Testing
-import TSCBasic
-import TSCTestSupport
+import Basics
+import struct TSCBasic.ProcessResult
+import class TSCBasic.Process
 import enum TSCUtility.Git
 
-public let sdkRoot: AbsolutePath? = {
+fileprivate let sdkRoot: AbsolutePath? = {
     if let environmentPath = ProcessInfo.processInfo.environment["SDK_ROOT"] {
         return try! AbsolutePath(validating: environmentPath)
     }
@@ -28,7 +29,7 @@ public let sdkRoot: AbsolutePath? = {
     #endif
 }()
 
-public let toolchainPath: AbsolutePath = {
+fileprivate let toolchainPath: AbsolutePath = {
     if let environmentPath = ProcessInfo.processInfo.environment["TOOLCHAIN_PATH"] {
         return try! AbsolutePath(validating: environmentPath)
     }
@@ -55,7 +56,7 @@ public let clang: AbsolutePath = {
     return clangPath
 }()
 
-public let xcodebuild: AbsolutePath = {
+fileprivate let xcodebuild: AbsolutePath = {
     #if os(macOS)
     let xcodebuildPath = try! AbsolutePath(
         validating: sh("xcrun", "--find", "xcodebuild").stdout.spm_chomp()
@@ -84,42 +85,46 @@ public let swiftc: AbsolutePath = {
     return swiftcPath
 }()
 
-public let lldb: AbsolutePath = {
-    if let environmentPath = ProcessInfo.processInfo.environment["LLDB_PATH"] {
-        return try! AbsolutePath(validating: environmentPath)
-    }
+// public let lldb: AbsolutePath = {
+//     if let environmentPath = ProcessInfo.processInfo.environment["LLDB_PATH"] {
+//         return try! AbsolutePath(validating: environmentPath)
+//     }
 
-    // We check if it exists because lldb doesn't exist in Xcode's default toolchain.
-    let toolchainLLDBPath = toolchainPath.appending(components: "usr", "bin", "lldb")
-    if localFileSystem.exists(toolchainLLDBPath) {
-        return toolchainLLDBPath
-    }
+//     // We check if it exists because lldb doesn't exist in Xcode's default toolchain.
+//     let toolchainLLDBPath = toolchainPath.appending(components: "usr", "bin", "lldb")
+//     if localFileSystem.exists(toolchainLLDBPath) {
+//         return toolchainLLDBPath
+//     }
 
-    #if os(macOS)
-    let lldbPath = try! AbsolutePath(
-        validating: sh("xcrun", "--find", "lldb").stdout.spm_chomp()
-    )
-    return lldbPath
-    #else
-    fatalError("LLDB_PATH environment variable required")
-    #endif
-}()
+//     #if os(macOS)
+//     let lldbPath = try! AbsolutePath(
+//         validating: sh("xcrun", "--find", "lldb").stdout.spm_chomp()
+//     )
+//     return lldbPath
+//     #else
+//     fatalError("LLDB_PATH environment variable required")
+//     #endif
+// }()
 
-public let swiftpmBinaryDirectory: AbsolutePath = {
-    if let environmentPath = ProcessInfo.processInfo.environment["SWIFTPM_BIN_DIR"] {
-        return try! AbsolutePath(validating: environmentPath)
-    }
 
-    return swift.parentDirectory
-}()
 
-public let swiftBuild: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-build")
+// public let swiftpmBinaryDirectory: AbsolutePath = {
+//     let envVarName = "SWIFTPM_BIN_DIR"
+//     if let environmentPath = ProcessInfo.processInfo.environment[envVarName] {
+//         return try! AbsolutePath(validating: environmentPath)
+//     }
+
+//     // throw TestConfigurationErrors.EnvironmentVariableNotSet(name: envVarName)
+//     return AbsolutePath("\(envVarName) was not set")
+// }()
 
-public let swiftPackage: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-package")
+// public let swiftBuild: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-build")
 
-public let swiftTest: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-test")
+// public let swiftPackage: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-package")
 
-public let swiftRun: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-run")
+// public let swiftTest: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-test")
+
+// public let swiftRun: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-run")
 
 public let isSelfHosted: Bool = {
     ProcessInfo.processInfo.environment["SWIFTCI_IS_SELF_HOSTED"] != nil
@@ -192,127 +197,8 @@ public func _sh(
     return result
 }
 
-/// Test-helper function that runs a block of code on a copy of a test fixture
-/// package.  The copy is made into a temporary directory, and the block is
-/// given a path to that directory.  The block is permitted to modify the copy.
-/// The temporary copy is deleted after the block returns.  The fixture name may
-/// contain `/` characters, which are treated as path separators, exactly as if
-/// the name were a relative path.
-public func fixture(
-    name: String,
-    file: StaticString = #file,
-    line: UInt = #line,
-    body: (AbsolutePath) throws -> Void
-) {
-    do {
-        // Make a suitable test directory name from the fixture subpath.
-        let fixtureSubpath = try RelativePath(validating: name)
-        let copyName = fixtureSubpath.components.joined(separator: "_")
-
-        // Create a temporary directory for the duration of the block.
-        try withTemporaryDirectory(prefix: copyName) { tmpDirPath in
-
-            defer {
-                // Unblock and remove the tmp dir on deinit.
-                try? localFileSystem.chmod(.userWritable, path: tmpDirPath, options: [.recursive])
-                try? localFileSystem.removeFileTree(tmpDirPath)
-            }
-
-            // Construct the expected path of the fixture.
-            // FIXME: This seems quite hacky; we should provide some control over where fixtures are found.
-            let fixtureDir = try AbsolutePath(
-                validating: "../../../Fixtures/\(name)",
-                relativeTo: AbsolutePath(validating: #file)
-            )
-
-            // Check that the fixture is really there.
-            guard localFileSystem.isDirectory(fixtureDir) else {
-                Issue.record(Comment("No such fixture: \(fixtureDir)"))
-                return
-            }
-
-            // The fixture contains either a checkout or just a Git directory.
-            if localFileSystem.isFile(fixtureDir.appending(component: "Package.swift")) {
-                // It's a single package, so copy the whole directory as-is.
-                let dstDir = tmpDirPath.appending(component: copyName)
-                #if os(Windows)
-                try localFileSystem.copy(from: fixtureDir, to: dstDir)
-                #else
-                try systemQuietly("cp", "-R", "-H", fixtureDir.pathString, dstDir.pathString)
-                #endif
-
-                // Invoke the block, passing it the path of the copied fixture.
-                try body(dstDir)
-            } else {
-                // Copy each of the package directories and construct a git repo in it.
-                for fileName in try! localFileSystem.getDirectoryContents(fixtureDir).sorted() {
-                    let srcDir = fixtureDir.appending(component: fileName)
-                    guard localFileSystem.isDirectory(srcDir) else { continue }
-                    let dstDir = tmpDirPath.appending(component: fileName)
-                    #if os(Windows)
-                    try localFileSystem.copy(from: srcDir, to: dstDir)
-                    #else
-                    try systemQuietly("cp", "-R", "-H", srcDir.pathString, dstDir.pathString)
-                    #endif
-                    initGitRepo(dstDir, tag: "1.2.3", addFile: false)
-                }
-
-                // Invoke the block, passing it the path of the copied fixture.
-                try body(tmpDirPath)
-            }
-        }
-    } catch {
-        Issue.record(error)
-    }
-}
-
-/// Test-helper function that creates a new Git repository in a directory.  The new repository will contain
-/// exactly one empty file unless `addFile` is `false`, and if a tag name is provided, a tag with that name will be
-/// created.
-public func initGitRepo(
-    _ dir: AbsolutePath,
-    tag: String? = nil,
-    addFile: Bool = true,
-    file: StaticString = #file,
-    line: UInt = #line
-) {
-    initGitRepo(dir, tags: tag.flatMap { [$0] } ?? [], addFile: addFile, file: file, line: line)
-}
-
-public func initGitRepo(
-    _ dir: AbsolutePath,
-    tags: [String],
-    addFile: Bool = true,
-    file: StaticString = #file,
-    line: UInt = #line
-) {
-    do {
-        if addFile {
-            let file = dir.appending(component: "file.swift")
-            try localFileSystem.writeFileContents(file, bytes: "")
-        }
-
-        try systemQuietly([Git.tool, "-C", dir.pathString, "init"])
-        try systemQuietly([
-            Git.tool, "-C", dir.pathString, "config", "user.email", "[email protected]",
-        ])
-        try systemQuietly([
-            Git.tool, "-C", dir.pathString, "config", "user.name", "Example Example",
-        ])
-        try systemQuietly([Git.tool, "-C", dir.pathString, "config", "commit.gpgsign", "false"])
-        try systemQuietly([Git.tool, "-C", dir.pathString, "add", "."])
-        try systemQuietly([Git.tool, "-C", dir.pathString, "commit", "-m", "Add some files."])
-
-        for tag in tags {
-            try systemQuietly([Git.tool, "-C", dir.pathString, "tag", tag])
-        }
-    } catch {
-        Issue.record(error)
-    }
-}
-
-public func binaryTargetsFixture(_ closure: (AbsolutePath) throws -> Void) throws {
-    fixture(name: "BinaryTargets") { fixturePath in
+public func binaryTargetsFixture<T>(_ closure: (AbsolutePath) async throws -> T) async throws {
+    try await fixture(name: "BinaryTargets") { fixturePath in
         let inputsPath = fixturePath.appending(component: "Inputs")
         let packagePath = fixturePath.appending(component: "TestBinary")
 
@@ -369,7 +255,7 @@ public func binaryTargetsFixture(_ closure: (AbsolutePath) throws -> Void) throw
             )
         }
 
-        try closure(packagePath)
+        return try await closure(packagePath)
     }
 }
 

IntegrationTests/Fixtures/BinaryTargets/Inputs/StaticLibrary/StaticLibrary.m renamed to Fixtures/BinaryTargets/Inputs/StaticLibrary/StaticLibrary.m

@@ -0,0 +1,14 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright (c) 2025 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+ */
+
+
+public enum TestConfigurationErrors: Error {
+    case EnvironmentVariableNotSet(name: String)
+}