Skip to content

Commit d5bb23f

Browse files
committed
Revert "Disable FunctionalTests temporarily (#5875)"
This reverts commit d53f013.
1 parent 9eec2ac commit d5bb23f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Package.swift

+2-3
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,7 @@ let package = Package(
517517
name: "WorkspaceTests",
518518
dependencies: ["Workspace", "SPMTestSupport"]
519519
),
520-
// 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
521-
/*.testTarget(
520+
.testTarget(
522521
name: "FunctionalTests",
523522
dependencies: [
524523
"swift-build",
@@ -527,7 +526,7 @@ let package = Package(
527526
"PackageModel",
528527
"SPMTestSupport"
529528
]
530-
),*/
529+
),
531530
.testTarget(
532531
name: "FunctionalPerformanceTests",
533532
dependencies: [

Tests/FunctionalTests/PluginTests.swift

+2
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ class PluginTests: XCTestCase {
461461
outputDirectory: pluginDir.appending(component: "output"),
462462
toolSearchDirectories: toolSearchDirectories,
463463
toolNamesToPaths: [:],
464+
toolNamesToTriples: [:],
464465
writableDirectories: [pluginDir.appending(component: "output")],
465466
readOnlyDirectories: [package.path],
466467
fileSystem: localFileSystem,
@@ -722,6 +723,7 @@ class PluginTests: XCTestCase {
722723
outputDirectory: pluginDir.appending(component: "output"),
723724
toolSearchDirectories: [try UserToolchain.default.swiftCompilerPath.parentDirectory],
724725
toolNamesToPaths: [:],
726+
toolNamesToTriples: [:],
725727
writableDirectories: [pluginDir.appending(component: "output")],
726728
readOnlyDirectories: [package.path],
727729
fileSystem: localFileSystem,

0 commit comments

Comments
 (0)