Skip to content

HACK: Disable tests that require @testable import. #364

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 2 commits into from
Nov 14, 2020
Merged

HACK: Disable tests that require @testable import. #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10b7b0e
HACK: Disable tests that require @testable import.
DougGregor Nov 14, 2020
ec2b6db
Update LinuxMain
DougGregor Nov 14, 2020
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
3 changes: 3 additions & 0 deletions Tests/SwiftDriverTests/IncrementalCompilationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import XCTest
import TSCBasic

#if false
// FIXME: Disabled due to @testable import
@testable import SwiftDriver

final class NonincrementalCompilationTests: XCTestCase {
Expand Down Expand Up @@ -616,3 +618,4 @@ final class IncrementalCompilationTests: XCTestCase {
try! localFileSystem.writeFileContents(dst, bytes: ByteString(d))
}
}
#endif
4 changes: 4 additions & 0 deletions Tests/SwiftDriverTests/ModuleDependencyGraphTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
//===----------------------------------------------------------------------===//

import XCTest

#if false
// FIXME: Disabled due to @testable import
@testable import SwiftDriver
import TSCBasic

Expand Down Expand Up @@ -1365,3 +1368,4 @@ fileprivate extension Set where Element == ExternalDependency {
contains(s.asExternal)
}
}
#endif
3 changes: 3 additions & 0 deletions Tests/SwiftDriverTests/TwoDMapTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
//
//===----------------------------------------------------------------------===//

#if false
import XCTest
// FIXME: Disabled due to testable import
@testable import SwiftDriver

class TwoDMapTests: XCTestCase {
Expand Down Expand Up @@ -106,3 +108,4 @@ class TwoDMapTests: XCTestCase {
}

}
#endif
102 changes: 0 additions & 102 deletions Tests/SwiftDriverTests/XCTestManifests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,6 @@ extension ExplicitModuleBuildTests {
]
}

extension IncrementalCompilationTests {
// DO NOT MODIFY: This is autogenerated, use:
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__IncrementalCompilationTests = [
("testAutolinkOutputPath", testAutolinkOutputPath),
("testIncremental", testIncremental),
("testIncrementalDiagnostics", testIncrementalDiagnostics),
]
}

extension IntegrationTests {
// DO NOT MODIFY: This is autogenerated, use:
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__IntegrationTests = [
("testLitDriverTests", testLitDriverTests),
("testLitDriverValidationTests", testLitDriverValidationTests),
("testLitInterpreterTests", testLitInterpreterTests),
("testLitStdlibTests", testLitStdlibTests),
]
}

extension JobExecutorTests {
// DO NOT MODIFY: This is autogenerated, use:
// `swift test --generate-linuxmain`
Expand All @@ -63,71 +40,6 @@ extension JobExecutorTests {
]
}

extension ModuleDependencyGraphTests {
// DO NOT MODIFY: This is autogenerated, use:
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__ModuleDependencyGraphTests = [
("testBaselineForPrintsAndCrossType", testBaselineForPrintsAndCrossType),
("testBasicLoad", testBasicLoad),
("testChainedDependents", testChainedDependents),
("testChainedExternal", testChainedExternal),
("testChainedExternalPreMarked", testChainedExternalPreMarked),
("testChainedExternalReverse", testChainedExternalReverse),
("testChainedNoncascadingDependents", testChainedNoncascadingDependents),
("testChainedNoncascadingDependents2", testChainedNoncascadingDependents2),
("testCrossTypeDependency", testCrossTypeDependency),
("testCrossTypeDependencyBaseline", testCrossTypeDependencyBaseline),
("testCrossTypeDependencyBaselineWithFingerprints", testCrossTypeDependencyBaselineWithFingerprints),
("testCrossTypeDependencyWithFingerprints", testCrossTypeDependencyWithFingerprints),
("testDependencyLoops", testDependencyLoops),
("testEnabledTypeBodyFingerprints", testEnabledTypeBodyFingerprints),
("testIndependentDepKinds", testIndependentDepKinds),
("testIndependentDepKinds2", testIndependentDepKinds2),
("testIndependentMembers", testIndependentMembers),
("testIndependentNodes", testIndependentNodes),
("testLoadPassesWithFingerprint", testLoadPassesWithFingerprint),
("testMarkIntransitive", testMarkIntransitive),
("testMarkIntransitiveThenIndirect", testMarkIntransitiveThenIndirect),
("testMarkIntransitiveTwice", testMarkIntransitiveTwice),
("testMarkOneNodeTwice", testMarkOneNodeTwice),
("testMarkOneNodeTwice2", testMarkOneNodeTwice2),
("testMarkTwoNodes", testMarkTwoNodes),
("testMultipleDependentsDifferent", testMultipleDependentsDifferent),
("testMultipleDependentsSame", testMultipleDependentsSame),
("testMutualInterfaceHash", testMutualInterfaceHash),
("testNotTransitiveOnceMarked", testNotTransitiveOnceMarked),
("testReloadDetectsChange", testReloadDetectsChange),
("testSimpleDependent", testSimpleDependent),
("testSimpleDependent2", testSimpleDependent2),
("testSimpleDependent3", testSimpleDependent3),
("testSimpleDependent4", testSimpleDependent4),
("testSimpleDependent5", testSimpleDependent5),
("testSimpleDependent6", testSimpleDependent6),
("testSimpleDependentMember", testSimpleDependentMember),
("testSimpleDependentReverse", testSimpleDependentReverse),
("testSimpleExternal", testSimpleExternal),
("testSimpleExternal2", testSimpleExternal2),
("testUseFingerprints", testUseFingerprints),
]
}

extension NonincrementalCompilationTests {
// DO NOT MODIFY: This is autogenerated, use:
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__NonincrementalCompilationTests = [
("testBuildRecordReading", testBuildRecordReading),
("testDateConversion", testDateConversion),
("testExtractSourceFileDependencyGraphFromSwiftModule", testExtractSourceFileDependencyGraphFromSwiftModule),
("testNoIncremental", testNoIncremental),
("testReadAndWriteBuildRecord", testReadAndWriteBuildRecord),
("testReadBinarySourceFileDependencyGraph", testReadBinarySourceFileDependencyGraph),
("testReadComplexSourceFileDependencyGraph", testReadComplexSourceFileDependencyGraph),
("testShowJobLifecycleAndIncremental", testShowJobLifecycleAndIncremental),
]
}

extension ParsableMessageTests {
// DO NOT MODIFY: This is autogenerated, use:
// `swift test --generate-linuxmain`
Expand Down Expand Up @@ -281,30 +193,16 @@ extension TripleTests {
]
}

extension TwoDMapTests {
// DO NOT MODIFY: This is autogenerated, use:
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__TwoDMapTests = [
("testTwoDMap", testTwoDMap),
]
}

public func __allTests() -> [XCTestCaseEntry] {
return [
testCase(AssertDiagnosticsTests.__allTests__AssertDiagnosticsTests),
testCase(ExplicitModuleBuildTests.__allTests__ExplicitModuleBuildTests),
testCase(IncrementalCompilationTests.__allTests__IncrementalCompilationTests),
testCase(IntegrationTests.__allTests__IntegrationTests),
testCase(JobExecutorTests.__allTests__JobExecutorTests),
testCase(ModuleDependencyGraphTests.__allTests__ModuleDependencyGraphTests),
testCase(NonincrementalCompilationTests.__allTests__NonincrementalCompilationTests),
testCase(ParsableMessageTests.__allTests__ParsableMessageTests),
testCase(PredictableRandomNumberGeneratorTests.__allTests__PredictableRandomNumberGeneratorTests),
testCase(StringAdditionsTests.__allTests__StringAdditionsTests),
testCase(SwiftDriverTests.__allTests__SwiftDriverTests),
testCase(TripleTests.__allTests__TripleTests),
testCase(TwoDMapTests.__allTests__TwoDMapTests),
]
}
#endif