From 518d77769575e3c7289bd5c0f29c615a864b5919 Mon Sep 17 00:00:00 2001
From: Boris Buegling <bbuegling@apple.com>
Date: Thu, 8 Dec 2022 16:21:05 -0800
Subject: [PATCH] Revert "Reenable disabled tests (#5957)"

This reverts commit c6faab7fe46a03ce38e162ebd1b67985b3ce8c6a.

The failure showed up again in https://github.com/apple/swift-package-manager/pull/5950, so it's not actually gone.
---
 Package.swift                             | 5 +++--
 Tests/CommandsTests/BuildToolTests.swift  | 2 +-
 Tests/FunctionalTests/PluginTests.swift   | 2 --
 Tests/WorkspaceTests/InitTests.swift      | 2 ++
 Tests/WorkspaceTests/WorkspaceTests.swift | 2 ++
 Utilities/bootstrap                       | 6 +++++-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Package.swift b/Package.swift
index 0ad9cc67277..46defa3e4be 100644
--- a/Package.swift
+++ b/Package.swift
@@ -507,7 +507,8 @@ let package = Package(
             name: "WorkspaceTests",
             dependencies: ["Workspace", "SPMTestSupport"]
         ),
-        .testTarget(
+        // 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",
@@ -516,7 +517,7 @@ let package = Package(
                 "PackageModel",
                 "SPMTestSupport"
             ]
-        ),
+        ),*/
         .testTarget(
             name: "FunctionalPerformanceTests",
             dependencies: [
diff --git a/Tests/CommandsTests/BuildToolTests.swift b/Tests/CommandsTests/BuildToolTests.swift
index 47fde6e0b2a..ed7314143d9 100644
--- a/Tests/CommandsTests/BuildToolTests.swift
+++ b/Tests/CommandsTests/BuildToolTests.swift
@@ -280,7 +280,7 @@ final class BuildToolTests: CommandsTestCase {
     }
 
     func testBuildCompleteMessage() throws {
-        throw XCTSkip("This test isn't stable w.r.t. the build cache; rdar://101815761")
+        throw XCTSkip("This test fails to match the 'Compiling' regex; rdar://101815761")
 
         try fixture(name: "DependencyResolution/Internal/Simple") { fixturePath in
             do {
diff --git a/Tests/FunctionalTests/PluginTests.swift b/Tests/FunctionalTests/PluginTests.swift
index 282153968bd..79bc3d8eb42 100644
--- a/Tests/FunctionalTests/PluginTests.swift
+++ b/Tests/FunctionalTests/PluginTests.swift
@@ -461,7 +461,6 @@ class PluginTests: XCTestCase {
                         outputDirectory: pluginDir.appending(component: "output"),
                         toolSearchDirectories: toolSearchDirectories,
                         toolNamesToPaths: [:],
-                        toolNamesToTriples: [:],
                         writableDirectories: [pluginDir.appending(component: "output")],
                         readOnlyDirectories: [package.path],
                         fileSystem: localFileSystem,
@@ -723,7 +722,6 @@ class PluginTests: XCTestCase {
                 outputDirectory: pluginDir.appending(component: "output"),
                 toolSearchDirectories: [try UserToolchain.default.swiftCompilerPath.parentDirectory],
                 toolNamesToPaths: [:],
-                toolNamesToTriples: [:],
                 writableDirectories: [pluginDir.appending(component: "output")],
                 readOnlyDirectories: [package.path],
                 fileSystem: localFileSystem,
diff --git a/Tests/WorkspaceTests/InitTests.swift b/Tests/WorkspaceTests/InitTests.swift
index 756ea693c56..aca6a76aa6a 100644
--- a/Tests/WorkspaceTests/InitTests.swift
+++ b/Tests/WorkspaceTests/InitTests.swift
@@ -266,6 +266,8 @@ class InitTests: XCTestCase {
     }
     
     func testNonC99NameExecutablePackage() throws {
+        throw XCTSkip("This test fails to find XCTAssertEqual; rdar://101868275")
+
         try withTemporaryDirectory(removeTreeOnDeinit: true) { tempDirPath in
             XCTAssertDirectoryExists(tempDirPath)
             
diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift
index fc378bd0de8..015f423e125 100644
--- a/Tests/WorkspaceTests/WorkspaceTests.swift
+++ b/Tests/WorkspaceTests/WorkspaceTests.swift
@@ -4291,6 +4291,8 @@ 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(component: "MyPkg")
diff --git a/Utilities/bootstrap b/Utilities/bootstrap
index 5eca6ef6bf1..4602efc50f3 100755
--- a/Utilities/bootstrap
+++ b/Utilities/bootstrap
@@ -361,7 +361,11 @@ def test(args):
 
     note("Testing")
     parse_test_args(args)
-    cmd = [os.path.join(args.bin_dir, "swift-test")]
+    cmd = [
+        "SWIFT_EXEC=" + args.swiftc_path,
+        "SWIFT_DRIVER_SWIFT_EXEC=" + args.swiftc_path,
+        os.path.join(args.bin_dir, "swift-test")
+    ]
     if args.parallel:
         cmd.append("--parallel")
     for arg in args.filter: