[Tests] Remove dylib asserts

We can't assert for dylib anymore because we will not always create them.

Author: aciidgh

Tests/FunctionalTests/ClangModuleTests.swift

@@ -16,35 +16,39 @@ import PackageModel
 import SourceControl
 import Utility
 
-extension String {
- // FIXME: It doesn't seem right for this to be an extension on String; it isn't inherent "string behavior".
- fileprivate var soname: String {
- return "lib\(self).\(Product.dynamicLibraryExtension)"
+/// Asserts if a directory (recursively) contains a file.
+private func XCTAssertDirectoryContainsFile(dir: AbsolutePath, filename: String, file: StaticString = #file, line: UInt = #line) {
+ do {
+ for entry in try walk(dir) {
+ if entry.basename == filename { return }
+ } 
+ } catch {
+ XCTFail("Failed with error \(error)", file: file, line: line)
  }
+ XCTFail("Directory \(dir) does not contain \(file)", file: file, line: line)
 }
 
 class ClangModulesTestCase: XCTestCase {
  func testSingleModuleFlatCLibrary() {
  fixture(name: "ClangModules/CLibraryFlat") { prefix in
  XCTAssertBuilds(prefix)
  let debugPath = prefix.appending(components: ".build", "debug")
- XCTAssertFileExists(debugPath.appending(components: "CLibraryFlat".soname))
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Foo.c.o")
  }
  }
 
  func testSingleModuleCLibraryInSources() {
  fixture(name: "ClangModules/CLibrarySources") { prefix in
  XCTAssertBuilds(prefix)
  let debugPath = prefix.appending(components: ".build", "debug")
- XCTAssertFileExists(debugPath.appending(component: "CLibrarySources".soname))
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Foo.c.o")
  }
  }
 
  func testMixedSwiftAndC() {
  fixture(name: "ClangModules/SwiftCMixed") { prefix in
  XCTAssertBuilds(prefix)
  let debugPath = prefix.appending(components: ".build", "debug")
- XCTAssertFileExists(debugPath.appending(component: "SeaLib".soname))
  XCTAssertFileExists(debugPath.appending(component: "SeaExec"))
  var output = try popen([debugPath.appending(component: "SeaExec").asString], environment: [:])
  XCTAssertEqual(output, "a = 5\n")
@@ -57,7 +61,6 @@ class ClangModulesTestCase: XCTestCase {
  fixture(name: "ClangModules/SwiftCMixed2") { prefix in
  XCTAssertBuilds(prefix)
  let debugPath = prefix.appending(components: ".build", "debug")
- XCTAssertFileExists(debugPath.appending(component: "SeaLib".soname))
  let output = try popen([debugPath.appending(component: "SeaExec").asString], environment: [:])
  XCTAssertEqual(output, "a = 5\n")
  }
@@ -69,7 +72,6 @@ class ClangModulesTestCase: XCTestCase {
  XCTAssertBuilds(packageRoot)
  let debugPath = prefix.appending(components: "Bar", ".build", "debug")
  XCTAssertFileExists(debugPath.appending(component: "Bar"))
- XCTAssertFileExists(debugPath.appending(component: "Foo".soname))
  let path = try SwiftPMProduct.packagePath(for: "Foo", packageRoot: packageRoot)
  XCTAssertEqual(GitRepository(path: path).tags, ["1.2.3"])
  }
@@ -79,9 +81,8 @@ class ClangModulesTestCase: XCTestCase {
  fixture(name: "ClangModules/CLibraryiquote") { prefix in
  XCTAssertBuilds(prefix)
  let debugPath = prefix.appending(components: ".build", "debug")
- XCTAssertFileExists(debugPath.appending(component: "Foo".soname))
- XCTAssertFileExists(debugPath.appending(component: "Bar".soname))
- XCTAssertFileExists(debugPath.appending(component: "Bar with spaces".soname))
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Bar.c.o")
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Foo.c.o")
  }
  }
 
@@ -90,7 +91,8 @@ class ClangModulesTestCase: XCTestCase {
  let packageRoot = prefix.appending(component: "Bar")
  XCTAssertBuilds(packageRoot)
  let debugPath = prefix.appending(components: "Bar", ".build", "debug")
- XCTAssertFileExists(debugPath.appending(component: "Foo".soname))
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Sea.c.o")
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Foo.c.o")
  let path = try SwiftPMProduct.packagePath(for: "Foo", packageRoot: packageRoot)
  XCTAssertEqual(GitRepository(path: path).tags, ["1.2.3"])
  }
@@ -112,7 +114,8 @@ class ClangModulesTestCase: XCTestCase {
  let packageRoot = prefix.appending(component: "Bar")
  XCTAssertBuilds(packageRoot)
  let debugPath = prefix.appending(components: "Bar", ".build", "debug")
- XCTAssertFileExists(debugPath.appending(component: "Foo".soname))
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Sea.c.o")
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Foo.c.o")
  let path = try SwiftPMProduct.packagePath(for: "Foo", packageRoot: packageRoot)
  XCTAssertEqual(GitRepository(path: path).tags, ["1.2.3"])
  }
@@ -122,11 +125,10 @@ class ClangModulesTestCase: XCTestCase {
  fixture(name: "ClangModules/ModuleMapGenerationCases") { prefix in
  XCTAssertBuilds(prefix)
  let debugPath = prefix.appending(components: ".build", "debug")
- XCTAssertFileExists(debugPath.appending(component: "UmbrellaHeader".soname))
- XCTAssertFileExists(debugPath.appending(component: "FlatInclude".soname))
- XCTAssertFileExists(debugPath.appending(component: "UmbellaModuleNameInclude".soname))
- XCTAssertFileExists(debugPath.appending(component: "NoIncludeDir".soname))
- XCTAssertFileExists(debugPath.appending(component: "Baz"))
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Jaz.c.o")
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "main.swift.o")
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "FlatInclude.c.o")
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "UmbrellaHeader.c.o")
  }
  }
 
@@ -135,7 +137,7 @@ class ClangModulesTestCase: XCTestCase {
  fixture(name: "ClangModules/CDynamicLookup") { prefix in
  XCTAssertBuilds(prefix, Xld: ["-undefined", "dynamic_lookup"])
  let debugPath = prefix.appending(components: ".build", "debug")
- XCTAssertFileExists(debugPath.appending(component: "CDynamicLookup".soname))
+ XCTAssertDirectoryContainsFile(dir: debugPath, filename: "Foo.c.o")
  }
  }
 
@@ -144,7 +146,7 @@ class ClangModulesTestCase: XCTestCase {
  fixture(name: "ClangModules/ObjCmacOSPackage") { prefix in
  // Build the package.
  XCTAssertBuilds(prefix)
- XCTAssertFileExists(prefix.appending(components: ".build", "debug", "ObjCmacOSPackage".soname))
+ XCTAssertDirectoryContainsFile(dir: prefix.appending(components: ".build", "debug"), filename: "HelloWorldExample.m.o")
  // Run swift-test on package.
  XCTAssertSwiftTest(prefix)
  }