[test] Put shared test projects INPUTS into bundle resources

This avoids depending on the absolute path to the INPUTS and allows
looking it up at run time even if the tests have moved.

Author: benlangmuir

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 
 import PackageDescription
 
@@ -40,7 +40,7 @@ let package = Package(
 
     .testTarget(
       name: "ISDBTibsTests",
-      dependencies: ["ISDBTibs"]),
+      dependencies: ["ISDBTibs", "ISDBTestSupport"]),
 
     // Commandline tool for working with tibs projects.
     .target(
@@ -50,7 +50,10 @@ let package = Package(
     // Test support library, built on top of tibs.
     .target(
       name: "ISDBTestSupport",
-      dependencies: ["IndexStoreDB", "ISDBTibs", "tibs"]),
+      dependencies: ["IndexStoreDB", "ISDBTibs", "tibs"],
+      resources: [
+        .copy("INPUTS")
+      ]),
 
     // MARK: C++ interface
 

Tests/INPUTS/MainFiles/main.swift renamed to Sources/ISDBTestSupport/INPUTS/MainFiles/main.swift

@@ -207,15 +207,14 @@ extension XCTestCase {
   ///   support this test.
   public func staticTibsTestWorkspace(
     name: String,
-    useExplicitOutputUnits: Bool = false,
-    testFile: String = #file
+    useExplicitOutputUnits: Bool = false
   ) throws -> TibsTestWorkspace? {
     let testDirName = testDirectoryName
 
     let toolchain = TibsToolchain.testDefault
 
     let workspace = try TibsTestWorkspace(
-      immutableProjectDir: inputsDirectory(testFile: testFile)
+      immutableProjectDir: XCTestCase.isdbInputsDirectory
         .appendingPathComponent(name, isDirectory: true),
       persistentBuildDir: XCTestCase.productsDirectory
         .appendingPathComponent("isdb-tests/\(testDirName)", isDirectory: true),
@@ -242,16 +241,13 @@ extension XCTestCase {
   ///   * name: The name of the test, which is its path relative to INPUTS.
   /// * returns: An immutable TibsTestWorkspace, or nil and prints a warning if toolchain does not
   ///   support this test.
-  public func mutableTibsTestWorkspace(
-    name: String,
-    testFile: String = #file
-  ) throws -> TibsTestWorkspace? {
+  public func mutableTibsTestWorkspace(name: String) throws -> TibsTestWorkspace? {
     let testDirName = testDirectoryName
 
     let toolchain = TibsToolchain.testDefault
 
     let workspace = try TibsTestWorkspace(
-      projectDir: inputsDirectory(testFile: testFile)
+      projectDir: XCTestCase.isdbInputsDirectory
         .appendingPathComponent(name, isDirectory: true),
       tmpDir: URL(fileURLWithPath: NSTemporaryDirectory())
         .appendingPathComponent("isdb-test-data/\(testDirName)", isDirectory: true),
@@ -267,25 +263,44 @@ extension XCTestCase {
     return workspace
   }
 
-  /// The path the the test INPUTS directory.
-  public func inputsDirectory(testFile: String = #file) -> URL {
-    return URL(fileURLWithPath: testFile)
-      .deletingLastPathComponent()
-      .deletingLastPathComponent()
-      .appendingPathComponent("INPUTS", isDirectory: true)
-  }
+  /// The bundle of the currently executing test.
+  public static var testBundle: Bundle = {
+    #if os(macOS)
+      if let bundle =  Bundle.allBundles.first(where: { $0.bundlePath.hasSuffix(".xctest") }) {
+        return bundle
+      }
+      fatalError("couldn't find the test bundle")
+    #else
+      return Bundle.main
+    #endif
+  }()
 
   /// The path to the built products directory.
-  public static var productsDirectory: URL {
+  public static var productsDirectory: URL = {
     #if os(macOS)
-      for bundle in Bundle.allBundles where bundle.bundlePath.hasSuffix(".xctest") {
-          return bundle.bundleURL.deletingLastPathComponent()
-      }
-      fatalError("couldn't find the products directory")
+      return testBundle.bundleURL.deletingLastPathComponent()
     #else
-      return Bundle.main.bundleURL
+      return testBundle.bundleURL
     #endif
-  }
+  }()
+
+  /// The path to the INPUTS directory of shared test projects.
+  public static var isdbInputsDirectory: URL = {
+    // FIXME: Use Bundle.module.resourceURL once the fix for SR-12912 is released.
+    var resources = XCTestCase.productsDirectory
+      .appendingPathComponent("IndexStoreDB_ISDBTestSupport.bundle")
+      .appendingPathComponent("Contents")
+      .appendingPathComponent("Resources")
+    if !FileManager.default.fileExists(atPath: resources.path) {
+      // Xcode and command-line swiftpm differ about the path.
+      resources.deleteLastPathComponent()
+      resources.deleteLastPathComponent()
+    }
+    guard FileManager.default.fileExists(atPath: resources.path) else {
+      fatalError("missing resources \(resources.path)")
+    }
+    return resources.appendingPathComponent("INPUTS", isDirectory: true).standardizedFileURL
+  }()
 
   /// The name of this test, mangled for use as a directory.
   public var testDirectoryName: String {

Tests/INPUTS/MainFiles/main1.c renamed to Sources/ISDBTestSupport/INPUTS/MainFiles/main1.c

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import ISDBTibs
+import ISDBTestSupport
 import Foundation
 import XCTest
 
@@ -117,17 +118,3 @@ final class TibsBuildTests: XCTestCase {
     XCTAssertEqual(try builder._buildTest(), [dcpp.path, emm.path])
   }
 }
-
-extension XCTestCase {
-
-  /// The name of this test, mangled for use as a directory.
-  public var testDirectoryName: String {
-    guard name.starts(with: "-[") else {
-      return name
-    }
-
-    let className = name.dropFirst(2).prefix(while: { $0 != " " })
-    let methodName = name[className.endIndex...].dropFirst().prefix(while: { $0 != "]"})
-    return "\(className).\(methodName)"
-  }
-}

Tests/INPUTS/MainFiles/main2.c renamed to Sources/ISDBTestSupport/INPUTS/MainFiles/main2.c

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import ISDBTibs
+import ISDBTestSupport
 import Foundation
 import XCTest
 
@@ -200,8 +201,5 @@ final class TibsResolutionTests: XCTestCase {
 }
 
 func projectDir(_ name: String) -> URL {
-  return URL(fileURLWithPath: #file)
-    .deletingLastPathComponent()
-    .deletingLastPathComponent()
-    .appendingPathComponent("INPUTS/\(name)", isDirectory: true)
+  XCTestCase.isdbInputsDirectory.appendingPathComponent(name, isDirectory: true)
 }

Tests/INPUTS/MainFiles/project.json renamed to Sources/ISDBTestSupport/INPUTS/MainFiles/project.json

@@ -155,10 +155,8 @@ final class LocationScannerTests: XCTestCase {
   }
 
   func testDirectory() throws {
-    let proj1 = URL(fileURLWithPath: #file)
-      .deletingLastPathComponent()
-      .deletingLastPathComponent()
-      .appendingPathComponent("INPUTS/proj1", isDirectory: true)
+    let proj1 = XCTestCase.isdbInputsDirectory
+      .appendingPathComponent("proj1", isDirectory: true)
     XCTAssertEqual(try scanDir(proj1), [
       Loc(url: proj1.appendingPathComponent("a.swift", isDirectory: false), "a:def", 1, 15),
       Loc(url: proj1.appendingPathComponent("a.swift", isDirectory: false), "b:call", 2, 13),