Skip to content

Reenable disabled tests #5957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 8, 2022
Merged

Reenable disabled tests #5957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca44390
Reenable disabled tests
neonichu Dec 8, 2022
9eec2ac
Revert "Pass `SWIFT_EXEC` to swift-test via bootstrap (#4213)"
neonichu Dec 8, 2022
d5bb23f
Revert "Disable `FunctionalTests` temporarily (#5875)"
neonichu Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,8 +517,7 @@ let package = Package(
name: "WorkspaceTests",
dependencies: ["Workspace", "SPMTestSupport"]
),
// 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(
.testTarget(
name: "FunctionalTests",
dependencies: [
"swift-build",
Expand All @@ -527,7 +526,7 @@ let package = Package(
"PackageModel",
"SPMTestSupport"
]
),*/
),
.testTarget(
name: "FunctionalPerformanceTests",
dependencies: [
Expand Down
2 changes: 1 addition & 1 deletion Tests/CommandsTests/BuildToolTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ final class BuildToolTests: CommandsTestCase {
}

func testBuildCompleteMessage() throws {
throw XCTSkip("This test fails to match the 'Compiling' regex; rdar://101815761")
throw XCTSkip("This test isn't stable w.r.t. the build cache; rdar://101815761")

try fixture(name: "DependencyResolution/Internal/Simple") { fixturePath in
do {
Expand Down
2 changes: 2 additions & 0 deletions Tests/FunctionalTests/PluginTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ class PluginTests: XCTestCase {
outputDirectory: pluginDir.appending(component: "output"),
toolSearchDirectories: toolSearchDirectories,
toolNamesToPaths: [:],
toolNamesToTriples: [:],
writableDirectories: [pluginDir.appending(component: "output")],
readOnlyDirectories: [package.path],
fileSystem: localFileSystem,
Expand Down Expand Up @@ -722,6 +723,7 @@ 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,
Expand Down
2 changes: 0 additions & 2 deletions Tests/WorkspaceTests/InitTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,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)

Expand Down
2 changes: 0 additions & 2 deletions Tests/WorkspaceTests/WorkspaceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4291,8 +4291,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(component: "MyPkg")
Expand Down
6 changes: 1 addition & 5 deletions Utilities/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,7 @@ def test(args):

note("Testing")
parse_test_args(args)
cmd = [
"SWIFT_EXEC=" + args.swiftc_path,
"SWIFT_DRIVER_SWIFT_EXEC=" + args.swiftc_path,
os.path.join(args.bin_dir, "swift-test")
]
cmd = [os.path.join(args.bin_dir, "swift-test")]
if args.parallel:
cmd.append("--parallel")
for arg in args.filter:
Expand Down