Re-enable disabled tests

This re-enables a bunch of disabled tests, the hope is that they should now work that we have a newer superior Xcode installed on CI. If that happens to not be the case, we have `SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS` to disable these tests specifically for the macOS CI if needed. This change introduces the variable where expected to be needed, but doesn't set it.

rdar://96920453

Author: neonichu

Examples/package-info/Sources/package-info/example.swift

@@ -1,8 +1,4 @@
-#if swift(>=5.7)
-@preconcurrency import Basics
-#else
 import Basics
-#endif
 import TSCBasic
 import Workspace
 

Package.swift

@@ -688,18 +688,6 @@ package.targets.append(contentsOf: [
         ]
     ),
 
-    // rdar://101868275 "error: cannot find 'XCTAssertEqual' in scope" can affect almost any functional test, so we flat out disable them all until we know what is going on
-    /*.testTarget(
-        name: "FunctionalTests",
-        dependencies: [
-            "swift-build",
-            "swift-package",
-            "swift-test",
-            "PackageModel",
-            "SPMTestSupport"
-        ]
-    ),*/
-
     .testTarget(
         name: "FunctionalPerformanceTests",
         dependencies: [
@@ -710,6 +698,22 @@ package.targets.append(contentsOf: [
         ]
     ),
 ])
+
+// rdar://101868275 "error: cannot find 'XCTAssertEqual' in scope" can affect almost any functional test, so we flat out disable them all until we know what is going on
+if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] == nil {
+    package.targets.append(contentsOf: [
+        .testTarget(
+            name: "FunctionalTests",
+            dependencies: [
+                "swift-build",
+                "swift-package",
+                "swift-test",
+                "PackageModel",
+                "SPMTestSupport"
+            ]
+        ),
+    ])
+}
 #endif
 
 // Add package dependency on llbuild when not bootstrapping.

Sources/Build/BuildPlan.swift

@@ -770,10 +770,6 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
                     case.unknown:
                         throw InternalError("unknown binary target '\(target.name)' type")
                     }
-                case .macro:
-                    if product.type == .macro {
-                        staticTargets.append(target)
-                    }
                 case .plugin:
                     continue
                 }

Sources/PackageDescription/PackageDescriptionSerialization.swift

@@ -201,7 +201,7 @@ enum Serialization {
 
     struct Target: Codable {
         let name: String
-        let group: TargetGroup
+        let group: TargetGroup?
         let path: String?
         let url: String?
         let sources: [String]?

Sources/PackageLoading/ManifestJSONParser.swift

@@ -337,7 +337,7 @@ enum ManifestJSONParser {
 
         return try TargetDescription(
             name: target.name,
-            group: .init(target.group),
+            group: target.group.map { .init($0) } ?? .package,
             dependencies: dependencies,
             path: target.path,
             url: target.url,

Tests/FunctionalTests/DependencyResolutionTests.swift

@@ -78,6 +78,8 @@ class DependencyResolutionTests: XCTestCase {
     }
 
     func testMirrors() throws {
+        try XCTSkipIf(true, "test is broken and needs investigation rdar://107970938")
+
         try fixture(name: "DependencyResolution/External/Mirror") { fixturePath in
             let prefix = try resolveSymlinks(fixturePath)
             let appPath = prefix.appending("App")

Tests/FunctionalTests/PluginTests.swift

@@ -463,6 +463,7 @@ class PluginTests: XCTestCase {
                         accessibleTools: [:],
                         writableDirectories: [pluginDir.appending("output")],
                         readOnlyDirectories: [package.path],
+                        allowNetworkConnections: [],
                         pkgConfigDirectories: [],
                         fileSystem: localFileSystem,
                         observabilityScope: observability.topScope,
@@ -729,6 +730,7 @@ class PluginTests: XCTestCase {
                 accessibleTools: [:],
                 writableDirectories: [pluginDir.appending("output")],
                 readOnlyDirectories: [package.path],
+                allowNetworkConnections: [],
                 pkgConfigDirectories: [],
                 fileSystem: localFileSystem,
                 observabilityScope: observability.topScope,
@@ -1022,7 +1024,7 @@ class PluginTests: XCTestCase {
             let (stdout, _) = try executeSwiftBuild(
                 fixturePath.appending(component: "MySourceGenPlugin"),
                 configuration: .Debug,
-                extraArgs: ["--product", "MyLocalTool", "-Xbuild-tools-swiftc", "-DUSE_CREATING"]
+                extraArgs: ["--product", "MyLocalTool", "-Xbuild-tools-swiftc", "-DUSE_CREATE"]
             )
             XCTAssert(stdout.contains("Linking MySourceGenBuildTool"), "stdout:\n\(stdout)")
             XCTAssert(stdout.contains("Creating foo.swift from foo.dat"), "stdout:\n\(stdout)")

Tests/FunctionalTests/ResourcesTests.swift

@@ -13,7 +13,9 @@
 import XCTest
 import SPMTestSupport
 
-import TSCBasic
+import struct TSCBasic.AbsolutePath
+import var TSCBasic.localFileSystem
+import func TSCBasic.withTemporaryDirectory
 
 class ResourcesTests: XCTestCase {
     func testSimpleResources() throws {

Tests/WorkspaceTests/InitTests.swift

@@ -238,8 +238,6 @@ class InitTests: XCTestCase {
     }
 
     func testNonC99NameExecutablePackage() throws {
-        throw XCTSkip("This test fails to find XCTAssertEqual; rdar://101868275")
-
         try withTemporaryDirectory(removeTreeOnDeinit: true) { tempDirPath in
             XCTAssertDirectoryExists(tempDirPath)
 
@@ -256,11 +254,7 @@ class InitTests: XCTestCase {
             )
             try initPackage.writePackageStructure()
 
-            #if os(macOS)
-              XCTAssertSwiftTest(packageRoot)
-            #else
-              XCTAssertBuilds(packageRoot)
-            #endif
+            XCTAssertBuilds(packageRoot)
         }
     }
 

Tests/WorkspaceTests/WorkspaceTests.swift

@@ -4948,8 +4948,6 @@ final class WorkspaceTests: XCTestCase {
 
     // This verifies that the simplest possible loading APIs are available for package clients.
     func testSimpleAPI() throws {
-        throw XCTSkip("This test fails to find XCTAssertEqual; rdar://101868275")
-
         try testWithTemporaryDirectory { path in
             // Create a temporary package as a test case.
             let packagePath = path.appending("MyPkg")