Test: Merge IntegrationTests into Tests

Package.swift

@@ -747,6 +747,18 @@ let package = Package(
             name: "BuildTests",
             dependencies: ["Build", "PackageModel", "Commands", "_InternalTestSupport"]
         ),
+        .testTarget(
+            name: "IntegrationTests",
+            dependencies: [
+                "swift-package-manager",
+                .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
+                .product(name: "TSCTestSupport", package: "swift-tools-support-core"),
+                .target(name: "swift-build"),
+                .target(name: "swift-package"),
+                .target(name: "swift-run"),
+                .target(name: "swift-test")
+            ]
+        ),
         .testTarget(
             name: "LLBuildManifestTests",
             dependencies: ["Basics", "LLBuildManifest", "_InternalTestSupport"]

IntegrationTests/Tests/IntegrationTests/XCBuildTests.swift → Tests/IntegrationTests/XCBuildTests.swift

@@ -36,6 +36,12 @@ final class XCBuildTests: XCTestCase {
             XCTAssertFileExists(releasePath.appending(component: "bar"))
             XCTAssertNoSuchPath(releasePath.appending(component: "cbar"))
         }
+    }
+
+    func testExecutableProducts2() throws {
+        #if !os(macOS)
+        try XCTSkip("Test requires macOS")
+        #endif
 
         fixture(name: "XCBuild/ExecutableProducts") { path in
             let fooPath = path.appending(component: "Foo")
@@ -55,6 +61,12 @@ final class XCBuildTests: XCTestCase {
             XCTAssertFileExists(releasePath.appending(component: "bar"))
             XCTAssertNoSuchPath(releasePath.appending(component: "cbar"))
         }
+    }
+
+    func testExecutableProducts3() throws {
+        #if !os(macOS)
+        try XCTSkip("Test requires macOS")
+        #endif
 
         fixture(name: "XCBuild/ExecutableProducts") { path in
             let fooPath = path.appending(component: "Foo")
@@ -74,6 +86,12 @@ final class XCBuildTests: XCTestCase {
             XCTAssertNoSuchPath(releasePath.appending(component: "bar"))
             XCTAssertNoSuchPath(releasePath.appending(component: "cbar"))
         }
+    }
+
+    func testExecutableProducts4() throws {
+        #if !os(macOS)
+        try XCTSkip("Test requires macOS")
+        #endif
 
         fixture(name: "XCBuild/ExecutableProducts") { path in
             let fooPath = path.appending(component: "Foo")
@@ -93,6 +111,12 @@ final class XCBuildTests: XCTestCase {
             XCTAssertFileExists(releasePath.appending(component: "bar"))
             XCTAssertNoSuchPath(releasePath.appending(component: "cbar"))
         }
+    }
+
+    func testExecutableProducts5() throws {
+        #if !os(macOS)
+        try XCTSkip("Test requires macOS")
+        #endif
 
         fixture(name: "XCBuild/ExecutableProducts") { path in
             let fooPath = path.appending(component: "Foo")

Utilities/build-using-self

@@ -19,7 +19,7 @@ root_dir="$(cd ${__dir}/.. && pwd)"
 cd "${root_dir}/"
 echo "Current directory is ${PWD}"
 
-CONFIGURATION=debug
+CONFIGURATION=${CONFIGURATION:-debug}
 export SWIFTCI_IS_SELF_HOSTED=1
 
 # Ensure SDKROOT is configured
@@ -40,15 +40,6 @@ swift package update
 swift build -c $CONFIGURATION
 swift test -c $CONFIGURATION --parallel
 
-# Run the integration tests with just built SwiftPM.
-export SWIFTPM_BIN_DIR=$(swift build -c $CONFIGURATION --show-bin-path)
-(
-    cd ${root_dir}/IntegrationTests
-    # Perform package update in order to get the latest commits for the dependencies.
-    swift package update
-    $SWIFTPM_BIN_DIR/swift-test --parallel
-)
-
 if [ "${host}" == "Darwin" ]; then
     echo "Current working directory is ${PWD}"
     echo "Bootstrapping with the XCBuild codepath..."

Utilities/soundness.sh

@@ -71,7 +71,6 @@ for language in swift-or-c bash python; do
           -o -path "./Sources/PackageSigning/embedded_resources.swift"
           -o -path "./Examples/*"
           -o -path "./Fixtures/*"
-          -o -path "./IntegrationTests/*"
           -o -path "./Tests/ExtraTests/*"
           -o -path "./Tests/PackageLoadingTests/Inputs/*"
         )
@@ -91,7 +90,7 @@ for language in swift-or-c bash python; do
 EOF
         ;;
       bash)
-        exceptions=( -path "./Examples/*" -o -path "./Fixtures/*" -o -path "./IntegrationTests/*" -o -path "*/.build/*" )
+        exceptions=( -path "./Examples/*" -o -path "./Fixtures/*" -o -path "*/.build/*" )
         matching_files=( -name '*.sh' )
         cat > "$tmp" <<"EOF"
 #!/bin/bash
@@ -109,7 +108,7 @@ EOF
 EOF
       ;;
       python)
-        exceptions=( -path "./Examples/*" -o -path "./Fixtures/*" -o -path "./IntegrationTests/*"  -o -path "*/.build/*" )
+        exceptions=( -path "./Examples/*" -o -path "./Fixtures/*" -o -path "*/.build/*" )
         matching_files=( -name '*.py' )
         cat > "$tmp" <<"EOF"
 #!/usr/bin/env python3

Utilities/test-toolchain

@@ -104,7 +104,7 @@ def test(args):
         else:
             cmd += ['%s=%s' % (key,value)]
 
-    integration_test_dir = os.path.join(args.project_root, "IntegrationTests")
+    integration_test_dir = os.path.join(args.project_root)
     cmd += [
         args.swift_test_path,
         "--package-path", integration_test_dir,