Skip to content

Commit

Permalink
[Tests] Re-enable the two disabled tests causing CI failure
Browse files Browse the repository at this point in the history
It looks like a simple case of out of date ModuleCache. These tests shouldn't
fail unless the cache is still outdated, in which case we should purge it from
the CI machine.

-- https://bugs.swift.org/browse/SR-4419
  • Loading branch information
ankitspd committed Mar 30, 2017
1 parent ebafb38 commit 1aff99a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
7 changes: 2 additions & 5 deletions Tests/FunctionalTests/ClangModuleTests.swift
Expand Up @@ -144,18 +144,15 @@ class ClangModulesTestCase: XCTestCase {
}

func testObjectiveCPackageWithTestTarget(){
// Disable until https://bugs.swift.org/browse/SR-4419 is fixed.
#if false
#if os(macOS)
#if os(macOS)
fixture(name: "ClangModules/ObjCmacOSPackage") { prefix in
// Build the package.
XCTAssertBuilds(prefix)
XCTAssertDirectoryContainsFile(dir: prefix.appending(components: ".build", "debug"), filename: "HelloWorldExample.m.o")
// Run swift-test on package.
XCTAssertSwiftTest(prefix)
}
#endif
#endif
#endif
}

static var allTests = [
Expand Down
8 changes: 2 additions & 6 deletions Tests/FunctionalTests/SwiftPMXCTestHelperTests.swift
Expand Up @@ -15,10 +15,7 @@ import Utility

class SwiftPMXCTestHelperTests: XCTestCase {
func testBasicXCTestHelper() {
// Reenable when https://bugs.swift.org/browse/SR-4419 is fixed.
#if false
#if os(macOS)

#if os(macOS)
fixture(name: "Miscellaneous/SwiftPMXCTestHelper") { prefix in
// Build the package.
XCTAssertBuilds(prefix)
Expand All @@ -41,8 +38,7 @@ class SwiftPMXCTestHelperTests: XCTestCase {
// Run the XCTest helper tool and check result.
XCTAssertXCTestHelper(prefix.appending(components: ".build", "debug", "SwiftPMXCTestHelperPackageTests.xctest"), testCases: testCases)
}
#endif
#endif
#endif
}

static var allTests = [
Expand Down

0 comments on commit 1aff99a

Please sign in to comment.